minor shared/vcpu info adjustments

- remove vcpu_info from xlat.lst (it isn't and can't be checked)
- drop pointless (redundant) casts
- make dummy_vcpu_info static

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 3bc52e673f6ccdf0825439cea3c8dc5d53363506..8efef5c179c2295f9b013e9ec327c63bc026a19a 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -70,7 +70,7 @@ integer_param("hardware_dom", hardware_domid);
 
 struct vcpu *idle_vcpu[NR_CPUS] __read_mostly;
 
-vcpu_info_t dummy_vcpu_info;
+static vcpu_info_t dummy_vcpu_info;
 
 static void __domain_finalise_shutdown(struct domain *d)
 {

diff --git a/xen/include/xen/shared.h b/xen/include/xen/shared.h
index 19c79fdf58395330fffe84e84318a836c8815d37..3f5b2835d5b0ec3361320473a6c7944f783b378a 100644 (file)
--- a/xen/include/xen/shared.h
+++ b/xen/include/xen/shared.h
@@ -18,7 +18,7 @@ typedef union {
 #define __shared_info(d, s, field)                      \
     (*(!has_32bit_shinfo(d) ?                           \
        (typeof(&(s)->compat.field))&(s)->native.field : \
-       (typeof(&(s)->compat.field))&(s)->compat.field))
+       &(s)->compat.field))
 
 typedef union {
     struct vcpu_info native;
@@ -29,7 +29,7 @@ typedef union {
 #define __vcpu_info(v, i, field)                        \
     (*(!has_32bit_shinfo((v)->domain) ?                 \
        (typeof(&(i)->compat.field))&(i)->native.field : \
-       (typeof(&(i)->compat.field))&(i)->compat.field))
+       &(i)->compat.field))
 
 #else
 
@@ -41,8 +41,6 @@ typedef struct vcpu_info vcpu_info_t;
 
 #endif
 
-extern vcpu_info_t dummy_vcpu_info;
-
 #define shared_info(d, field)      __shared_info(d, (d)->shared_info, field)
 #define vcpu_info(v, field)        __vcpu_info(v, (v)->vcpu_info, field)
 

diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst
index 9c9fd9a217233d723f8a8ebbe8daea57daa8e3fd..28343b5bb618e7753e651a9e48fb1488cd4ff854 100644 (file)
--- a/xen/include/xlat.lst
+++ b/xen/include/xlat.lst
@@ -6,7 +6,6 @@
 ?      mmu_update                      xen.h
 !      mmuext_op                       xen.h
 !      start_info                      xen.h
-?      vcpu_info                       xen.h
 ?      vcpu_time_info                  xen.h
 !      cpu_user_regs                   arch-x86/xen-@arch@.h
 !      trap_info                       arch-x86/xen.h