[libvirt PATCH 0/4] fix recent commits
Ján Tomko (4): docs: fix virt-qemu-run man page docs: fix since version in driver documentation qemu_shim: cosmetic fixes qemu: snapshot: go through cleanup on error docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- docs/manpages/virt-qemu-run.rst | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_shim.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) -- 2.21.0
Fix a documentation generation error: System Message: WARNING/2 (<stdin>, line 15); backlink Inline literal start-string without end-string. As well as the 'independant' typo. Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: d6006672788ec0f0290d35c76ceb9672476d1ea8 --- Did not investigate whether the generator can be told to use stderr instead of hiding the errors in the output files. docs/manpages/virt-qemu-run.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.rst index 7f66f7c3ab..5074a928b7 100644 --- a/docs/manpages/virt-qemu-run.rst +++ b/docs/manpages/virt-qemu-run.rst @@ -14,13 +14,13 @@ Run a standalone QEMU guest SYNOPSIS ======== -``virt-qemu-run [OPTIONS...] [IGUEST-XML] +``virt-qemu-run [OPTIONS...] [GUEST-XML]`` DESCRIPTION =========== This tool provides a way to run a standalone QEMU guest such that it -is completely independant of libvirtd. It makes use of the embedded +is completely independent of libvirtd. It makes use of the embedded QEMU driver support to run the VM placing files under an isolated directory tree. When the guest is run with this tool it is invisible to libvirtd and thus also invisible to other libvirt tools such as -- 2.21.0
Also one stray angle bracket. Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: 068efae5b1a9efeea4a9c3bc0ae80747da5024fb Fixes: 3e9076e777aff2f4b08330ed17e559fcfb6b3529 --- docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index f6abb45706..87542afd27 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -66,7 +66,7 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) <h3><a id="uriembedded">Embedded driver</a></h3> <p> - Since 6.0.0 the QEMU driver has experimental support for operating + Since 6.1.0 the QEMU driver has experimental support for operating in an embedded mode. In this scenario, rather than connecting to the libvirtd daemon, the QEMU driver runs in the client application process directly. To use this the client application must have @@ -149,7 +149,7 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) when opening a future connection. </p> - <h4><a id="embedAPI">API usage with event loop></a></h4> + <h4><a id="embedAPI">API usage with event loop</a></h4> <p> To use the QEMU driver in embedded mode the application must diff --git a/docs/drvsecret.html.in b/docs/drvsecret.html.in index 9a05fe1f09..1bd7d75215 100644 --- a/docs/drvsecret.html.in +++ b/docs/drvsecret.html.in @@ -35,7 +35,7 @@ secret+ssh://root@example.com/system (remote access, SSH tunnelled) <h3><a id="uriembedded">Embedded driver</a></h3> <p> - Since 6.0.0 the secret driver has experimental support for operating + Since 6.1.0 the secret driver has experimental support for operating in an embedded mode. In this scenario, rather than connecting to the libvirtd daemon, the secret driver runs in the client application process directly. To open the driver in embedded mode the app use the -- 2.21.0
Remove bogus G_GNUC_UNUSED attribute and add a missing space. Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: d6006672788ec0f0290d35c76ceb9672476d1ea8 --- src/qemu/qemu_shim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index f4616f97b2..ccdb4f6b5b 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -45,7 +45,7 @@ qemuShimEventLoop(void *opaque G_GNUC_UNUSED) /* Runs in event loop thread context */ static void qemuShimEventLoopStop(int watch G_GNUC_UNUSED, - int fd G_GNUC_UNUSED, + int fd, int event G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { @@ -102,7 +102,7 @@ int main(int argc, char **argv) GOptionContext *ctx; GOptionEntry entries[] = { { "secret", 's', 0, G_OPTION_ARG_STRING_ARRAY, &secrets, "Load secret file", "SECRET-XML-FILE,SECRET-VALUE-FILE" }, - { "root", 'r', 0, G_OPTION_ARG_STRING, &root, "Root directory", "DIR"}, + { "root", 'r', 0, G_OPTION_ARG_STRING, &root, "Root directory", "DIR" }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "Debug output", NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Verbose output", NULL }, { 0 } -- 2.21.0
A recent commit added an error check for too-nested backing chains followed by a return, even though errors above jump to cleanup. Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: b168fa88b85dec181882816ab65a59a6c4500667 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc080b4a48..048855b533 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14654,7 +14654,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, snapdisk->src->format = VIR_STORAGE_FILE_QCOW2; if (qemuDomainStorageSourceValidateDepth(defdisk->src, 1, defdisk->dst) < 0) - return -1; + goto cleanup; /* creates cmd line args: qemu-img create -f qcow2 -o */ if (!(cmd = virCommandNewArgList(qemuImgPath, -- 2.21.0
On Mon, Jan 27, 2020 at 05:00:09PM +0100, Ján Tomko wrote:
Ján Tomko (4): docs: fix virt-qemu-run man page docs: fix since version in driver documentation qemu_shim: cosmetic fixes qemu: snapshot: go through cleanup on error
docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- docs/manpages/virt-qemu-run.rst | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_shim.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Mon, 2020-01-27 at 17:00 +0100, Ján Tomko wrote:
Ján Tomko (4): docs: fix virt-qemu-run man page docs: fix since version in driver documentation qemu_shim: cosmetic fixes qemu: snapshot: go through cleanup on error
docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- docs/manpages/virt-qemu-run.rst | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_shim.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Ján Tomko