35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
Index: 2007-05-14/xen/arch/x86/hvm/hvm.c
|
|
===================================================================
|
|
--- 2007-05-14.orig/xen/arch/x86/hvm/hvm.c 2007-05-14 08:28:38.000000000 +0200
|
|
+++ 2007-05-14/xen/arch/x86/hvm/hvm.c 2007-05-14 13:47:02.000000000 +0200
|
|
@@ -824,6 +824,15 @@ void hvm_update_guest_cr3(struct vcpu *v
|
|
void hvm_hypercall_page_initialise(struct domain *d,
|
|
void *hypercall_page)
|
|
{
|
|
+#ifdef __x86_64__
|
|
+ /*
|
|
+ * Since this operation is one of the very first executed by PV drivers
|
|
+ * on initialisation or after save/restore, it is a sensible point at
|
|
+ * which to sample the execution mode of the guest and latch 32- or 64-
|
|
+ * bit format for shared state.
|
|
+ */
|
|
+ d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8);
|
|
+#endif
|
|
hvm_funcs.init_hypercall_page(d, hypercall_page);
|
|
}
|
|
|
|
@@ -1053,13 +1062,6 @@ long do_hvm_op(unsigned long op, XEN_GUE
|
|
break;
|
|
case HVM_PARAM_CALLBACK_IRQ:
|
|
hvm_set_callback_via(d, a.value);
|
|
- /*
|
|
- * Since this operation is one of the very first executed
|
|
- * by PV drivers on initialisation or after save/restore, it
|
|
- * is a sensible point at which to sample the execution mode of
|
|
- * the guest and latch 32- or 64-bit format for shared state.
|
|
- */
|
|
- d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8);
|
|
break;
|
|
}
|
|
d->arch.hvm_domain.params[a.index] = a.value;
|