[Xen-changelog] [xen-unstable] pv-on-hvm: Fix up linux code after hypercall-type-checking changes.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201102972 0
# Node ID 1c826ea72a8018bb29c50958a541764c356a3f51
# Parent  5a3448506d9c2532ef1e45b1571ac20ee264f6ee
pv-on-hvm: Fix up linux code after hypercall-type-checking changes.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/platform-pci/evtchn.c         |    9 +++++----
 unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff -r 5a3448506d9c -r 1c826ea72a80 
unmodified_drivers/linux-2.6/platform-pci/evtchn.c
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c        Wed Jan 23 
14:30:56 2008 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c        Wed Jan 23 
15:42:52 2008 +0000
@@ -118,8 +118,8 @@ void unmask_evtchn(int port)
           ever bind event channels to vcpu 0 in HVM guests. */
        if (unlikely(cpu != 0)) {
                evtchn_unmask_t op = { .port = port };
-               (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask,
-                                                 &op);
+               VOID(HYPERVISOR_event_channel_op(EVTCHNOP_unmask,
+                                                &op));
                put_cpu();
                return;
        }
@@ -227,7 +227,8 @@ void unbind_from_irqhandler(unsigned int
                mask_evtchn(evtchn);
                if (irq_evtchn[irq].close) {
                        struct evtchn_close close = { .port = evtchn };
-                       HYPERVISOR_event_channel_op(EVTCHNOP_close, &close);
+                       if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close))
+                               BUG();
                }
        }
 
@@ -310,7 +311,7 @@ static irqreturn_t evtchn_interrupt(int 
 
 void force_evtchn_callback(void)
 {
-       (void)HYPERVISOR_xen_version(0, NULL);
+       VOID(HYPERVISOR_xen_version(0, NULL));
 }
 EXPORT_SYMBOL(force_evtchn_callback);
 
diff -r 5a3448506d9c -r 1c826ea72a80 
unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
--- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c        Wed Jan 
23 14:30:56 2008 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c        Wed Jan 
23 15:42:52 2008 +0000
@@ -58,7 +58,7 @@ static int bp_suspend(void)
 
        BUG_ON(!irqs_disabled());
 
-       suspend_cancelled = HYPERVISOR_shutdown(SHUTDOWN_suspend);
+       suspend_cancelled = HYPERVISOR_suspend(0);
 
        if (!suspend_cancelled) {
                write_lock(&suspend_lock);

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