qemu-iotests: Improve and make use of QMPTestCase.wait_until_completed()

[qemu.git] / xen-all.c

diff --git a/xen-all.c b/xen-all.c
index 9a27899ca1bff7b95fc4cdf66e32de62872ee8ad..ba3473901e6a5e47602f417706200cb01929b579 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -369,8 +369,8 @@ static int xen_remove_from_physmap(XenIOState *state,
     phys_offset = physmap->phys_offset;
     size = physmap->size;
 
-    DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", from ",
-            "%"HWADDR_PRIx"\n", phys_offset, phys_offset + size, start_addr);
+    DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", at "
+            "%"HWADDR_PRIx"\n", start_addr, start_addr + size, phys_offset);
 
     size >>= TARGET_PAGE_BITS;
     start_addr >>= TARGET_PAGE_BITS;
@@ -1001,7 +1001,7 @@ static void xen_exit_notifier(Notifier *n, void *data)
     xs_daemon_close(state->xenstore);
 }
 
-int xen_init(void)
+int xen_init(QEMUMachine *machine)
 {
     xen_xc = xen_xc_interface_open(0, 0, 0);
     if (xen_xc == XC_HANDLER_INITIAL_VALUE) {