From 163f7df8452f5d7eb47039a98cd97d498528e4d5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 26 Oct 2011 17:47:34 +0100
Subject: libvirt: Detect if a disk has the <readonly/> flag.

This changes the private function guestfs___for_each_disk so that the
<readonly/> flag on libvirt disks is detected and passed through to
the callback function.
---
 src/virt.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/virt.c b/src/virt.c
index cc11c68a..e4bafa28 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -167,6 +167,7 @@ guestfs___for_each_disk (guestfs_h *g,
                          virDomainPtr dom,
                          int (*f) (guestfs_h *g,
                                    const char *filename, const char *format,
+                                   int readonly,
                                    void *data),
                          void *data)
 {
@@ -284,9 +285,20 @@ guestfs___for_each_disk (guestfs_h *g,
       format = (char *) xmlNodeListGetString (doc, attr->children, 1);
     }
 
+    /* Get the <readonly/> flag. */
+    xmlXPathObjectPtr xpreadonly;
+
+    xpathCtx->node = nodes->nodeTab[i];
+    xpreadonly = xmlXPathEvalExpression (BAD_CAST "./readonly", xpathCtx);
+    int readonly = 0;
+    if (xpreadonly != NULL &&
+        xpreadonly->nodesetval &&
+        xpreadonly->nodesetval->nodeNr > 0)
+      readonly = 1;
+
     int t;
     if (f)
-      t = f (g, filename, format, data);
+      t = f (g, filename, format, readonly, data);
     else
       t = 0;
 
@@ -294,6 +306,7 @@ guestfs___for_each_disk (guestfs_h *g,
     xmlFree (format);
     xmlXPathFreeObject (xpfilename);
     xmlXPathFreeObject (xpformat);
+    xmlXPathFreeObject (xpreadonly);
 
     if (t == -1)
       goto cleanup;
@@ -320,7 +333,7 @@ guestfs___for_each_disk (guestfs_h *g,
 
 /* This was proposed as an external API, but it's not quite baked yet. */
 
-static int add_disk (guestfs_h *g, const char *filename, const char *format, void *optargs_vp);
+static int add_disk (guestfs_h *g, const char *filename, const char *format, int readonly, void *optargs_vp);
 static int connect_live (guestfs_h *g, virDomainPtr dom);
 
 static int
@@ -401,7 +414,8 @@ guestfs___add_libvirt_dom (guestfs_h *g, virDomainPtr dom,
 }
 
 static int
-add_disk (guestfs_h *g, const char *filename, const char *format,
+add_disk (guestfs_h *g,
+          const char *filename, const char *format, int readonly,
           void *optargs_vp)
 {
   struct guestfs_add_drive_opts_argv *optargs = optargs_vp;
-- 
cgit