diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-10 11:36:57 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-10 11:36:57 +0000 |
| commit | 5eca715050914fa452e4a9defa45ece6b316d6f4 (patch) | |
| tree | cd9471a5dfb65c6e4e30af891abf1859ab49347c | |
| parent | b04c1602b7bd6571cff164b8ab5e61bf910896d0 (diff) | |
| download | xen-5eca715050914fa452e4a9defa45ece6b316d6f4.tar.gz xen-5eca715050914fa452e4a9defa45ece6b316d6f4.tar.bz2 xen-5eca715050914fa452e4a9defa45ece6b316d6f4.zip | |
hvm: Fix merging error in hvm_op.h
A couple of new hvm_op commands were erroneously ifdef'ed to be
accessible only to the toolstack.
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen-unstable changeset: 22082:0eb89b465e46
xen-unstable date: Wed Sep 01 10:17:29 2010 +0100
hvm_op: Remove use of uint64_aligned_t from guest header file.
Manually pad to the required alignment instead.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset: 22090:4a628af0355c
xen-unstable date: Thu Sep 02 13:30:26 2010 +0100
| -rw-r--r-- | xen/include/public/hvm/hvm_op.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index 1f697e46e1..2d0b37eeb9 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -127,13 +127,16 @@ struct xen_hvm_set_mem_type { typedef struct xen_hvm_set_mem_type xen_hvm_set_mem_type_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_mem_type_t); +#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ + /* Hint from PV drivers for pagetable destruction. */ #define HVMOP_pagetable_dying 9 struct xen_hvm_pagetable_dying { /* Domain with a pagetable about to be destroyed. */ domid_t domid; + uint16_t pad[3]; /* align next field on 8-byte boundary */ /* guest physical address of the toplevel pagetable dying */ - uint64_aligned_t gpa; + uint64_t gpa; }; typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_pagetable_dying_t); @@ -146,6 +149,4 @@ struct xen_hvm_get_time { typedef struct xen_hvm_get_time xen_hvm_get_time_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_time_t); -#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ - #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ |