[xen staging] x86: generalize padding field handling

[patchbot@xxxxxxx]

commit 696c273f3d9a169911308fb7e0a702a3eb6a150d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Sep 4 11:13:01 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Sep 4 11:13:01 2020 +0200

    x86: generalize padding field handling
    
    The original intention was to ignore padding fields, but the pattern
    matched only ones whose names started with an underscore. Also match
    fields whose names are in line with the C spec by not having a leading
    underscore. (Note that the leading ^ in the sed regexps was pointless
    and hence get dropped.)
    
    This requires adjusting some vNUMA macros, to avoid triggering
    "enumeration value ... not handled in switch" warnings, which - due to
    -Werror - would cause the build to fail. (I have to admit that I find
    these padding fields odd, when translation of the containing structure
    is needed anyway.)
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/common/compat/memory.c | 3 +++
 xen/tools/get-fields.sh    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c
index 3851f756c7..215b8f52d6 100644
--- a/xen/common/compat/memory.c
+++ b/xen/common/compat/memory.c
@@ -354,10 +354,13 @@ int compat_memory_op(unsigned int cmd, 
XEN_GUEST_HANDLE_PARAM(void) compat)
                 return -EFAULT;
 
 #define XLAT_vnuma_topology_info_HNDL_vdistance_h(_d_, _s_)            \
+            case XLAT_vnuma_topology_info_vdistance_pad:                \
             guest_from_compat_handle((_d_)->vdistance.h, (_s_)->vdistance.h)
 #define XLAT_vnuma_topology_info_HNDL_vcpu_to_vnode_h(_d_, _s_)                
\
+            case XLAT_vnuma_topology_info_vcpu_to_vnode_pad:            \
             guest_from_compat_handle((_d_)->vcpu_to_vnode.h, 
(_s_)->vcpu_to_vnode.h)
 #define XLAT_vnuma_topology_info_HNDL_vmemrange_h(_d_, _s_)            \
+            case XLAT_vnuma_topology_info_vmemrange_pad:                \
             guest_from_compat_handle((_d_)->vmemrange.h, (_s_)->vmemrange.h)
 
             XLAT_vnuma_topology_info(nat.vnuma, &cmp.vnuma);
diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh
index 002db2093f..753e37eb2e 100644
--- a/xen/tools/get-fields.sh
+++ b/xen/tools/get-fields.sh
@@ -218,7 +218,7 @@ for line in sys.stdin.readlines():
                                fi
                                ;;
                        [\,\;])
-                               if [ $level = 2 -a -n "$(echo $id | $SED 
's,^_pad[[:digit:]]*,,')" ]
+                               if [ $level = 2 -a -n "$(echo $id | $SED 
's,_\?pad[[:digit:]]*,,')" ]
                                then
                                        if [ $kind = union ]
                                        then
@@ -347,7 +347,7 @@ build_body ()
                        fi
                        ;;
                [\,\;])
-                       if [ $level = 2 -a -n "$(echo $id | $SED 
's,^_pad[[:digit:]]*,,')" ]
+                       if [ $level = 2 -a -n "$(echo $id | $SED 
's,_\?pad[[:digit:]]*,,')" ]
                        then
                                if [ -z "$array" -a -z "$array_type" ]
                                then
@@ -437,7 +437,7 @@ check_field ()
                                id=$token
                                ;;
                        [\,\;])
-                               if [ $level = 2 -a -n "$(echo $id | $SED 
's,^_pad[[:digit:]]*,,')" ]
+                               if [ $level = 2 -a -n "$(echo $id | $SED 
's,_\?pad[[:digit:]]*,,')" ]
                                then
                                        check_field $1 $2 $3.$id "$fields"
                                        test "$token" != ";" || fields= id=
@@ -491,7 +491,7 @@ build_check ()
                        test $level != 2 -o $arrlvl != 1 || id=$token
                        ;;
                [\,\;])
-                       if [ $level = 2 -a -n "$(echo $id | $SED 
's,^_pad[[:digit:]]*,,')" ]
+                       if [ $level = 2 -a -n "$(echo $id | $SED 
's,_\?pad[[:digit:]]*,,')" ]
                        then
                                check_field $kind $1 $id "$fields"
                                test "$token" != ";" || fields= id=
--
generated by git-patchbot for /home/xen/git/xen.git#staging