X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=examples%2Fto-xml.c;h=d6422e080dd5ed752d1c80a3dd17dd20e4aef7ce;hp=63e896da75a9a9d1bc581d2e01943b09fc874ebc;hb=a82bfb88e553c6626c99757779f9b500664409ba;hpb=3e9f98d0f73ec483b970c19ad1752acc380c38b9

diff --git a/examples/to-xml.c b/examples/to-xml.c
index 63e896d..d6422e0 100644
--- a/examples/to-xml.c
+++ b/examples/to-xml.c
@@ -10,7 +10,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include <guestfs.h>
 
@@ -23,7 +26,7 @@
 
 static void display_partition (guestfs_h *g, const char *dev);
 static void display_partitions (guestfs_h *g, const char *dev);
-static void display_ext23 (guestfs_h *g, const char *dev, const char *fstype);
+static void display_ext234 (guestfs_h *g, const char *dev, const char *fstype);
 
 int
 main (int argc, char *argv[])
@@ -56,8 +59,10 @@ main (int argc, char *argv[])
   CALL (devices = guestfs_list_devices (g), NULL);
   printf ("<devices>\n");
   for (i = 0; devices[i] != NULL; ++i) {
-    printf ("<device dev=\"%s\">\n", devices[i]);
-    display_partition (g, devices[i]);
+    int64_t size;
+    CALL (size = guestfs_blockdev_getsize64 (g, devices[i]), -1);
+    printf ("<device dev=\"%s\" size=\"%" PRIi64 "\">\n", devices[i], size);
+    display_partitions (g, devices[i]);
     free (devices[i]);
     printf ("</device>\n");
   }
@@ -83,7 +88,9 @@ main (int argc, char *argv[])
       if (strncmp (lvs[j], "/dev/", 5) == 0 &&
 	  strncmp (&lvs[j][5], vgs[i], len) == 0 &&
 	  lvs[j][len+5] == '/') {
-	printf ("<logvol name=\"%s\">\n", lvs[j]);
+	int64_t size;
+	CALL (size = guestfs_blockdev_getsize64 (g, lvs[j]), -1);
+	printf ("<logvol name=\"%s\" size=\"%" PRIi64 "\">\n", lvs[j], size);
 	display_partition (g, lvs[j]);
 	printf ("</logvol>\n");
 	free (lvs[j]);
@@ -111,14 +118,19 @@ display_partition (guestfs_h *g, const char *dev)
 
   CALL (what = guestfs_file (g, dev), NULL);
 
-  if (strstr (what, "boot sector") != NULL)
+  if (strcmp (what, "x86 boot sector") == 0)
+    /* This is what 'file' program shows for Windows/NTFS partitions. */
+    printf ("<windows/>\n");
+  else if (strstr (what, "boot sector") != NULL)
     display_partitions (g, dev);
   else if (strncmp (what, "LVM2", 4) == 0)
     printf ("<physvol/>\n");
   else if (strstr (what, "ext2 filesystem data") != NULL)
-    display_ext23 (g, dev, "ext2");
+    display_ext234 (g, dev, "ext2");
   else if (strstr (what, "ext3 filesystem data") != NULL)
-    display_ext23 (g, dev, "ext3");
+    display_ext234 (g, dev, "ext3");
+  else if (strstr (what, "ext4 filesystem data") != NULL)
+    display_ext234 (g, dev, "ext4");
   else if (strstr (what, "Linux/i386 swap file") != NULL)
     printf ("<linux-swap/>\n");
   else
@@ -131,11 +143,11 @@ display_partition (guestfs_h *g, const char *dev)
 static void
 display_partitions (guestfs_h *g, const char *dev)
 {
-  /* We can't look into a boot sector which is an LV.  That's
-   * a limitation of sorts of the Linux kernel.  (Actually, we
-   * could do this if we add the kpartx program to libguestfs).
+  /* We can't look into a boot sector which is an LV or partition.
+   * That's a limitation of sorts of the Linux kernel.  (Actually,
+   * we could do this if we add the kpartx program to libguestfs).
    */
-  if (strncmp (dev, "/dev/sd", 7) != 0) {
+  if (strncmp (dev, "/dev/sd", 7) != 0 || isdigit (dev[strlen(dev)-1])) {
     printf ("<vm-image dev=\"%s\"/>\n", dev);
     return;
   }
@@ -149,7 +161,9 @@ display_partitions (guestfs_h *g, const char *dev)
   for (i = 0; parts[i] != NULL; ++i) {
     /* Only display partition if it's in the device. */
     if (strncmp (parts[i], dev, len) == 0) {
-      printf ("<partition dev=\"%s\">\n", parts[i]);
+      int64_t size;
+      CALL (size = guestfs_blockdev_getsize64 (g, parts[i]), -1);
+      printf ("<partition dev=\"%s\" size=\"%" PRIi64 "\">\n", parts[i], size);
       display_partition (g, parts[i]);
       printf ("</partition>\n");
     }
@@ -160,9 +174,9 @@ display_partitions (guestfs_h *g, const char *dev)
   printf ("</partitions>\n");
 }
 
-/* Display some details on the ext2/3 filesystem on dev. */
+/* Display some details on the ext2/3/4 filesystem on dev. */
 static void
-display_ext23 (guestfs_h *g, const char *dev, const char *fstype)
+display_ext234 (guestfs_h *g, const char *dev, const char *fstype)
 {
   char **sbfields;
   int i;