[PATCH] Re: [Xen-devel] PV driver build error for latest Xen0: #398

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

>And it should be c/s 393 that introduced this issue:

Oh, I'm sorry, I forgot to submit the Xen side patch along with the Linux
side one. Here it is:

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: 2008-01-07/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
===================================================================
--- 2008-01-07.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c  
2007-11-12 08:47:41.000000000 +0100
+++ 2008-01-07/unmodified_drivers/linux-2.6/platform-pci/evtchn.c       
2008-01-17 17:53:37.000000000 +0100
@@ -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);
 
Index: 2008-01-07/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
===================================================================
--- 2008-01-07.orig/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c  
2007-11-02 17:25:53.000000000 +0100
+++ 2008-01-07/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c       
2008-01-17 18:02:17.000000000 +0100
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel