- Devel - libvirt List Archives

[libvirt] [PATCH] virfile: adds quobyte as a shared fs
by Silvan Kaiser 22 Jul '19

22 Jul '19

Adds detection of a Quobyte shared file system for live migration. Signed-off-by: Silvan Kaiser <silvan(a)quobyte.com> --- src/util/virfile.c | 13 ++++++++++++- src/util/virfile.h | 1 + tests/virfiledata/mounts3.txt | 1 + tests/virfilemock.c | 3 +++ tests/virfiletest.c | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index f7415cf633..a46b8792f6 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3434,6 +3434,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef GPFS_SUPER_MAGIC # define GPFS_SUPER_MAGIC 0x47504653 # endif +# ifndef QB_MAGIC +# define QB_MAGIC 0x51626d6e +# endif # define PROC_MOUNTS "/proc/mounts" @@ -3490,6 +3493,10 @@ virFileIsSharedFixFUSE(const char *path, VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. " "Fixing shared FS type", mntDir, canonPath); *f_type = GFS2_MAGIC; + } else if (STREQ_NULLABLE(mntType, "fuse.quobyte")) { + VIR_DEBUG("Found Quobyte FUSE mountpoint=%s for path=%s. " + "Fixing shared FS type", mntDir, canonPath); + *f_type = QB_MAGIC; } ret = 0; @@ -3582,6 +3589,9 @@ virFileIsSharedFSType(const char *path, if ((fstypes & VIR_FILE_SHFS_GPFS) && (f_type == GPFS_SUPER_MAGIC)) return 1; + if ((fstypes & VIR_FILE_SHFS_QB) && + (f_type == QB_MAGIC)) + return 1; return 0; } @@ -3771,7 +3781,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_SMB | VIR_FILE_SHFS_CIFS | VIR_FILE_SHFS_CEPH | - VIR_FILE_SHFS_GPFS); + VIR_FILE_SHFS_GPFS| + VIR_FILE_SHFS_QB); } diff --git a/src/util/virfile.h b/src/util/virfile.h index 641960e2ca..e06855ea86 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -212,6 +212,7 @@ enum { VIR_FILE_SHFS_CIFS = (1 << 5), VIR_FILE_SHFS_CEPH = (1 << 6), VIR_FILE_SHFS_GPFS = (1 << 7), + VIR_FILE_SHFS_QB = (1 << 8), }; int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt index 4377e5d471..b91804a4e4 100644 --- a/tests/virfiledata/mounts3.txt +++ b/tests/virfiledata/mounts3.txt @@ -36,3 +36,4 @@ root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 gpfs_data /gpfs/data gpfs rw,relatime 0 0 +quobyte(a)192.168.0.1/data /quobyte fuse.quobyte rw,nosuid,nodev,noatime,user_id=0,group_id=0,allow_other 0 0 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 106032f857..54c57d417b 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -92,6 +92,9 @@ setmntent(const char *filename, const char *type) #ifndef GPFS_SUPER_MAGIC # define GPFS_SUPER_MAGIC 0x47504653 #endif +# ifndef QB_MAGIC +# define QB_MAGIC 0x51626d6e +# endif static int diff --git a/tests/virfiletest.c b/tests/virfiletest.c index e2bd4953ed..aa4c3435e5 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -458,6 +458,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gpfs/data", true); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/quobyte", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.16.5

3 4

[libvirt] [PATCH] virsh migrate: Properly check for --parallel-connections
by Jiri Denemark 19 Jul '19

19 Jul '19

Ever since --parallel-connections option for virsh migrate was introduced we did not properly check the return value of vshCommandOptInt. We would set VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS parameter even if vshCommandOptInt returned 0 (which means --parallel-connections was not specified) when another int option which was checked earlier was specified with a nonzero value. Specifically, running virsh migrate with either --auto-converge-increment, --auto-converge-initial, --comp-mt-dthreads, --comp-mt-threads, or --comp-mt-level would set VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS parameter and if --parallel option was not used, libvirt would complain error: invalid argument: Turn parallel migration on to tune it even though --parallel-connections option was not used at all. https://bugzilla.redhat.com/show_bug.cgi?id=1726643 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 828ae30789..2ad73959ec 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10785,13 +10785,14 @@ doMigrate(void *opaque) goto save_error; } - if (vshCommandOptInt(ctl, cmd, "parallel-connections", &intOpt) < 0) + if ((rv = vshCommandOptInt(ctl, cmd, "parallel-connections", &intOpt)) < 0) { goto out; - if (intOpt && - virTypedParamsAddInt(&params, &nparams, &maxparams, - VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, - intOpt) < 0) - goto save_error; + } else if (rv > 0) { + if (virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, + intOpt) < 0) + goto save_error; + } if (vshCommandOptBool(cmd, "live")) flags |= VIR_MIGRATE_LIVE; -- 2.22.0

2 1

[libvirt] [PATCH] util: change the return value of virCgroupRemove if failed
by Wang Yechao 19 Jul '19

19 Jul '19

virCgroupRemove return -1 when removing cgroup failed. But there are retry code to remove cgroup in QemuProcessStop: retry: if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); goto retry; } VIR_WARN("Failed to remove cgroup for %s", vm->def->name); } The return value of qemuRemoveCgroup will never be equal to "-EBUSY", so change the return value of virCgroupRemove if failed. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/vircgroup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 268e401..260ed2d 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2399,11 +2399,13 @@ int virCgroupRemove(virCgroupPtr group) { size_t i; + int ret = 0; for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { - if (group->backends[i] && - group->backends[i]->remove(group) < 0) { - return -1; + if (group->backends[i]) + ret = group->backends[i]->remove(group); + if (ret < 0) + return ret; } } -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] qemu: Fix handling of block job data in event handlers (blockdev-add saga fixes)
by Peter Krempa 19 Jul '19

19 Jul '19

Some of the refactors which allowed carrying more data with blockjobs created a race condition when a too-quick job would actually delete the data. This is a problem for legacy block jobs only. Peter Krempa (3): qemu: process: Don't use qemuBlockJobStartupFinalize in qemuProcessHandleBlockJob qemu: driver: Don't use qemuBlockJobStartupFinalize in processBlockJobEvent qemu: driver: Add debug message when we conjure block job data object src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_process.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.21.0

2 4

[libvirt] [RFC PATCH 0/6] Split domain_conf.h
by Ján Tomko 19 Jul '19

19 Jul '19

Currently, domain_conf.{c,h} is a giant pile of functions somewhat related to the domain definition. Try to change that by splitting out the type declarations, XML parsing and XML formatting from the header file. Ján Tomko (6): conf: move virNetworkPortDefPtr declaration to virconftypes.h virsh: clean up includes conf: introduce virdomaintypes.h conf: introduce domain_parse.h conf: introduce domain_format.h maint: include virdomaintypes.h instead of domain_conf.h src/access/viraccessdriver.h | 2 +- src/access/viraccessmanager.h | 2 +- src/conf/Makefile.inc.am | 3 + src/conf/domain_conf.h | 3023 +-------------------- src/conf/domain_format.h | 89 + src/conf/domain_parse.h | 321 +++ src/conf/virchrdev.h | 2 +- src/conf/virconftypes.h | 3 + src/conf/virdomaintypes.h | 2692 ++++++++++++++++++ src/conf/virnetworkportdef.h | 4 +- src/esx/esx_private.h | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/locking/domain_lock.h | 2 +- src/locking/lock_driver.h | 2 +- src/locking/sanlock_helper.c | 2 +- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_hostdev.h | 2 +- src/lxc/lxc_monitor.h | 2 +- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_native.h | 2 +- src/network/bridge_driver.h | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_hostdev.h | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_processpriv.h | 2 +- src/qemu/qemu_security.h | 2 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/security/security_manager.h | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_driver.h | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vz/vz_utils.h | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 2 +- src/xenapi/xenapi_utils.h | 2 +- src/xenconfig/xen_common.h | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- src/xenconfig/xen_xm.h | 2 +- tests/domainconftest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/qemusecuritytest.c | 2 +- tests/testutilslxc.c | 2 +- tests/testutilsqemu.h | 2 +- tests/testutilsxen.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh.c | 3 - tools/vsh.c | 3 - 74 files changed, 3177 insertions(+), 3094 deletions(-) create mode 100644 src/conf/domain_format.h create mode 100644 src/conf/domain_parse.h create mode 100644 src/conf/virdomaintypes.h -- 2.19.2

2 7

[libvirt] [PATCH v1 0/3] misc virhostdevs cleanups
by Daniel Henrique Barboza 19 Jul '19

19 Jul '19

These are cleanups that I made together with an attempt to enable parcial PCI Multifunction assignment with managed=true. That work will be scrapped after discussions with Laine in [1], but these cleanups kind of make sense on their own, so here they are. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg01175.html Daniel Henrique Barboza (3): virhostdev: introduce virHostdevResetAllPCIDevices virhostdev: introduce virHostdevReattachAllPCIDevices virhostdev: remove virHostdevReattachPCIDevice src/util/virhostdev.c | 151 +++++++++++++++++------------------------- src/util/virpci.c | 29 +++++++- 2 files changed, 86 insertions(+), 94 deletions(-) -- 2.21.0

2 8

[libvirt] [PATCH] news: mention new bochs display device
by Jonathon Jongsma 19 Jul '19

19 Jul '19

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 07d4575a65..1134309ec2 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -54,6 +54,15 @@ <libvirt> <release version="v5.6.0" date="unreleased"> <section title="New features"> + <change> + <summary> + qemu: Introduce a new video model of type 'bochs' + </summary> + <description> + Introduce a new video model type that supports the + <code>bochs-display</code> device that was added in qemu version 3.0. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.21.0

2 1

[libvirt] [PATCH] util: Fix broken MinGW builds caused by commit 9bc01ad8
by Erik Skultety 19 Jul '19

19 Jul '19

virPCIGetSysfsFile is conditionally compiled only on Linux platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/util/virpci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 75e8daadd5..ae3a0fa886 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3099,6 +3099,14 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link ATTRIBUTE_UNUSED, } +int +virPCIGetSysfsFile(char *virPCIDeviceName ATTRIBUTE_UNUSED, + char **pci_sysfs_device_link ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} + int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev ATTRIBUTE_UNUSED, char **pci_sysfs_device_link ATTRIBUTE_UNUSED) -- 2.20.1

3 7

[libvirt] [PATCH 00/14] Split and enhancement of virsh completer
by Michal Privoznik 19 Jul '19

19 Jul '19

Having all completers inside one file is not good. Let's split it the same way we have other files split (e.g. src/libvirt-*.c) and then add one completer to demonstrate where new completers should be added. Michal Prívozník (14): tools: s/Nodedev/NodeDevice/ tools: Expose virshCommaStringListComplete() tools: Separate domain related completers into a file tools: Separate storage pool related completers into a file tools: Separate storage volume related completers into a file tools: Separate interface related completers into a file tools: Separate network related completers into a file tools: Separate nodedev related completers into a file tools: Separate nwfilter related completers into a file tools: Separate secret related completers into a file tools: Separate snapshot related completers into a file tools: Separate host related completers into a file virsh-completer: Drop needless #include virsh: Introduce virshPoolTypeCompleter tools/Makefile.am | 10 + tools/virsh-completer-domain.c | 314 ++++++++++ tools/virsh-completer-domain.h | 55 ++ tools/virsh-completer-host.c | 148 +++++ tools/virsh-completer-host.h | 31 + tools/virsh-completer-interface.c | 67 ++ tools/virsh-completer-interface.h | 27 + tools/virsh-completer-network.c | 145 +++++ tools/virsh-completer-network.h | 35 ++ tools/virsh-completer-nodedev.c | 117 ++++ tools/virsh-completer-nodedev.h | 35 ++ tools/virsh-completer-nwfilter.c | 105 ++++ tools/virsh-completer-nwfilter.h | 31 + tools/virsh-completer-pool.c | 120 ++++ tools/virsh-completer-pool.h | 35 ++ tools/virsh-completer-secret.c | 91 +++ tools/virsh-completer-secret.h | 31 + tools/virsh-completer-snapshot.c | 73 +++ tools/virsh-completer-snapshot.h | 27 + tools/virsh-completer-volume.c | 73 +++ tools/virsh-completer-volume.h | 28 + tools/virsh-completer.c | 977 +----------------------------- tools/virsh-completer.h | 114 +--- tools/virsh-nodedev.c | 16 +- tools/virsh-nodedev.h | 6 +- tools/virsh-pool.c | 1 + 26 files changed, 1624 insertions(+), 1088 deletions(-) create mode 100644 tools/virsh-completer-domain.c create mode 100644 tools/virsh-completer-domain.h create mode 100644 tools/virsh-completer-host.c create mode 100644 tools/virsh-completer-host.h create mode 100644 tools/virsh-completer-interface.c create mode 100644 tools/virsh-completer-interface.h create mode 100644 tools/virsh-completer-network.c create mode 100644 tools/virsh-completer-network.h create mode 100644 tools/virsh-completer-nodedev.c create mode 100644 tools/virsh-completer-nodedev.h create mode 100644 tools/virsh-completer-nwfilter.c create mode 100644 tools/virsh-completer-nwfilter.h create mode 100644 tools/virsh-completer-pool.c create mode 100644 tools/virsh-completer-pool.h create mode 100644 tools/virsh-completer-secret.c create mode 100644 tools/virsh-completer-secret.h create mode 100644 tools/virsh-completer-snapshot.c create mode 100644 tools/virsh-completer-snapshot.h create mode 100644 tools/virsh-completer-volume.c create mode 100644 tools/virsh-completer-volume.h -- 2.21.0

1 14

[libvirt] [PATCH] virpci: Drop duplicate function
by Michal Privoznik 19 Jul '19

19 Jul '19

We have two functions: virPCIDeviceAddressIsEqual() defined only on Linux and virPCIDeviceAddressEqual() defined everywhere. And both of them do the same. Drop the former in favour of the latter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virpci.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index ae3a0fa886..6dc0a2711c 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2590,19 +2590,6 @@ virZPCIDeviceAddressIsEmpty(const virZPCIDeviceAddress *addr) #ifdef __linux__ -/* - * returns true if equal - */ -static bool -virPCIDeviceAddressIsEqual(virPCIDeviceAddressPtr bdf1, - virPCIDeviceAddressPtr bdf2) -{ - return ((bdf1->domain == bdf2->domain) && - (bdf1->bus == bdf2->bus) && - (bdf1->slot == bdf2->slot) && - (bdf1->function == bdf2->function)); -} - virPCIDeviceAddressPtr virPCIGetDeviceAddressFromSysfsLink(const char *device_link) { @@ -2787,7 +2774,7 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link, } for (i = 0; i < num_virt_fns; i++) { - if (virPCIDeviceAddressIsEqual(vf_bdf, virt_fns[i])) { + if (virPCIDeviceAddressEqual(vf_bdf, virt_fns[i])) { *vf_index = i; ret = 0; break; -- 2.21.0

2 1