#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
#include <unistd.h>
+#include <ctype.h>
#include <guestfs.h>
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");
}
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]);
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");
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;
}
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");
}