[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] tools/xen-foreign: Update the size for vcpu_guest_{core_regs, context}



commit cc83cae4de8116c7a8c9c9510d6b117745f42ff5
Author:     Julien Grall <jgrall@xxxxxxxxxx>
AuthorDate: Tue Jul 6 14:20:00 2021 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Jul 7 13:07:46 2021 +0100

    tools/xen-foreign: Update the size for vcpu_guest_{core_regs, context}
    
    Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to
    uint64_t") updated the size of the structure vcpu_guest_core_regs and
    indirectly vcpu_guest_context.
    
    On Arm, the two structures are only accessible to the tools and the
    hypervisor (and therefore stable). However, they are still checked
    by the scripts in tools/include/xen-foreign are not able to understand
    that.
    
    Ideally we should rework the scripts so we don't have to update
    the size for non-stable structure. But I don't have limited time
    to spend on the issue. So chose the simple solution and update
    the size accordingly.
    
    Note that we need to keep vcpu_guest_core_regs around because
    the structure is used by vcpu_guest_context and therefore the
    scripts expects the generated header to contain it.
    
    Fixes: 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to 
uint64_t")
    Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>
    Tested-by: Michal Orzel <michal.orzel@xxxxxxx>
---
 tools/include/xen-foreign/reference.size | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/include/xen-foreign/reference.size 
b/tools/include/xen-foreign/reference.size
index a0409db5c4..11a06a7a43 100644
--- a/tools/include/xen-foreign/reference.size
+++ b/tools/include/xen-foreign/reference.size
@@ -4,8 +4,8 @@ structs                   |   arm32   arm64  x86_32  x86_64
 start_info                |       -       -    1112    1168
 trap_info                 |       -       -       8      16
 cpu_user_regs             |       -       -      68     200
-vcpu_guest_core_regs      |     304     304       -       -
-vcpu_guest_context        |     344     344    2800    5168
+vcpu_guest_core_regs      |     312     312       -       -
+vcpu_guest_context        |     352     352    2800    5168
 arch_vcpu_info            |       0       0      24      16
 vcpu_time_info            |      32      32      32      32
 vcpu_info                 |      48      48      64      64
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.