- Devel - libvirt List Archives

[libvirt] [PATCH] all: don't wait for driver lock during startup
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

When the drivers acquire their pidfile lock we don't want to wait if the lock is already held. We need the driver to immediately report error, causing the daemon to exit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/leaseshelper.c | 2 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/secret/secret_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index cfcf4e1fba..5387ac5570 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1280,7 +1280,7 @@ bhyveStateInitialize(bool privileged, } if ((bhyve_driver->lockFD = - virPidFileAcquire(BHYVE_STATE_DIR, "driver", true, getpid())) < 0) + virPidFileAcquire(BHYVE_STATE_DIR, "driver", false, getpid())) < 0) goto cleanup; if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 868e49c56e..f575768c4c 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -120,7 +120,7 @@ netcfStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; /* open netcf */ diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index fcd7f1c04a..2feaeb95b7 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1199,7 +1199,7 @@ udevStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; driver->udev = udev_new(); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a99c7471bb..492028c487 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -747,7 +747,7 @@ libxlStateInitialize(bool privileged, } if ((libxl_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; if (!(libxl_driver->lockManager = diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3982c24f34..d0b6703101 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1607,7 +1607,7 @@ static int lxcStateInitialize(bool privileged, } if ((lxc_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto cleanup; /* Get all the running persistent or transient configs first */ diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 89d9a003e2..2a10fbf33a 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -164,7 +164,7 @@ main(int argc, char **argv) goto cleanup; /* Try to claim the pidfile, exiting if we can't */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0) + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; /* Since interfaces can be hot plugged, we need to make sure that the diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 1920f4566e..1f3f867599 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -637,7 +637,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto failure; if (!(driver->devs = virNodeDeviceObjListNew())) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index d883462948..8bc63c506c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1848,7 +1848,7 @@ nodeStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; if (!(driver->devs = virNodeDeviceObjListNew()) || diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 43561241f6..530e4f5872 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -215,7 +215,7 @@ nwfilterStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (virNWFilterIPAddrMapInit() < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc0d12c335..d3a144aabd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -677,7 +677,7 @@ qemuStateInitialize(bool privileged, } if ((qemu_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img"); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9344948db4..0af2bcef96 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -504,7 +504,7 @@ secretStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (!(driver->secrets = virSecretObjListNew())) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 75430fb0d9..f5d05a7f43 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4129,7 +4129,7 @@ vzStateInitialize(bool privileged, } if ((vz_driver_lock_fd = - virPidFileAcquire(VZ_STATEDIR, "driver", true, getpid())) < 0) + virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0) return -1; if (prlsdkInit() < 0) { -- 2.21.0

2 1

[libvirt] [PATCH] interface: fix driver name in state directory path
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

Typo meant we use 'nodedev' instead of 'interface'. This doesn't hurt libvirtd because if a process tries to acquire a lock it already holds it will succeed. It fails when nodedev & interface drivers are in separate daemons though. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/interface/interface_backend_netcf.c | 4 ++-- src/interface/interface_backend_udev.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index f575768c4c..0000587cee 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -102,14 +102,14 @@ netcfStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto error; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto error; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 2feaeb95b7..fea5108dbc 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1181,14 +1181,14 @@ udevStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto cleanup; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto cleanup; } -- 2.21.0

2 1

[libvirt] [PATCH 0/5] libvirt_nss: Report newer addresses first
by Michal Privoznik 15 Jul '19

15 Jul '19

See the last patch for explanation. Michal Prívozník (5): libvirt_nss: Use VIR_STEAL_PTR() in findLease() libvirt_nss: Use VIR_AUTOPTR and VIR_AUTOFREE libvirt_nss: Drop some needless cleanup labels libvirt_nss: Pass @name to appendAddr() libvirt_nss: Report newer addresses first tests/nssdata/virbr0.status | 6 +-- tests/nsstest.c | 21 ++++------ tools/nss/libvirt_nss.c | 80 +++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 47 deletions(-) -- 2.21.0

2 11

[libvirt] [PATCH] security: aa-helper: allow virt-aa-helper to read .vhd images
by Christian Ehrhardt 15 Jul '19

15 Jul '19

VHD images can be used as any other, so we should add them to the list of types that virt-aa-helper can read when creating the per-guest rules for backing files. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index 78994bcda6..bf6bd297d1 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -63,6 +63,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { /**.qcow{,2} r, /**.qed r, /**.vmdk r, + /**.vhd r, /**.[iI][sS][oO] r, /**/disk{,.*} r, -- 2.22.0

3 3

[libvirt] [PATCH v3 0/2] add support for bochs-video device
by Jonathon Jongsma 15 Jul '19

15 Jul '19

Changes from v2: - fix version number in documentation - move bochs to its own case in virDomainVideoDefaultRAM() - use pcieFlags instead of pciFlags in qemuDomainDeviceCalculatePCIConnectFlags() - use DO_TEST_CAPS_LATEST() in test Jonathon Jongsma (2): qemu: Add bochs-display capability qemu: add 'bochs' video display type docs/formatdomain.html.in | 5 ++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 4 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 6 +++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 3 ++ .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + ...eo-bochs-display-device.x86_64-latest.args | 38 +++++++++++++++++++ .../video-bochs-display-device.xml | 29 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 22 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-bochs-display-device.xml -- 2.20.1

3 4

[libvirt] [PATCH] qemu: Relax os.loader->type check when validating domain
by Michal Privoznik 15 Jul '19

15 Jul '19

When validating a domain among all the checks there are two that concern VIR_DOMAIN_LOADER_TYPE_PFLASH specifically. The first check ensures that on x86 ACPI is enabled when UEFI is requested, the second ensures that UEFI is used when ACPI is requested on aarch64. However, check for UEFI is done by plain comparison of def->os.loader->type which is insufficient because we have def->os.firmware too. NB, this wouldn't be a problem for active domain, because on startup process def->os.loader->type gets filled by qemuFirmwareEnableFeatures(), but that's not the case for inactive domains. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1729604 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0f1fda2384..ed33e31699 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4221,8 +4221,9 @@ qemuDomainDefValidate(const virDomainDef *def, } /* On x86, UEFI requires ACPI */ - if (def->os.loader && - def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && + if ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI || + (def->os.loader && + def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH)) && ARCH_IS_X86(def->os.arch) && def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -4233,8 +4234,9 @@ qemuDomainDefValidate(const virDomainDef *def, /* On aarch64, ACPI requires UEFI */ if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON && def->os.arch == VIR_ARCH_AARCH64 && - (!def->os.loader || - def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH)) { + (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI && + (!def->os.loader || + def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); goto cleanup; -- 2.21.0

2 1

[libvirt] [PATCH v2 0/3] Add missing pool list types
by Han Han 13 Jul '19

13 Jul '19

v1: https://www.redhat.com/archives/libvir-list/2019-July/msg00603.html Han Han (3): storage: Add iscsi-direct pool list type flag storage: Add missing pool type flags in comment virsh.pod: Add zfs and vstorage pool types include/libvirt/libvirt-storage.h | 1 + src/conf/storage_conf.h | 3 ++- src/conf/virstorageobj.c | 4 +++- src/libvirt-storage.c | 4 ++++ tools/virsh-pool.c | 2 +- tools/virsh.pod | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH] maint: RNG comment fix
by Eric Blake 13 Jul '19

13 Jul '19

Typo'd at file creation in commit 0c97dc41. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule docs/schemas/basictypes.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 9b3dcad4a5..70d2101b78 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -2,7 +2,7 @@  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> -  +  <define name="unsignedInt"> <data type="unsignedInt"> <param name="pattern">[0-9]+</param> -- 2.20.1

1 0

[libvirt] [PATCH] tests: skip systemd activation test if FDs 3/4/5 are open
by Daniel P. Berrangé 12 Jul '19

12 Jul '19

With systemd activation the passed in file descriptors are required to be numbered from STDERR_FILENO + 1 onwards. The unit tests thus require FDs 3, 4 and 5 to be available. This may not be the case in all environments in which the tests run. For example on RHEL7 it was seen that a library constructor (gcrypt probably) opens /dev/urandom and leaves the file handle open. This means FD 3 is not available and the activation tests fail. The best way to deal with this would be to create a standalone helper program for the tests, but that's much more work than just skipping the tests if we notice we have the problem. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix tests/virsystemdtest.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 586c512fca..cd031914ab 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -23,6 +23,7 @@ #if defined(WITH_DBUS) && defined(__linux__) # include <dbus/dbus.h> +# include <fcntl.h> # define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW # include "virsystemdpriv.h" @@ -762,10 +763,17 @@ mymain(void) if (virTestRun("Test activation empty", testActivationEmpty, NULL) < 0) ret = -1; - if (virTestRun("Test activation names", testActivationFDNames, NULL) < 0) - ret = -1; - if (virTestRun("Test activation addrs", testActivationFDAddrs, NULL) < 0) - ret = -1; + + if (fcntl(STDERR_FILENO + 1, F_GETFL) == -1 && errno == EBADF && + fcntl(STDERR_FILENO + 2, F_GETFL) == -1 && errno == EBADF && + fcntl(STDERR_FILENO + 3, F_GETFL) == -1 && errno == EBADF) { + if (virTestRun("Test activation names", testActivationFDNames, NULL) < 0) + ret = -1; + if (virTestRun("Test activation addrs", testActivationFDAddrs, NULL) < 0) + ret = -1; + } else { + VIR_INFO("Skipping activation tests as FD 3/4/5 is open"); + } return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.21.0

1 0

[libvirt] [PATCH] storage: rbd: do not attempt to dereference a non-pointer
by Ján Tomko 12 Jul '19

12 Jul '19

My commit 9b7c4048fa0559fd81d57b7f7d13b1dccd6a99b2 was too blind and my librbd was not new enough to actually compile this part. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed under the 'build breaker fix' rule whilst violating the 'do not push patches on a Friday afternoon' rule. src/storage/storage_backend_rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 1cb447c55a..f3104ba310 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -637,7 +637,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) nnames = nimages; for (i = 0; i < nimages; i++) - VIR_STEAL_PTR(names[i], images[i]->name); + VIR_STEAL_PTR(names[i], images[i].name); return names; -- 2.20.1

1 0