[Xen-changelog] [xen-unstable] libxenlight: misc cleanup

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1263279834 0
# Node ID 6ae90d7f7f45cdb578c26fc8ee5f3997f8e0ba5e
# Parent  55109e7326cc47b95eaa43f8038e18026746048d
libxenlight: misc cleanup

wait_for_device_model expect two pointer as the end not 2 integers.
remove debugging message in libxl_list

Signed-off-by: Vincent Hanquez <vincent.hanquez@xxxxxxxxxxxxx>
---
 tools/libxl/libxl.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff -r 55109e7326cc -r 6ae90d7f7f45 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Tue Jan 12 07:03:14 2010 +0000
+++ b/tools/libxl/libxl.c       Tue Jan 12 07:03:54 2010 +0000
@@ -299,7 +299,6 @@ struct libxl_dominfo * libxl_domain_list
     for (i = 0; i < ret; i++) {
         memcpy(&(ptr[index].uuid), info[i].handle, 
sizeof(xen_domain_handle_t));
         ptr[index].domid = info[i].domain;
-           printf("domain %d [ret %d]\n", ptr[index].domid, ret);
 
         if (info[i].flags & XEN_DOMINF_dying)
             ptr[index].dying = 1;
@@ -1900,7 +1899,7 @@ int libxl_device_pci_add(struct libxl_ct
 
     hvm = is_hvm(ctx, domid);
     if (hvm) {
-        if (libxl_wait_for_device_model(ctx, domid, "running", 0,0) < 0) {
+        if (libxl_wait_for_device_model(ctx, domid, "running", NULL, NULL) < 
0) {
             return -1;
         }
         path = libxl_sprintf(ctx, "/local/domain/0/device-model/%d/state", 
domid);
@@ -1914,7 +1913,7 @@ int libxl_device_pci_add(struct libxl_ct
                            pcidev->bus, pcidev->dev, pcidev->func);
         path = libxl_sprintf(ctx, "/local/domain/0/device-model/%d/command", 
domid);
         xs_write(ctx->xsh, XBT_NULL, path, "pci-ins", strlen("pci-ins"));
-        if (libxl_wait_for_device_model(ctx, domid, "pci-inserted", 0,0) < 0)
+        if (libxl_wait_for_device_model(ctx, domid, "pci-inserted", NULL, 
NULL) < 0)
             XL_LOG(ctx, XL_LOG_ERROR, "Device Model didn't respond in time");
         path = libxl_sprintf(ctx, "/local/domain/0/device-model/%d/parameter", 
domid);
         vdevfn = libxl_xs_read(ctx, XBT_NULL, path);
@@ -1993,7 +1992,7 @@ int libxl_device_pci_remove(struct libxl
 
     hvm = is_hvm(ctx, domid);
     if (hvm) {
-        if (libxl_wait_for_device_model(ctx, domid, "running", 0,0) < 0) {
+        if (libxl_wait_for_device_model(ctx, domid, "running", NULL, NULL) < 
0) {
             return -1;
         }
         path = libxl_sprintf(ctx, "/local/domain/0/device-model/%d/state", 
domid);
@@ -2003,7 +2002,7 @@ int libxl_device_pci_remove(struct libxl
                        pcidev->bus, pcidev->dev, pcidev->func);
         path = libxl_sprintf(ctx, "/local/domain/0/device-model/%d/command", 
domid);
         xs_write(ctx->xsh, XBT_NULL, path, "pci-rem", strlen("pci-rem"));
-        if (libxl_wait_for_device_model(ctx, domid, "pci-removed", 0,0) < 0) {
+        if (libxl_wait_for_device_model(ctx, domid, "pci-removed", NULL, NULL) 
< 0) {
             XL_LOG(ctx, XL_LOG_ERROR, "Device Model didn't respond in time");
             return -1;
         }

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