X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=examples%2Fto-xml.c;h=45994cb335893267ac046e4b9eb187244b0d39e0;hp=f48d1ca7b625663064077ca6ebbf6d91f6a484a6;hb=fb998000e60b32219c2bf839044cff59f499dff1;hpb=627f89351d06e43564b47ea42cabaa522284c2a1

diff --git a/examples/to-xml.c b/examples/to-xml.c
index f48d1ca..45994cb 100644
--- a/examples/to-xml.c
+++ b/examples/to-xml.c
@@ -25,7 +25,7 @@
  * to stderr already.
  */
 #define CALL(call,errcode)			\
-  if ((call) == (errcode)) exit (1);
+  if ((call) == (errcode)) exit (EXIT_FAILURE);
 
 static void display_partition (guestfs_h *g, const char *dev);
 static void display_partitions (guestfs_h *g, const char *dev);
@@ -39,16 +39,18 @@ main (int argc, char *argv[])
 
   if (argc < 2 || access (argv[1], F_OK) != 0) {
     fprintf (stderr, "Usage: to-xml guest.img [guest.img ...]\n");
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   if (!(g = guestfs_create ())) {
     fprintf (stderr, "Cannot create libguestfs handle.\n");
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   for (i = 1; i < argc; ++i)
-    CALL (guestfs_add_drive (g, argv[i]), -1);
+    CALL (guestfs_add_drive_opts (g, argv[i],
+                                  GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                                  -1), -1);
 
   CALL (guestfs_launch (g), -1);
 
@@ -149,7 +151,7 @@ display_partitions (guestfs_h *g, const char *dev)
    * That's a limitation of sorts of the Linux kernel.  (Actually,
    * we could do this if we add the kpartx program to libguestfs).
    */
-  if (STRNEQLEN (dev, "/dev/sd", 7) || isdigit (dev[strlen(dev)-1])) {
+  if (strncmp (dev, "/dev/sd", 7) != 0 || isdigit (dev[strlen(dev)-1])) {
     printf ("<vm-image dev=\"%s\"/>\n", dev);
     return;
   }