- Devel - libvirt List Archives

[libvirt] [PATCH v2] test: storage: Fill in default vol types for every pool
by Cole Robinson 13 Mar '19

13 Mar '19

Fill in a default volume type for every pool type, as reported by the VolGetInfo API. Now that we cover the whole enum, report an error for invalid values. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Use virReportEnumRangeError and handle the error in the caller index ef754658f3..08970f8d6c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5164,13 +5164,28 @@ testStorageVolDelete(virStorageVolPtr vol, static int testStorageVolumeTypeForPool(int pooltype) { - switch (pooltype) { - case VIR_STORAGE_POOL_DIR: - case VIR_STORAGE_POOL_FS: - case VIR_STORAGE_POOL_NETFS: - return VIR_STORAGE_VOL_FILE; - default: - return VIR_STORAGE_VOL_BLOCK; + switch ((virStoragePoolType) pooltype) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_NETFS: + case VIR_STORAGE_POOL_VSTORAGE: + return VIR_STORAGE_VOL_FILE; + case VIR_STORAGE_POOL_SHEEPDOG: + case VIR_STORAGE_POOL_ISCSI_DIRECT: + case VIR_STORAGE_POOL_GLUSTER: + case VIR_STORAGE_POOL_RBD: + return VIR_STORAGE_VOL_NETWORK; + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_ISCSI: + case VIR_STORAGE_POOL_SCSI: + case VIR_STORAGE_POOL_ZFS: + return VIR_STORAGE_VOL_BLOCK; + case VIR_STORAGE_POOL_LAST: + default: + virReportEnumRangeError(virStoragePoolType, pooltype); + return -1; } } @@ -5193,7 +5208,8 @@ testStorageVolGetInfo(virStorageVolPtr vol, goto cleanup; memset(info, 0, sizeof(*info)); - info->type = testStorageVolumeTypeForPool(def->type); + if ((info->type = testStorageVolumeTypeForPool(def->type)) < 0) + goto cleanup; info->capacity = privvol->target.capacity; info->allocation = privvol->target.allocation; ret = 0; -- 2.20.1

2 1

[libvirt] [PATCH] test: Drop a few unnecessary <source> elements added by virt-install
by Erik Skultety 13 Mar '19

13 Mar '19

The <source mode='bind'/> elements were added in commit 4d7ea75e and apparently generated by virt-install, but since the @path attribute is missing, the element will never be formatted back to the XML which the libvirt-go-xml-check expects, so it fails. The lack of the @path attribute is not a problem in general, because we can autogenerate the path in certain cases, so qemuxml2argvtest will always be happy, but XML formatting is a different thing. Therefore, drop these generated elements, as they're unnecessary for the purposes of qemuxml2argvtest and won't mess with the XML formatting test in Go. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Additionally, I could introduce a xml2xml test here, but I already spent enough time hunting the CI failure down between libvirt and libvirt-go so this was the simplest solution which doesn't require any extra work. tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 1 - tests/qemuxml2argvdata/ppc64-pseries-graphics.xml | 1 - tests/qemuxml2argvdata/x86_64-pc-graphics.xml | 1 - tests/qemuxml2argvdata/x86_64-q35-graphics.xml | 1 - 4 files changed, 4 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml index 95aef91beb..2559cd7950 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -34,7 +34,6 @@ </interface> <console type="pty"/> <channel type="unix"> - <source mode="bind"/> <target type="virtio" name="org.qemu.guest_agent.0"/> </channel> <input type="tablet" bus="usb"/> diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml index 3d54a4f171..bab115f666 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml @@ -28,7 +28,6 @@ </interface> <console type="pty"/> <channel type="unix"> - <source mode="bind"/> <target type="virtio" name="org.qemu.guest_agent.0"/> </channel> <input type="tablet" bus="usb"/> diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml index 03745eabf4..8d8fc14f9f 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml @@ -40,7 +40,6 @@ </interface> <console type="pty"/> <channel type="unix"> - <source mode="bind"/> <target type="virtio" name="org.qemu.guest_agent.0"/> </channel> <input type="tablet" bus="usb"/> diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml index 56db898e64..a93b49e480 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml @@ -40,7 +40,6 @@ </interface> <console type="pty"/> <channel type="unix"> - <source mode="bind"/> <target type="virtio" name="org.qemu.guest_agent.0"/> </channel> <input type="tablet" bus="usb"/> -- 2.20.1

3 3

[libvirt] [PATCH 0/3] virFileWrapper: Couple of small improvements
by Michal Privoznik 13 Mar '19

13 Mar '19

*** BLURB HERE *** Michal Prívozník (3): tests: Turn virFileWrapperAddPrefix to void virFileWrapper: Use VIR_AUTOFREE() tests: Call virFileWrapperClearPrefixes() for tests using virFileWrapper tests/qemufirmwaretest.c | 2 + tests/qemuxml2argvtest.c | 1 + tests/virfilewrapper.c | 94 +++++++++++----------------------------- tests/virfilewrapper.h | 2 +- 4 files changed, 29 insertions(+), 70 deletions(-) -- 2.19.2

3 8

[libvirt] [PATCH 0/5] qemu_hotplug: Fix a rare race condition when detaching a device twice
by Michal Privoznik 13 Mar '19

13 Mar '19

*** BLURB HERE *** Michal Prívozník (5): qemu_hotplug: Properly check for qemuMonitorDelDevice retval qemu_hotplug: Introduce and use qemuDomainDeleteDevice DO NOT APPLY: Simple reproducer DO NOT APPLY: Revert simple reproducer qemu_hotplug: Fix a rare race condition when detaching a device twice src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 99 ++++++++++++++++++++++++++++++++--------- 2 files changed, 79 insertions(+), 21 deletions(-) -- 2.19.2

2 12

[libvirt] [PATCH 0/2] Document firmware autoselection and fix one trivial bug
by Michal Privoznik 13 Mar '19

13 Mar '19

*** BLURB HERE *** Michal Prívozník (2): qemuFirmwareFetchConfigs: Fix check for @privileged news: Document firmware autoselection for QEMU driver docs/news.xml | 16 ++++++++++++++++ src/qemu/qemu_firmware.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) -- 2.19.2

3 5

[libvirt] [PATCH] conf: Add a function virDomainDefCputuneValidate
by Suyang Chen 13 Mar '19

13 Mar '19

move all the def->cputune 'period must be in range' errors into virDomainDefCputuneValidate function and have it called from virDomainDefValidateInternal and virDomainDefParseXML function Solve the bitsizedtask: "Move validation checks out of domain XML parsing" Resolves: https://wiki.libvirt.org/page/BiteSizedTasks#Move_validation_checks_out_of_… Signed-off-by: Suyang Chen <dawson0xff(a)gmail.com> --- src/conf/domain_conf.c | 75 ++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 995f87bcbe..e17ca0e0cb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6589,6 +6589,45 @@ virDomainDefMemtuneValidate(const virDomainDef *def) return 0; } +static int +virDomainDefCputuneValidate(const virDomainDef *def) +{ + if (def->cputune.period > 0 && + (def->cputune.period < 1000 || def->cputune.period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.global_period > 0 && + (def->cputune.global_period < 1000 || def->cputune.global_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune global period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.emulator_period > 0 && + (def->cputune.emulator_period < 1000 || + def->cputune.emulator_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.iothread_period > 0 && + (def->cputune.iothread_period < 1000 || + def->cputune.iothread_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune iothread_period must be in range " + "[1000, 1000000]")); + return -1; + } + + return 0; +} static int virDomainDefValidateInternal(const virDomainDef *def) @@ -6628,6 +6667,9 @@ virDomainDefValidateInternal(const virDomainDef *def) if (virDomainDefMemtuneValidate(def) < 0) return -1; + if (virDomainDefCputuneValidate(def) < 0) + return -1; + return 0; } @@ -19594,13 +19636,8 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if (def->cputune.period > 0 && - (def->cputune.period < 1000 || def->cputune.period > 1000000)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Value of cputune period must be in range " - "[1000, 1000000]")); + if (virDomainDefCputuneValidate(def) < 0) goto error; - } if (virXPathLongLong("string(./cputune/quota[1])", ctxt, &def->cputune.quota) < -1) { @@ -19625,14 +19662,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if (def->cputune.global_period > 0 && - (def->cputune.global_period < 1000 || def->cputune.global_period > 1000000)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Value of cputune global period must be in range " - "[1000, 1000000]")); - goto error; - } - if (virXPathLongLong("string(./cputune/global_quota[1])", ctxt, &def->cputune.global_quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19656,15 +19685,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if (def->cputune.emulator_period > 0 && - (def->cputune.emulator_period < 1000 || - def->cputune.emulator_period > 1000000)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Value of cputune emulator_period must be in range " - "[1000, 1000000]")); - goto error; - } - if (virXPathLongLong("string(./cputune/emulator_quota[1])", ctxt, &def->cputune.emulator_quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19688,15 +19708,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if (def->cputune.iothread_period > 0 && - (def->cputune.iothread_period < 1000 || - def->cputune.iothread_period > 1000000)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Value of cputune iothread_period must be in range " - "[1000, 1000000]")); - goto error; - } - if (virXPathLongLong("string(./cputune/iothread_quota[1])", ctxt, &def->cputune.iothread_quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", -- 2.20.1

2 1

[libvirt] [libvirt-go-xml PATCH] Make @Path of UNIX chr device source optional
by Erik Skultety 13 Mar '19

13 Mar '19

According to the libvirt RNG schema, @path is an optional attribute for the character source element, so we should be okay if it was omitted. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index a964cc8..a1a3fcb 100644 --- a/domain.go +++ b/domain.go @@ -735,7 +735,7 @@ type DomainChardevSourceTCP struct { type DomainChardevSourceUNIX struct { Mode string `xml:"mode,attr,omitempty"` - Path string `xml:"path,attr"` + Path string `xml:"path,attr,omitempty"` Reconnect *DomainChardevSourceReconnect `xml:"reconnect"` SecLabel []DomainDeviceSecLabel `xml:"seclabel"` } -- 2.20.1

2 1

[libvirt] [PATCH v4 0/8] bulk snapshot list/redefine (incremental backup saga)
by Eric Blake 13 Mar '19

13 Mar '19

While looking at my work on incremental backups, Nir raised a good point: if we want to recreate a set of known checkpoints on one machine that will be taking over a domain from another machine, my initial proposal required making multiple API calls to list the XML for each checkpoint on the source, and then more API calls to redefine each checkpoint on the destination; it also had the drawback that the list has to be presented in topological order (the API won't let you define a child checkpoint if the parent is not defined first). He asked if I could instead add bulk APIs, for getting the XML for all checkpoints at once, and then for redefining all checkpoints at once. Since my checkpoint code borrows heavily from concepts in the snapshot code, I chose to tackle the problem by starting with this series, which does the same thing for snapshots as what I plan to do for checkpoints. That is, since this patch series adds 2 new APIs, the checkpoint series will do likewise with very similar code. I'm also toying with the idea of followup patches that store all snapshots alongside the persistent <domain> XML in a single file, rather than in one snapshot per <domainsnapshot> file (we'd still support reading from the old method at libvirtd startup, but would not need to output in that manner any more). Based-on: <20190308060512.17733-1-eblake(a)redhat.com> [0/5 snapshots: topological sorting] Changes from v3: - introduce 2 new API instead of flags to 2 existing API [Jan] - rebase on top of minor changes that already landed in the non-controversial first half of the v3 series [John] git backport-diff gets confused by patch renames, but this is quite obviously more or less a rewrite: 001/8:[down] 'snapshot: Add new API for bulk dumpxml/redefine' 002/8:[down] 'snapshot: Support topological virDomainSnapshotForEach()' 003/8:[down] 'snapshot: Tweaks to support new bulk dumpxml/import API' 004/8:[down] 'remote: Wire up snapshot bulk dumpxml/import' 005/8:[down] 'virsh: Expose bulk snapshot dumpxml/import' 006/8:[0087] [FC] 'test: Implement bulk snapshot operations' 007/8:[0040] [FC] 'qemu: Factor out qemuDomainSnapshotValidate() helper' 008/8:[0152] [FC] 'qemu: Implement bulk snapshot operations' Eric Blake (8): snapshot: Add new API for bulk dumpxml/redefine snapshot: Support topological virDomainSnapshotForEach() snapshot: Tweaks to support new bulk dumpxml/import API remote: Wire up snapshot bulk dumpxml/import virsh: Expose bulk snapshot dumpxml/import test: Implement bulk snapshot operations qemu: Factor out qemuDomainSnapshotValidate() helper qemu: Implement bulk snapshot operations include/libvirt/libvirt-domain-snapshot.h | 16 +- src/conf/snapshot_conf.h | 1 + src/driver-hypervisor.h | 13 +- src/conf/snapshot_conf.c | 34 ++-- src/libvirt-domain-snapshot.c | 122 ++++++++++- src/libvirt_public.syms | 2 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 236 +++++++++++++++++----- src/remote/remote_driver.c | 6 +- src/remote/remote_protocol.x | 38 +++- src/remote_protocol-structs | 17 ++ src/test/test_driver.c | 62 +++++- src/vz/vz_driver.c | 3 +- tools/virsh-snapshot.c | 111 ++++++++-- tools/virsh.pod | 15 +- 15 files changed, 584 insertions(+), 94 deletions(-) -- 2.20.1

4 31

[libvirt] [PATCH 0/8] tests: Improve QEMU capability testing
by Andrea Bolognani 13 Mar '19

13 Mar '19

This series removes the need to fiddle with test programs every time a new .replies file is added to the test suite, and also completely removes the possibility of missing on some test coverage because only one of the two test programs is updated. Andrea Bolognani (8): tests: Introduce testQemuDataInit() and testQemuDataReset() tests: Move ret into testQemuData tests: Move data directories into testQemuData tests: Use virAsprintf() to build titles tests: Move code from DO_TEST() to doCapsTest() tests: Add testutilsqemu dependency for qemucaps2xmltest tests: Introduce testQemuCapsIterate() tests: Use testQemuCapsIterate() tests/Makefile.am | 1 + tests/qemucapabilitiestest.c | 123 ++++++++++++++++++----------------- tests/qemucaps2xmltest.c | 104 ++++++++++++++--------------- tests/testutilsqemu.c | 53 +++++++++++++++ tests/testutilsqemu.h | 8 +++ 5 files changed, 179 insertions(+), 110 deletions(-) -- 2.20.1

2 27

[libvirt] [PATCH 0/2] Small apparmor fixes
by Jim Fehlig 12 Mar '19

12 Mar '19

This series fixes a few things I broke when changing the libvirtd apparmor profile to a named profile. See patches for details. Too bad I didn't make it for 5.1.0 release.... Jim Fehlig (2): apparmor: Check libvirtd profile status by name apparmor: Add ptrace and signal rules for named profile src/security/apparmor/libvirt-qemu | 2 ++ src/security/security_apparmor.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) -- 2.20.1

2 5