search for: xphost

This series improves ceph rbd support in libguestfs. It uses the servers list, adds support for a custom username, and starts to add support for custom secret.

Simple fix for this assert-fail found in: https://bugzilla.redhat.com/show_bug.cgi?id=1370424 Rich.

Miscellaneous fixes to: - Handling of Ceph drives now works end-to-end (RHBZ#1026688). - In particular, you can now use rbd:/// URIs in guestfish (and they work). - Parse Ceph & NBD network drives from libvirt XML correctly, so that existing domains with Ceph/NBD drives can be added (eg. using guestfish -d option). - Add more testing of the above.

...file system (profiles share path). The test directories were created and the permissions + acls looks fine. Now I logon with this testuser at winXP machine. I can see "testdir1" + "testdir2" on the desktop. Now I delete "testdir1" and create a new dir called "fromxphost". So I see on the XP machine two dirs, called "testdir2" + "fromxphost". I logoff from the XPhost and log into the w2k machine again. Here is the issue --> I see three directories, called "testdir1", "testdir2" and "fromxphost". When I logof...

...xmlDocPtr doc, int (*f) (guestfs_h *g, const char *filename, const char *format, @@ -509,6 +511,8 @@ for_each_disk (guestfs_h *g, CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpprotocol = NULL; CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xphost = NULL; CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpusername = NULL; + CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xppool = NULL; + CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpvolume = NULL; xmlAttrPtr attr; int readonly; int t; @@ -628,22 +632,65 @@ for...

...xmlDocPtr doc, int (*f) (guestfs_h *g, const char *filename, const char *format, @@ -509,6 +511,8 @@ for_each_disk (guestfs_h *g, CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpprotocol = NULL; CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xphost = NULL; CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpusername = NULL; + CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xppool = NULL; + CLEANUP_XMLXPATHFREEOBJECT xmlXPathObjectPtr xpvolume = NULL; xmlAttrPtr attr; int readonly; int t; @@ -628,22 +632,66 @@ for...

...if (res == 0 || secret == NULL) { + error (g, "internal error: cannot encode the rbd secret as base64"); + return -1; + } + } else { + secret = (char *) value; + } + + assert (secret != NULL); } xphost = xmlXPathEvalExpression (BAD_CAST "./source/host", @@ -670,7 +784,7 @@ for_each_disk (guestfs_h *g, readonly = 1; if (f) - t = f (g, filename, format, readonly, protocol, server, username, data); + t = f (g, filename, format, readonly, protocol, server, us...

Move the checks for empty xmlXPathObjectPtr, and for extracting the result string out of it, to a new helper functions. This is just code motion, there should be no behaviour changes. --- src/libvirt-domain.c | 122 +++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 72 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4d4142d..baab307

...d_libvirt_dom (guestfs_h *g, void *domvp, - const struct guestfs_add_libvirt_dom_argv *optargs) + const struct guestfs_add_libvirt_dom_argv *optargs) { virDomainPtr dom = domvp; ssize_t r; @@ -591,7 +591,7 @@ for_each_disk (guestfs_h *g, } xphost = xmlXPathEvalExpression (BAD_CAST "./source/host", - xpathCtx); + xpathCtx); if (xphost == NULL || xphost->nodesetval == NULL) continue; @@ -707,11 +707,11 @@ connect_live (guestfs_h *g, virDomainPtr dom...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67