- Devel - libvirt List Archives

[libvirt PATCH] conf: properly clear out autogenerated macvtap names when formatting/parsing
by Laine Stump 25 Aug '20

25 Aug '20

Back when macvtap support was added in commit 315baab9443 in Feb. 2010 (libvirt-0.7.7), it was setup to autogenerate a name for the device if one wasn't supplied, in the pattern "macvtap%d" (or "macvlan%d"), similar to the way an unspecified standard tap device name will lead to an autogenerated "vnet%d". As a matter of fact, in commit ca1b7cc8e45 added in May 2010, the code was changed to *always* ignore a supplied device name for macvtap interfaces by deleting any name immediately during the <interface> parsing (this was intended to prevent one domain which had failed to completely start from deleting the macvtap device of another domain which had subsequently been provided the same device name (this will seem mildly ironic later). This was later fixed to only clear the device name when inactive XML was being parsed. HOWEVER - this was only done if the xml was <interface type='direct'> - autogenerated names were not cleared for <interface type='network'> (which could also result in a macvtap device). Although the names of "vnetX" tap devices had always been automatically cleared when parsing <interface> (see commit d1304583d from July 2008 (!)), at the time macvtap support was added, both vnetX and macvtapX device names were always included when formatting the XML. Then in commit a8be259d0cc (July 2011, libvirt-0.9.4), <interface> formatting was changed to also clear out "vnetX" device names during XML formatting as well. However the same treatment wasn't given to "macvtapX". The result of all this (among other things) was that when a running guest Now in 2020, there has been a report that a failed migration leads to the macvtap device of some other unrelated guest on the destination host losing its network connectivity. It was determined that this was due to the domain XML in the migration containing a macvtap device name, e.g. "macvtap0", that was already in use on the destination. Normally this wouldn't be a problem, because libvirt would see that the device was already in use, and then find a different unused name. But in this case, other external problems were causing the migration to fail prior to selecting a macvtap device and successfully opening it, and during error recovery, qemuProcessStop() was called, which went through all def->nets objects and (if they were macvtap) deleted the device specified in net->ifname; since libvirt hadn't gotten to the point of replacing the incoming "macvtap0" with the name of a device it actually created for this guest, that meant that "macvtap0" was deleted, *even though it was currently in use by a different guest*! Whew! So, it turns out that when formatting "migratable" XML, "vnetX" devices are omitted, just as when formatting "inactive" XML (I'm sure there's a bit of code somewhere that says "if (migratable) then set inactive too", but found it was easier to just try it out with "virsh dumpxml blah --migratable"). By making the code in both interface parsing and formatting consistent for "vnetX", "macvtapX", and "macvlanX", we can thus make sure that the autogenerated (and unneeded / completely *not* wanted) macvtap device name will not be sent with the migration XML. This way when a migration fails, net->ifname will be NULL, and libvirt won't have any device to try and delete. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/conf/domain_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8e7981bf25..6064d31b99 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12428,14 +12428,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } def->data.direct.linkdev = g_steal_pointer(&dev); - - if (ifname && - flags & VIR_DOMAIN_DEF_PARSE_INACTIVE && - (STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || - STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX))) { - VIR_FREE(ifname); - } - break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: @@ -12481,6 +12473,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (def->managed_tap != VIR_TRISTATE_BOOL_NO && ifname && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && (STRPREFIX(ifname, VIR_NET_GENERATED_TAP_PREFIX) || + STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || + STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) || (prefix && STRPREFIX(ifname, prefix)))) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); @@ -26796,6 +26790,8 @@ virDomainNetDefFormat(virBufferPtr buf, (def->managed_tap == VIR_TRISTATE_BOOL_NO || !((flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE) && (STRPREFIX(def->ifname, VIR_NET_GENERATED_TAP_PREFIX) || + STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || + STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) || (prefix && STRPREFIX(def->ifname, prefix)))))) { /* Skip auto-generated target names for inactive config. */ virBufferEscapeString(&attrBuf, " dev='%s'", def->ifname); -- 2.26.2

2 3

[libvirt PATCH] qemu: remove unreachable code in qemuProcessStart()
by Laine Stump 25 Aug '20

25 Aug '20

Back when the original version of this chunk of code was added (commit 41b087198 in libvirt-0.8.1 in April 2010), we used virExecDaemonize() to start the qemu process, and would continue on in the function (which at that time was called qemudStartVMDaemon()) even if a -1 was returned. So it was possible to get to this code with rv == -1 (it was called "ret" in that version of the code). In modern libvirt code, qemu is started with virCommandRun(); then we call virPidFileReadPath(); those are the only two ways of setting "rv" prior to this code being removed, and in either case if the new value of rv < 0, then we immediately skip over the rest of the code to the cleanup: label. This means that the code being removed by this patch is unreachable. (NB: anyway, attempting to fend off accidental removal of some other guest's nwfilter rules by carefully ordering all nwfilter teardowns to happen "before tap device deletion" is a fruitless pursuit, because a tap device could be deleted by the qemu process being terminated external to libvirt, i.e. we must instead avoid re-using tap device names. That is coming.) Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/qemu/qemu_process.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 126fabf5ef..832b2e6870 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6907,12 +6907,6 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; VIR_DEBUG("Handshake complete, child running"); - if (rv == -1) { - /* The VM failed to start; tear filters before taps */ - virDomainConfVMNWFilterTeardown(vm); - goto cleanup; - } - if (qemuDomainObjStartWorker(vm) < 0) goto cleanup; -- 2.26.2

2 2

[libvirt PATCH] gitdm: add missing aliases
by Pino Toscano 25 Aug '20

25 Aug '20

Consider a couple of misspelt emails in B-y tags. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- docs/gitdm/aliases | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/gitdm/aliases b/docs/gitdm/aliases index 83637bdff9..467e90f141 100644 --- a/docs/gitdm/aliases +++ b/docs/gitdm/aliases @@ -1,6 +1,8 @@ # Silly mistakes, mostly found in S-o-b or R-b tags. +"berrange redhat com" berrange(a)redhat.com "jdenemar redhat com" jdenemar(a)redhat.com +"jtomko redhat com" jtomko(a)redhat.com "pkrempa@redhat st.com" pkrempa(a)redhat.com berrange(a)localhost.localdomain berrange(a)redhat.com jyang@redhat jyang(a)redhat.com -- 2.26.2

2 1

[PATCH] qemu_namespace: Don't build namespace if domain doesn't have it enabled
by Michal Privoznik 24 Aug '20

24 Aug '20

Even if namespaces are disabled, then due to a missing check at the beginning of qemuDomainBuildNamespace(), the domain startup code still tries to populate (nonexistent) domain's namespace. Fixes: 8da362fe62766b4eee209cd3ce591ceb62299d13 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 797722b714..b6724a095f 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -616,6 +616,11 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, { VIR_AUTOSTRINGLIST paths = NULL; + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { + VIR_DEBUG("namespaces disabled for domain %s", vm->def->name); + return 0; + } + if (qemuDomainPopulateDevices(cfg, &paths) < 0) return -1; -- 2.26.2

2 1

[libvirt PATCH 0/3] Eliminate old tap/macvtap teardown stomping on new tap setup
by Laine Stump 24 Aug '20

24 Aug '20

The problem and solution are very well described in patches 2 and 3, but in short - because we (libvirt for macvtap, the kernel for tap) always try to assign the lowest numbered names possible to macvtap and tap devices, we sometimes create a new tap for a new guest using the same name as an old tap for an old guest that is shutting down simultaneous to setting up the new guest/tap. This can lead to the old guest teardown stomping on the new guest setup. These patches eliminate that problem by changing the strategy to do our best to *not* reuse tap / macvtap device names, but instead use a monotonically incrementing counter to name the devices. One possibly undesirable side effect of this (and the other) patch is that the longer a host is running without reboot, the higher the numbers tap device names will get. While users are accustomed to always seeing vnet0 and vnet1, they may be a bit surprised to now see vnet39283 or macvtap735. It has been pointed out to me that the same thing happened with PIDs a few years ago, and while it looked strange at first, everyone is now accustomed to it. Laine Stump (3): util: make locking versions of virNetDevMacVLan(Reserve|Release)Name() util: assign macvtap names using a monotonically increasing integer util: assign tap device names using a monotonically increasing integer src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 22 +++++++- src/util/virnetdevmacvlan.c | 109 +++++++++++++++++++++++++++--------- src/util/virnetdevtap.c | 79 +++++++++++++++++++++++++- src/util/virnetdevtap.h | 4 ++ 5 files changed, 186 insertions(+), 29 deletions(-) -- 2.26.2

2 7

[PATCH] qemuMigrationCapsToJSON: Refactor capability object formatting
by Peter Krempa 24 Aug '20

24 Aug '20

Use virJSONValueObjectCreate rather than creating the object piece-by-piece and use new accessors for bitmap to simplify the code. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_migration_params.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 513140a6ca..231a8a2ee8 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -763,21 +763,15 @@ qemuMigrationCapsToJSON(virBitmapPtr caps, qemuMigrationCapability bit; for (bit = 0; bit < QEMU_MIGRATION_CAP_LAST; bit++) { - g_autoptr(virJSONValue) cap = virJSONValueNewObject(); - const char *name = qemuMigrationCapabilityTypeToString(bit); - bool supported = false; - bool state = false; + g_autoptr(virJSONValue) cap = NULL; - ignore_value(virBitmapGetBit(caps, bit, &supported)); - if (!supported) + if (!virBitmapIsBitSet(caps, bit)) continue; - ignore_value(virBitmapGetBit(states, bit, &state)); - - if (virJSONValueObjectAppendString(cap, "capability", name) < 0) - return NULL; - - if (virJSONValueObjectAppendBoolean(cap, "state", state) < 0) + if (virJSONValueObjectCreate(&cap, + "s:capability", qemuMigrationCapabilityTypeToString(bit), + "b:state", virBitmapIsBitSet(states, bit), + NULL) < 0) return NULL; if (virJSONValueArrayAppend(json, cap) < 0) -- 2.26.2

2 1

[libvirt PATCH v3 00/10] remote: introduce a custom netcat impl for ssh tunnelling
by Daniel P. Berrangé 24 Aug '20

24 Aug '20

We have long had a problem with use of netcat for ssh tunnelling because there's no guarantee the UNIX socket path the client builds will match the UNIX socket path the remote host uses. We don't even allow session mode SSH tunnelling for this reason. We also can't easily auto-spawn libvirtd in session mode. With the introduction of modular daemons we also have potential for two completely different UNIX socket paths even for system mode, and the client can't know which to use. The solution to all these problems is to introduce a custom netcat impl. Instead passing the UNIX socket path, we pass the libvirt driver URI. The custom netcat then decides which socket path to use based on the remote build host environment. We still have to support netcat for interoperability with legacy libvirt versions, but we can default to the new virt-nc. v3: Now with more meson and less autotools ! Daniel P. Berrangé (10): rpc: merge logic for generating remote SSH shell script remote: push logic for default netcat binary into common helper remote: split off enums into separate source file remote: split out function for parsing URI scheme remote: parse the remote transport string earlier remote: split out function for constructing socket path remote: extract logic for determining daemon to connect to remote: introduce virt-ssh-helper binary rpc: switch order of args in virNetClientNewSSH rpc: use new virt-ssh-helper binary for remote tunnelling build-aux/syntax-check.mk | 2 +- docs/uri.html.in | 24 +- libvirt.spec.in | 2 + po/POTFILES.in | 2 + src/libvirt_remote.syms | 1 + src/remote/meson.build | 18 ++ src/remote/remote_driver.c | 323 ++++--------------------- src/remote/remote_sockets.c | 277 +++++++++++++++++++++ src/remote/remote_sockets.h | 70 ++++++ src/remote/remote_ssh_helper.c | 425 +++++++++++++++++++++++++++++++++ src/rpc/virnetclient.c | 170 ++++++++----- src/rpc/virnetclient.h | 29 ++- src/rpc/virnetsocket.c | 37 +-- src/rpc/virnetsocket.h | 4 +- tests/virnetsockettest.c | 12 +- 15 files changed, 1024 insertions(+), 372 deletions(-) create mode 100644 src/remote/remote_sockets.c create mode 100644 src/remote/remote_sockets.h create mode 100644 src/remote/remote_ssh_helper.c -- 2.26.2

2 12

[PATCH] qemu: Move virQEMUFileOpenAs to qemu_domain.c
by Peter Krempa 24 Aug '20

24 Aug '20

Commit 43620689794507308fbd3def6992a68ee2f8fa97 moved the function to util/virqemu.c which is compiled also on win32 and geteuid()/getegid() doesn't exist there. Move it to qemu_domain.c which is compiled only when the qemu driver is enabled. Originally I didn't want to put it here as qemu_domain.c is a code dump for helper functions but this is the least invasive fix. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 124 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 +++ src/util/virqemu.c | 130 --------------------------------------- src/util/virqemu.h | 7 --- 5 files changed, 131 insertions(+), 138 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d737e4d9e4..01c2e710cd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2939,7 +2939,6 @@ virQEMUBuildDriveCommandlineFromJSON; virQEMUBuildNetdevCommandlineFromJSON; virQEMUBuildObjectCommandlineFromJSON; virQEMUBuildQemuImgKeySecretOpts; -virQEMUFileOpenAs; # util/virrandom.h diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 715815f224..b321722f0e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10828,6 +10828,130 @@ qemuDomainDiskBlockJobIsSupported(virDomainObjPtr vm, } +int +virQEMUFileOpenAs(uid_t fallback_uid, + gid_t fallback_gid, + bool dynamicOwnership, + const char *path, + int oflags, + bool *needUnlink) +{ + struct stat sb; + bool is_reg = true; + bool need_unlink = false; + unsigned int vfoflags = 0; + int fd = -1; + int path_shared = virFileIsSharedFS(path); + uid_t uid = geteuid(); + gid_t gid = getegid(); + + /* path might be a pre-existing block dev, in which case + * we need to skip the create step, and also avoid unlink + * in the failure case */ + if (oflags & O_CREAT) { + need_unlink = true; + + /* Don't force chown on network-shared FS + * as it is likely to fail. */ + if (path_shared <= 0 || dynamicOwnership) + vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; + + if (stat(path, &sb) == 0) { + /* It already exists, we don't want to delete it on error */ + need_unlink = false; + + is_reg = !!S_ISREG(sb.st_mode); + /* If the path is regular file which exists + * already and dynamic_ownership is off, we don't + * want to change its ownership, just open it as-is */ + if (is_reg && !dynamicOwnership) { + uid = sb.st_uid; + gid = sb.st_gid; + } + } + } + + /* First try creating the file as root */ + if (!is_reg) { + if ((fd = open(path, oflags & ~O_CREAT)) < 0) { + fd = -errno; + goto error; + } + } else { + if ((fd = virFileOpenAs(path, oflags, S_IRUSR | S_IWUSR, uid, gid, + vfoflags | VIR_FILE_OPEN_NOFORK)) < 0) { + /* If we failed as root, and the error was permission-denied + (EACCES or EPERM), assume it's on a network-connected share + where root access is restricted (eg, root-squashed NFS). If the + qemu user is non-root, just set a flag to + bypass security driver shenanigans, and retry the operation + after doing setuid to qemu user */ + if ((fd != -EACCES && fd != -EPERM) || fallback_uid == geteuid()) + goto error; + + /* On Linux we can also verify the FS-type of the directory. */ + switch (path_shared) { + case 1: + /* it was on a network share, so we'll continue + * as outlined above + */ + break; + + case -1: + virReportSystemError(-fd, oflags & O_CREAT + ? _("Failed to create file " + "'%s': couldn't determine fs type") + : _("Failed to open file " + "'%s': couldn't determine fs type"), + path); + goto cleanup; + + case 0: + default: + /* local file - log the error returned by virFileOpenAs */ + goto error; + } + + /* If we created the file above, then we need to remove it; + * otherwise, the next attempt to create will fail. If the + * file had already existed before we got here, then we also + * don't want to delete it and allow the following to succeed + * or fail based on existing protections + */ + if (need_unlink) + unlink(path); + + /* Retry creating the file as qemu user */ + + /* Since we're passing different modes... */ + vfoflags |= VIR_FILE_OPEN_FORCE_MODE; + + if ((fd = virFileOpenAs(path, oflags, + S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, + fallback_uid, fallback_gid, + vfoflags | VIR_FILE_OPEN_FORK)) < 0) { + virReportSystemError(-fd, oflags & O_CREAT + ? _("Error from child process creating '%s'") + : _("Error from child process opening '%s'"), + path); + goto cleanup; + } + } + } + cleanup: + if (needUnlink) + *needUnlink = need_unlink; + return fd; + + error: + virReportSystemError(-fd, oflags & O_CREAT + ? _("Failed to create file '%s'") + : _("Failed to open file '%s'"), + path); + goto cleanup; +} + + /** * qemuDomainOpenFile: * @driver: driver object diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 70fdb48317..e6d4acb8d4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1024,6 +1024,13 @@ void qemuDomainRemoveInactiveJob(virQEMUDriverPtr driver, void qemuDomainRemoveInactiveJobLocked(virQEMUDriverPtr driver, virDomainObjPtr vm); +int virQEMUFileOpenAs(uid_t fallback_uid, + gid_t fallback_gid, + bool dynamicOwnership, + const char *path, + int oflags, + bool *needUnlink); + int qemuDomainOpenFile(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/util/virqemu.c b/src/util/virqemu.c index e1c8673390..20cb09d878 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -22,18 +22,12 @@ #include <config.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - #include "virbuffer.h" #include "virerror.h" #include "virlog.h" #include "virqemu.h" #include "virstring.h" #include "viralloc.h" -#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -447,127 +441,3 @@ virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf, virBufferAddLit(buf, ","); } } - - -int -virQEMUFileOpenAs(uid_t fallback_uid, - gid_t fallback_gid, - bool dynamicOwnership, - const char *path, - int oflags, - bool *needUnlink) -{ - struct stat sb; - bool is_reg = true; - bool need_unlink = false; - unsigned int vfoflags = 0; - int fd = -1; - int path_shared = virFileIsSharedFS(path); - uid_t uid = geteuid(); - gid_t gid = getegid(); - - /* path might be a pre-existing block dev, in which case - * we need to skip the create step, and also avoid unlink - * in the failure case */ - if (oflags & O_CREAT) { - need_unlink = true; - - /* Don't force chown on network-shared FS - * as it is likely to fail. */ - if (path_shared <= 0 || dynamicOwnership) - vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; - - if (stat(path, &sb) == 0) { - /* It already exists, we don't want to delete it on error */ - need_unlink = false; - - is_reg = !!S_ISREG(sb.st_mode); - /* If the path is regular file which exists - * already and dynamic_ownership is off, we don't - * want to change its ownership, just open it as-is */ - if (is_reg && !dynamicOwnership) { - uid = sb.st_uid; - gid = sb.st_gid; - } - } - } - - /* First try creating the file as root */ - if (!is_reg) { - if ((fd = open(path, oflags & ~O_CREAT)) < 0) { - fd = -errno; - goto error; - } - } else { - if ((fd = virFileOpenAs(path, oflags, S_IRUSR | S_IWUSR, uid, gid, - vfoflags | VIR_FILE_OPEN_NOFORK)) < 0) { - /* If we failed as root, and the error was permission-denied - (EACCES or EPERM), assume it's on a network-connected share - where root access is restricted (eg, root-squashed NFS). If the - qemu user is non-root, just set a flag to - bypass security driver shenanigans, and retry the operation - after doing setuid to qemu user */ - if ((fd != -EACCES && fd != -EPERM) || fallback_uid == geteuid()) - goto error; - - /* On Linux we can also verify the FS-type of the directory. */ - switch (path_shared) { - case 1: - /* it was on a network share, so we'll continue - * as outlined above - */ - break; - - case -1: - virReportSystemError(-fd, oflags & O_CREAT - ? _("Failed to create file " - "'%s': couldn't determine fs type") - : _("Failed to open file " - "'%s': couldn't determine fs type"), - path); - goto cleanup; - - case 0: - default: - /* local file - log the error returned by virFileOpenAs */ - goto error; - } - - /* If we created the file above, then we need to remove it; - * otherwise, the next attempt to create will fail. If the - * file had already existed before we got here, then we also - * don't want to delete it and allow the following to succeed - * or fail based on existing protections - */ - if (need_unlink) - unlink(path); - - /* Retry creating the file as qemu user */ - - /* Since we're passing different modes... */ - vfoflags |= VIR_FILE_OPEN_FORCE_MODE; - - if ((fd = virFileOpenAs(path, oflags, - S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, - fallback_uid, fallback_gid, - vfoflags | VIR_FILE_OPEN_FORK)) < 0) { - virReportSystemError(-fd, oflags & O_CREAT - ? _("Error from child process creating '%s'") - : _("Error from child process opening '%s'"), - path); - goto cleanup; - } - } - } - cleanup: - if (needUnlink) - *needUnlink = need_unlink; - return fd; - - error: - virReportSystemError(-fd, oflags & O_CREAT - ? _("Failed to create file '%s'") - : _("Failed to open file '%s'"), - path); - goto cleanup; -} diff --git a/src/util/virqemu.h b/src/util/virqemu.h index e4e071f7c5..b1296cb657 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -63,10 +63,3 @@ void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf, virStorageEncryptionInfoDefPtr enc, const char *alias) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - -int virQEMUFileOpenAs(uid_t fallback_uid, - gid_t fallback_gid, - bool dynamicOwnership, - const char *path, - int oflags, - bool *needUnlink); -- 2.26.2

2 2

[libvirt PATCH 00/19] Build with -Wdeclaration-after-statement
by Ján Tomko 24 Aug '20

24 Aug '20

Most of the changes required to build with -Wdeclaration-after-statement seem pretty reasonable. Not so sure about the lack of semicolon after VIR_XPATH_NODE_AUTORESTORE https://gitlab.com/jano.tomko/libvirt/-/pipelines/173793788 Ján Tomko (19): util: virRandomInt: remove temporary variable util: virHostMemSetParameters: remove pointless variable util: virHostMem*Parameters: split out non-Linux stubs util: move declarations in virStorageFileChainLookup Move declarations before statements Split declarations from initializations Move debug statements after declarations rpc: move lock after declaration security: move chardevData declaration util: virNetDevBridgeSet: split declarations tests: sockettest: move declarations tests: authconfigtest: move declarations util: cgroup: wrap BACKEND_CALL macro in a block tests: iscsitest: split out testISCSIScanTargetsTests util: xml: use pragma in VIR_XPATH_NODE_AUTORESTORE VIR_XPATH_NODE_AUTORESTORE: remove semicolon from users src: internal: add VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT tests: use VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT build: add -Wdeclaration-after-statement meson.build | 2 +- src/bhyve/bhyve_parse_command.c | 3 +- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 118 +++++++++++----------- src/conf/interface_conf.c | 8 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 21 ++-- src/conf/networkcommon_conf.c | 2 +- src/conf/node_device_conf.c | 34 +++---- src/conf/numa_conf.c | 6 +- src/conf/nwfilter_conf.c | 5 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/virsavecookie.c | 2 +- src/conf/virstorageobj.c | 3 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/internal.h | 9 ++ src/lxc/lxc_container.c | 4 +- src/lxc/lxc_controller.c | 6 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_driver.c | 5 +- src/nwfilter/nwfilter_ebiptables_driver.c | 8 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 12 +-- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 8 +- src/qemu/qemu_domain.c | 12 ++- src/qemu/qemu_domainjob.c | 4 +- src/qemu/qemu_migration_cookie.c | 6 +- src/qemu/qemu_monitor.c | 9 +- src/qemu/qemu_process.c | 10 +- src/remote/remote_daemon_dispatch.c | 6 +- src/remote/remote_daemon_stream.c | 13 ++- src/remote/remote_driver.c | 24 +++-- src/rpc/virnetclient.c | 8 +- src/rpc/virnetmessage.c | 4 +- src/rpc/virnetsocket.c | 9 +- src/security/security_dac.c | 20 ++-- src/security/security_selinux.c | 20 ++-- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_file_fs.c | 3 +- src/storage/storage_util.c | 2 +- src/util/vircgroupbackend.h | 26 ++--- src/util/virdaemon.c | 4 +- src/util/virdbus.c | 4 +- src/util/virerror.c | 3 +- src/util/virfile.c | 14 ++- src/util/virfirewall.c | 3 +- src/util/virhostmem.c | 37 ++++--- src/util/virkeycode.c | 4 +- src/util/virnetdevbridge.c | 6 +- src/util/virnetdevip.c | 4 +- src/util/virnetlink.c | 10 +- src/util/virobject.c | 5 +- src/util/virprocess.c | 3 +- src/util/virqemu.c | 2 +- src/util/virrandom.c | 3 +- src/util/virstorageencryption.c | 4 +- src/util/virstoragefile.c | 20 ++-- src/util/virutil.c | 8 +- src/util/virxml.h | 3 +- src/vbox/vbox_common.c | 21 ++-- src/vbox/vbox_snapshot_conf.c | 8 +- src/vz/vz_driver.c | 10 +- tests/commandhelper.c | 5 +- tests/domaincapstest.c | 2 + tests/eventtest.c | 5 +- tests/nodedevmdevctltest.c | 3 +- tests/sockettest.c | 24 +++-- tests/virauthconfigtest.c | 28 ++--- tests/vircgroupmock.c | 8 +- tests/viriscsitest.c | 47 +++++---- tests/virnetsockettest.c | 2 + tests/virnettlscontexttest.c | 3 + tests/virnettlssessiontest.c | 3 + tests/virrotatingfiletest.c | 7 +- tests/virstoragetest.c | 2 + tests/virstringtest.c | 4 + tests/viruritest.c | 2 + tools/virsh-domain.c | 12 ++- tools/virsh-interface.c | 3 +- tools/virsh-network.c | 3 +- tools/virsh-nodedev.c | 2 +- tools/virsh-util.c | 3 +- tools/virsh-volume.c | 5 +- tools/virt-host-validate-common.c | 3 +- tools/wireshark/src/packet-libvirt.c | 3 +- 91 files changed, 481 insertions(+), 334 deletions(-) -- 2.26.2

2 20

[PATCH 0/7] qemu_migration_params: Simplify code by using automatic memory handling
by Peter Krempa 24 Aug '20

24 Aug '20

I've cleaned up the migration params code before actually going to add new features. Peter Krempa (7): qemuMigrationParamsNew: Use new memory allocation to simplify code qemuMigrationParamsFromFlags: Use 'g_autoptr' to remove 'error:' label qemuMigrationParamsFromJSON: Unify return value handling with other functions qemuMigrationParamsToJSON: Refactor variable cleanup qemuMigrationCapsToJSON: Refactor variable cleanup qemuMigrationParamsParse: Refactor variable cleanup qemuMigrationCapsCheck: Refactor variable cleanup src/qemu/qemu_migration_params.c | 158 +++++++++++-------------------- 1 file changed, 56 insertions(+), 102 deletions(-) -- 2.26.2

2 15