Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir@xen.org>
# Date 1291981017 0
# Node ID 463ff2d3ed9349a06e08b282fc07f1769b38f444
# Parent 9bf70900c9682864e2be4823e6eba7bc7e4912d4
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
---
xen/include/public/hvm/hvm_op.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff -r 9bf70900c968 -r 463ff2d3ed93 xen/include/public/hvm/hvm_op.h
--- a/xen/include/public/hvm/hvm_op.h Fri Dec 10 11:34:28 2010 +0000
+++ b/xen/include/public/hvm/hvm_op.h Fri Dec 10 11:36:57 2010 +0000
@@ -127,13 +127,16 @@ typedef struct xen_hvm_set_mem_type xen_
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 @@ typedef struct xen_hvm_get_time xen_hvm_
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__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog