search for: make_uri

...;ssh: you must specify exactly one server")); return NULL; diff --git a/src/launch-direct.c b/src/launch-direct.c index bb06c9e..96ae180 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -1207,12 +1207,14 @@ qemu_escape_param (guestfs_h *g, const char *param) static char * make_uri (guestfs_h *g, const char *scheme, const char *user, + const char *password, struct drive_server *server, const char *path) { xmlURI uri = { .scheme = (char *) scheme, .user = (char *) user }; CLEANUP_FREE char *query = NULL; CLEANUP_FREE char *pathsl...

...(may be NULL if not specified). */ + char *query; }; enum discard { diff --git a/src/launch-direct.c b/src/launch-direct.c index e6ed54a..00f3190 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -1189,7 +1189,8 @@ qemu_escape_param (guestfs_h *g, const char *param) static char * make_uri (guestfs_h *g, const char *scheme, const char *user, const char *password, - struct drive_server *server, const char *path) + struct drive_server *server, const char *path, + const char *querystring) { xmlURI uri = { .scheme = (char *) scheme,...

...t() at the end of guestfs_int_drive_source_qemu_param. --- lib/qemu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/qemu.c b/lib/qemu.c index cd859139d..a50eca988 100644 --- a/lib/qemu.c +++ b/lib/qemu.c @@ -746,6 +746,7 @@ guestfs_int_drive_source_qemu_param (guestfs_h *g, return make_uri (g, "gluster+unix", NULL, NULL, &src->servers[0], NULL); } + break; case drive_protocol_http: return make_uri (g, "http", src->username, src->secret, -- 2.14.3

v1 -> v2: - Rebase on top of Pino's version work. Two patches went upstream, these are the two remaining patches. Note the generation number is still inside the qemu.stat file. We could put it in the filename, I have no particular preference. Rich.

QEMU upstream has broken snapshot=on ... again. These two patches stop using it entirely. Instead we run 'qemu-img create' to create overlay disks as required. Note that the libvirt and UML backends were already doing this: The libvirt backend because <transient/> has never worked, and the UML backend was running uml_mkcow because the UML-equivalent syntax of snapshot=on was

Do not hardcode /tmp. --- make-fs/make-fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c index 1bec3e2..9c11fef 100644 --- a/make-fs/make-fs.c +++ b/make-fs/make-fs.c @@ -381,8 +381,9 @@ estimate_input (const char *input, uint64_t *estimate_rtn, char **ifmt_rtn) CLEANUP_FCLOSE FILE *fp = NULL; char line[256]; size_t len; +

Doing qemu feature detection in the direct backend takes ~100ms because we need to run `qemu -help' and `qemu -devices ?', and each of those interacts with glibc's very slow link loader. Fixing the link loader is really hard. Instead memoize the output of those two commands. This patch series first separates all the code dealing with qemu into a separate module (src/qemu.c) and

Move the creation of iscsi URIs away from make_uri, composing them manually: this is needed because libxml assumes colons (':') to separate user and password for the authority part, while with iscsi URIs the separator is percentage ('%'), which would be percent-encoded by libxml. --- src/launch-direct.c | 31 +++++++++++++++++++++++...

Hi All, Here's the latest patch. I think this should address the problem. The query string is now only appended to the end of a URI in the HTTP and HTTPS cases. The add-uri test now passes, and 'make check' still passes. -- Gabriel

...n -1; } if (construct_libvirt_xml_disk_target (g, xo, drv_index) == -1) diff --git a/lib/qemu.c b/lib/qemu.c index 887e31b..a77ea87 100644 --- a/lib/qemu.c +++ b/lib/qemu.c @@ -942,6 +942,8 @@ guestfs_int_drive_source_qemu_param (guestfs_h *g, case drive_protocol_tftp: return make_uri (g, "tftp", src->username, src->secret, &src->servers[0], src->u.exportname); + case drive_protocol_spdk: + return safe_strdup(g, src->servers[0].u.socket); } abort (); @@ -1016,6 +1018,7 @@ guestfs_int_discard_possible (guestfs_h *g, st...

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.