- Devel - libvirt List Archives

[libvirt] [PATCH] conf: fix virtType FromString check
by Cole Robinson 26 Jul '18

26 Jul '18

In the domain definition, virtType is virDomainVirtType which is unsigned, so comparing against -1 doesn't work. Cast to int first Fixes 8e2982b5767 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- This regressed in the past as well, when virtType was changed to virDomainVirtType in 7383b8cc068, fixed by the follow up 5e06a4f063. It's strange that virDomainVirtType is unsigned but VirtTypeFromString can return -1... it should probably either work like virArch, or we should switch virDomainVirtType to int in the DomainDef, but that requires fixing a few other places too src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c27c874d9e..30806d1e59 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19140,7 +19140,7 @@ virDomainDefParseCaps(virDomainDefPtr def, "%s", _("missing domain type attribute")); goto cleanup; } - if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { + if ((int)(def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), virttype); goto cleanup; -- 2.17.1

2 1

[libvirt] [PATCH] conf: don't use virDomainVirtType in struct field
by Daniel P. Berrangé 26 Jul '18

26 Jul '18

Use of enum types for struct fields is generally avoided since it causes warnings if the compiler assumes the enum is unsigned. For example commit 8e2982b5767a25e5da6533c65bfdc648c95b3c69 Author: Cole Robinson <crobinso(a)redhat.com> Date: Tue Jul 24 16:27:54 2018 -0400 conf: Clean up virDomainDefParseCaps Introduced a line: if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { which causes a build failure with CLang conf/domain_conf.c:19143:65: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] as the compiler is free to optimize away the "< 0" check due to the assumption that the enum type is unsigned and always in range. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) Pushing as a build fix for CLang diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c27c874d9e..f94a90fbcc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15075,7 +15075,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, int virDomainVideoDefaultType(const virDomainDef *def) { - switch (def->virtType) { + switch ((virDomainVirtType)def->virtType) { case VIR_DOMAIN_VIRT_TEST: case VIR_DOMAIN_VIRT_XEN: if (def->os.type == VIR_DOMAIN_OSTYPE_XEN || diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a804e86f6c..c1dfa37fdf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2386,7 +2386,7 @@ struct _virDomainVirtioOptions { typedef struct _virDomainDef virDomainDef; typedef virDomainDef *virDomainDefPtr; struct _virDomainDef { - virDomainVirtType virtType; + int virtType; /* enum virDomainVirtType */ int id; unsigned char uuid[VIR_UUID_BUFLEN]; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae45c45b7f..d148db90fa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7163,7 +7163,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); - switch (def->virtType) { + switch ((virDomainVirtType)def->virtType) { case VIR_DOMAIN_VIRT_QEMU: virBufferAddLit(&buf, ",accel=tcg"); break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 27bd8b9465..c4e33723d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7191,6 +7191,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; bool active = false; + virDomainVirtType virtType; VIR_DEBUG("Beginning VM attach process"); @@ -7342,8 +7343,9 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, goto exit_monitor; if (qemuMonitorGetStatus(priv->mon, &running, &reason) < 0) goto exit_monitor; - if (qemuMonitorGetVirtType(priv->mon, &vm->def->virtType) < 0) + if (qemuMonitorGetVirtType(priv->mon, &virtType) < 0) goto exit_monitor; + vm->def->virtType = virtType; if (qemuDomainObjExitMonitor(driver, vm) < 0) goto error; -- 2.17.1

1 0

[libvirt] [PATCH] qemu_monitor: Fix regression in getting disk capacity
by Michal Privoznik 26 Jul '18

26 Jul '18

In dbf990fd31e8 the qemuMonitorJSONBlockStatsUpdateCapacityOne() was split. However, due to a bug the return value was never set to something meaningful. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 75d0738b5d..9acf62e0bb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2492,14 +2492,15 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValuePtr image, goto cleanup; if (backingChain && - (backing = virJSONValueObjectGetObject(image, "backing-image"))) { - ret = qemuMonitorJSONBlockStatsUpdateCapacityOne(backing, - dev_name, - depth + 1, - stats, - true); - } + (backing = virJSONValueObjectGetObject(image, "backing-image")) && + qemuMonitorJSONBlockStatsUpdateCapacityOne(backing, + dev_name, + depth + 1, + stats, + true) < 0) + goto cleanup; + ret = 0; cleanup: VIR_FREE(entry_name); return ret; -- 2.16.4

2 1

[libvirt] [PATCH] conf: Fix typo in error msg of virDomainVideoDefValidate
by Han Han 26 Jul '18

26 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607825 Fix typo of error msg when 'none' type is not the only video device defined in VM. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33b0b4ab68..c2ccbcca91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5687,7 +5687,7 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE && def->nvideos > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("a '%s' video type must be the only video device " + _("a 'none' video type must be the only video device " "defined for the domain")); return -1; } -- 2.18.0

2 1

[libvirt] [PATCH 0/7] conf: Replace SKIP_OSTYPE with SKIP_VALIDATE
by Cole Robinson 26 Jul '18

26 Jul '18

The SKIP_OSTYPE domain parse flag is largely redundant nowadays since we have SKIP_VALIDATE. This series smoothes out some of the SKIP_OSTYPE weirdness so we can drop it Cole Robinson (7): conf: Break out virDomainDefParseCaps conf: Clean up virDomainDefParseCaps tests: qemuhotplug: Fix segfault when XML loading fails conf: Drop unneccessary caps parsing logic conf: Sync caps data even when SKIP_OSTYPE_CHECKS tests: Remove redundant lxc test conf: Replace SKIP_OSTYPE_CHECKS with SKIP_VALIDATE src/conf/domain_conf.c | 175 +++++++++++---------- src/conf/domain_conf.h | 13 +- src/conf/snapshot_conf.c | 2 - src/conf/virdomainobjlist.c | 2 - tests/lxcxml2xmltest.c | 2 - tests/qemuhotplugtest.c | 2 + tests/qemuxml2argvdata/missing-machine.xml | 2 +- tests/qemuxml2argvtest.c | 5 +- tests/qemuxml2xmltest.c | 1 - tests/testutils.c | 13 +- tests/testutilsqemu.c | 18 +++ tests/vircapstest.c | 2 - 12 files changed, 132 insertions(+), 105 deletions(-) -- 2.17.1

2 12

[libvirt] [dbus PATCH v2 0/2] Make correct use of setup fixtures & cleanup
by Katerina Koukiou 26 Jul '18

26 Jul '18

diff from v1: * fixtures patch merged * fixed reminder flake8 issues * added patch introducing syntax-check target in the Makefile Katerina Koukiou (2): tests: fix all coding style issues to comply with flake8 Add syntax-check target in Makefile.am HACKING.md | 9 ++++++++- Makefile.am | 6 ++++++ tests/libvirttest.py | 9 +++++---- tests/test_connect.py | 2 +- tests/test_domain.py | 5 +++-- tests/test_interface.py | 12 +++++++----- tests/test_network.py | 8 ++++---- tests/test_storage.py | 1 + 8 files changed, 35 insertions(+), 17 deletions(-) -- 2.17.1

2 4

[libvirt] [dbus PATCH 0/2] Make correct use of setup fixtures & cleanup
by Katerina Koukiou 26 Jul '18

26 Jul '18

Katerina Koukiou (2): tests: {interface, node_device}_create should be used as setup fixtures tests: fix all coding style issues to comply with pep8 tests/libvirttest.py | 1 + tests/test_connect.py | 9 +++++---- tests/test_domain.py | 5 +++-- tests/test_interface.py | 23 +++++++++++++---------- tests/test_network.py | 8 ++++---- tests/test_nodedev.py | 16 ++++++++-------- tests/test_storage.py | 1 + 7 files changed, 35 insertions(+), 28 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH 0/5] Couple of LXC fixes & improvements
by Michal Privoznik 26 Jul '18

26 Jul '18

*** BLURB HERE *** Michal Prívozník (5): lxc: Refresh capabilities on virConnectGetCapabilities lxc: Report supported huge pages lxc: Enable under valgrind again lxc: Don't leak @veths in virLXCProcessStart lxc: Don't mangle @cfg refs in virLXCProcessBuildControllerCmd src/lxc/lxc_conf.c | 4 ++++ src/lxc/lxc_driver.c | 13 +------------ src/lxc/lxc_process.c | 15 +++++++++------ 3 files changed, 14 insertions(+), 18 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH] networkGetDHCPLeases: Don't always report error if unable to read leases file
by Michal Privoznik 26 Jul '18

26 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1600468 If we are unable to read leases file (no matter what the reason is), we return 0 - just like if there were no leases. However, because we use virFileReadAll() an error is printed into the log. Note that not all networks have leases file - only those for which we start dnsmasq. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/network/bridge_driver.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a7826e9b63..5839021caf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4235,13 +4235,20 @@ networkGetDHCPLeases(virNetworkPtr net, custom_lease_file = networkDnsmasqLeaseFileNameCustom(driver, def->bridge); /* Read entire contents */ - if ((custom_lease_file_len = virFileReadAll(custom_lease_file, - VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, - &lease_entries)) < 0) { - /* Even though src/network/leaseshelper.c guarantees the existence of - * leases file (even if no leases are present), and the control reaches - * here, instead of reporting error, return 0 leases */ - rv = 0; + if ((custom_lease_file_len = virFileReadAllQuiet(custom_lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + /* Not all networks are guaranteed to have leases file. + * Only those which run dnsmasq. Therefore, if we failed + * to read the leases file, don't report error. Return 0 + * leases instead. */ + if (errno != ENOENT) { + virReportSystemError(errno, + _("Unable to read leases file: %s"), + custom_lease_file); + } else { + rv = 0; + } goto error; } -- 2.16.4

2 2

[libvirt] [PATCH v1 00/40] use GNU C's cleanup attribute in src/util (batch II)
by Sukrit Bhatnagar 26 Jul '18

26 Jul '18

This second series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. The argument type of virCgroupFree is changed from virCgroupPtr * to virCgroupPtr. Sukrit Bhatnagar (40): util: cgroup: modify virCgroupFree to take virCgroupPtr util: error: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: typedef and Free helper for struct _virBufferEscapePair util: buffer: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: buffer: use VIR_AUTOPTR for aggregate types util: hash: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: cgroup: use VIR_AUTOPTR for aggregate types util: mdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: mdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: mdev: use VIR_AUTOPTR for aggregate types util: firewall: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: firewall: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: firewall: use VIR_AUTOPTR for aggregate types util: hook: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hook: use VIR_AUTOPTR for aggregate types util: pci: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: pci: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: pci: use VIR_AUTOPTR for aggregate types util: netdevvlan: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: usb: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: usb: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: usb: use VIR_AUTOPTR for aggregate types util: scsi: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: scsi: use VIR_AUTOPTR for aggregate types util: scsivhost: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsivhost: use VIR_AUTOPTR for aggregate types util: hostdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hostdev: use VIR_AUTOPTR for aggregate types util: hostmem: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iptables: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOPTR for aggregate types util: kmod: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: kmod: use VIR_AUTOPTR for aggregate types util: lease: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: lease: use VIR_AUTOPTR for aggregate types src/libvirt-lxc.c | 4 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_process.c | 10 +- src/qemu/qemu_cgroup.c | 16 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 34 ++- src/qemu/qemu_process.c | 2 +- src/util/virbuffer.c | 34 ++- src/util/virbuffer.h | 9 +- src/util/vircgroup.c | 718 +++++++++++++++++------------------------------ src/util/vircgroup.h | 11 +- src/util/vircgrouppriv.h | 2 +- src/util/virerror.c | 1 - src/util/virerror.h | 3 + src/util/virfirewall.c | 53 ++-- src/util/virfirewall.h | 3 + src/util/virhash.c | 1 - src/util/virhash.h | 4 + src/util/virhook.c | 20 +- src/util/virhostdev.c | 162 ++++------- src/util/virhostmem.c | 57 ++-- src/util/viriptables.c | 52 ++-- src/util/viriscsi.c | 89 ++---- src/util/virkmod.c | 38 +-- src/util/virlease.c | 82 ++---- src/util/virmdev.c | 84 ++---- src/util/virmdev.h | 4 + src/util/virnetdevvlan.c | 1 - src/util/virnetdevvlan.h | 4 + src/util/virpci.c | 323 +++++++-------------- src/util/virpci.h | 4 + src/util/virscsi.c | 64 ++--- src/util/virscsi.h | 3 + src/util/virscsivhost.c | 8 +- src/util/virscsivhost.h | 3 + src/util/virusb.c | 22 +- src/util/virusb.h | 3 + tests/vircgrouptest.c | 42 +-- 41 files changed, 739 insertions(+), 1243 deletions(-) -- 1.8.3.1

3 92