- Devel - libvirt List Archives

[PATCHv2 0/2] Add a type attribute on the mac address element
by Bastien Orivel 13 Jul '20

13 Jul '20

Changed: - Split the commit in two to separate the documentation from the code changes. - Change the attribute name from check (tri state bool) to type (static/generated). Bastien Orivel (2): Add a type attribute on the mac address element Document the `type` attribute for mac addresses NEWS.rst | 6 ++++ docs/drvesx.html.in | 7 +++++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 26 ++++++++++++++++- src/conf/domain_conf.h | 11 +++++++ src/vmx/vmx.c | 8 +++-- .../network-interface-mac-type.xml | 29 +++++++++++++++++++ tests/genericxml2xmltest.c | 2 ++ 8 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 tests/genericxml2xmlindata/network-interface-mac-type.xml -- 2.20.1

1 0

[PATCH] Add a check attribute on the mac address element
by Bastien Orivel 13 Jul '20

13 Jul '20

This is only used in the ESX driver where, when set to "no", it will ignore all the checks libvirt does about the origin of the MAC address (whether or not it's in a VMWare OUI) and forward the original one to the ESX server telling it not to check it either. This allows keeping a deterministic MAC address which can be useful for licensed software which might dislike changes. Signed-off-by: Bastien Orivel <bastien.orivel(a)diateam.net> --- NEWS.rst | 6 ++++ docs/drvesx.html.in | 5 ++++ docs/schemas/domaincommon.rng | 3 ++ src/conf/domain_conf.c | 18 +++++++++++- src/conf/domain_conf.h | 1 + src/vmx/vmx.c | 9 +++++- .../network-interface-mac-check.xml | 29 +++++++++++++++++++ tests/genericxml2xmltest.c | 2 ++ 8 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 tests/genericxml2xmlindata/network-interface-mac-check.xml diff --git a/NEWS.rst b/NEWS.rst index 1928220854..ac4de4360d 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -18,6 +18,12 @@ v6.6.0 (unreleased) Libvirt allows configuring ACPI Heterogeneous Memory Attribute Table to hint software running inside the guest on optimization. + * esx: Add a ``check`` attribute for mac addresses. + + This attribute allows (when set to ``no``) ignoring VMWare checks of the + MAC addresses that would generate a new one if they were in its OUI + (00:0c:29). + * **Improvements** * esx: Change the NIC limit for recent virtualHW versions diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index ac7bc645d1..90f368e4f5 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -427,6 +427,11 @@ error: invalid argument in libvirt was built without the 'esx' driver <pre> ethernet0.checkMACAddress = "false" </pre> + <p> + <span class="since">Since 6.6.0</span>, one can force libvirt to keep the + provided MAC address when it's in the reserved VMware range by adding a + <code>check="no"</code> attribute to the <code><mac/></code> element. + </p> <h3><a id="hardware">Available hardware</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4b4aa60c66..b926b752fe 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3179,6 +3179,9 @@ <attribute name="address"> <ref name="uniMacAddr"/> </attribute> + <optional> + <attribute name="check"><ref name="virYesNo"/></attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d14485f18d..aa1417c4d8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11904,6 +11904,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; g_autofree char *macaddr = NULL; + g_autofree char *macaddr_check = NULL; g_autofree char *type = NULL; g_autofree char *network = NULL; g_autofree char *portgroup = NULL; @@ -11984,6 +11985,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } if (!macaddr && virXMLNodeNameEqual(cur, "mac")) { macaddr = virXMLPropString(cur, "address"); + macaddr_check = virXMLPropString(cur, "check"); } else if (!network && def->type == VIR_DOMAIN_NET_TYPE_NETWORK && virXMLNodeNameEqual(cur, "source")) { @@ -12173,6 +12175,17 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->mac_generated = true; } + if (macaddr_check) { + int tmpCheck; + if ((tmpCheck = virTristateBoolTypeFromString(macaddr_check)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid mac address check value: '%s'"), + macaddr_check); + goto error; + } + def->mac_check = tmpCheck; + } + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT | VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) < 0) { @@ -26468,8 +26481,11 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virBufferAsprintf(buf, "<mac address='%s'/>\n", + virBufferAsprintf(buf, "<mac address='%s'", virMacAddrFormat(&def->mac, macstr)); + if (def->mac_check != VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(buf, " check='%s'", virTristateBoolTypeToString(def->mac_check)); + virBufferAddLit(buf, "/>\n"); if (publicActual) { /* when there is a virDomainActualNetDef, and we haven't been diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6a737591e2..f2bcd62857 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -972,6 +972,7 @@ struct _virDomainNetDef { virDomainNetType type; virMacAddr mac; bool mac_generated; /* true if mac was *just now* auto-generated by libvirt */ + virTristateBool mac_check; int model; /* virDomainNetModelType */ char *modelstr; union { diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d4d66f6768..82035884a2 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3829,7 +3829,14 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, prefix = (def->mac.addr[0] << 16) | (def->mac.addr[1] << 8) | def->mac.addr[2]; suffix = (def->mac.addr[3] << 16) | (def->mac.addr[4] << 8) | def->mac.addr[5]; - if (prefix == 0x000c29) { + if (def->mac_check == VIR_TRISTATE_BOOL_NO) { + virBufferAsprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferAsprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + virBufferAsprintf(buffer, "ethernet%d.checkMACAddress = \"false\"\n", + controller); + } else if (prefix == 0x000c29) { virBufferAsprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); virBufferAsprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", diff --git a/tests/genericxml2xmlindata/network-interface-mac-check.xml b/tests/genericxml2xmlindata/network-interface-mac-check.xml new file mode 100644 index 0000000000..b21577d7cc --- /dev/null +++ b/tests/genericxml2xmlindata/network-interface-mac-check.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='aa:bb:cc:dd:ee:ff'/> + <source bridge='br0'/> + </interface> + <interface type='bridge'> + <mac address='aa:bb:cc:dd:ee:fe' check='yes'/> + <source bridge='br1'/> + </interface> + <interface type='bridge'> + <mac address='aa:bb:cc:dd:ee:fd' check='no'/> + <source bridge='br2'/> + </interface> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 8b9b0bafb6..102abfdec2 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -183,6 +183,8 @@ mymain(void) DO_TEST("cpu-cache-passthrough"); DO_TEST("cpu-cache-disable"); + DO_TEST("network-interface-mac-check"); + DO_TEST_DIFFERENT("chardev-tcp"); DO_TEST_FULL("chardev-tcp-missing-host", 0, false, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); -- 2.20.1

3 6

[PATCH v6 00/10] Tighten qemu-img rules on missing backing format
by Eric Blake 13 Jul '20

13 Jul '20

v5 was here: https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg00679.html In v6: - add a few more patches - change qcow semantics based on several iterations of mailing list debates on what behavior is easiest to support - add iotesting that a probed raw file cannot be committed into - instead of recording an implicit probed raw file, instead we record only a non-raw file - rebase to a few more affected iotests, plus s/5.0/5.1/ Yes, I know this is really short notice to make it in before feature freeze for 5.1 (removal in 6.0), so it may end up slipping into 5.2 (removal in 6.1); but we'll see how things go. Also available at https://repo.or.cz/qemu/ericb.git/shortlog/refs/tags/qemu-img-create-backin… 001/10:[down] 'qemu-img: Flush stdout before before potential stderr messages' 002/10:[down] 'block: Finish deprecation of 'qemu-img convert -n -o'' 003/10:[----] [--] 'sheepdog: Add trivial backing_fmt support' 004/10:[----] [--] 'vmdk: Add trivial backing_fmt support' 005/10:[0088] [FC] 'qcow: Tolerate backing_fmt=' 006/10:[down] 'block: Error if backing file fails during creation without -u' 007/10:[0004] [FC] 'qcow2: Deprecate use of qemu-img amend to change backing file' 008/10:[0059] [FC] 'iotests: Specify explicit backing format where sensible' 009/10:[----] [-C] 'block: Add support to warn on backing file change without format' 010/10:[0027] [FC] 'qemu-img: Deprecate use of -b without -F' Eric Blake (10): qemu-img: Flush stdout before before potential stderr messages block: Finish deprecation of 'qemu-img convert -n -o' sheepdog: Add trivial backing_fmt support vmdk: Add trivial backing_fmt support qcow: Tolerate backing_fmt= block: Error if backing file fails during creation without -u qcow2: Deprecate use of qemu-img amend to change backing file iotests: Specify explicit backing format where sensible block: Add support to warn on backing file change without format qemu-img: Deprecate use of -b without -F docs/system/deprecated.rst | 58 +++++++++++++++++++---- docs/tools/qemu-img.rst | 4 ++ include/block/block.h | 4 +- block.c | 53 +++++++++++++++------ block/qcow.c | 20 +++++++- block/qcow2.c | 7 ++- block/sheepdog.c | 18 ++++++- block/stream.c | 2 +- block/vmdk.c | 14 ++++++ blockdev.c | 3 +- qemu-img.c | 15 ++++-- tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/017.out | 2 +- tests/qemu-iotests/018 | 2 +- tests/qemu-iotests/018.out | 2 +- tests/qemu-iotests/019 | 5 +- tests/qemu-iotests/019.out | 2 +- tests/qemu-iotests/020 | 4 +- tests/qemu-iotests/020.out | 4 +- tests/qemu-iotests/024 | 8 ++-- tests/qemu-iotests/024.out | 5 +- tests/qemu-iotests/028 | 4 +- tests/qemu-iotests/028.out | 2 +- tests/qemu-iotests/030 | 26 ++++++++--- tests/qemu-iotests/034 | 2 +- tests/qemu-iotests/034.out | 2 +- tests/qemu-iotests/037 | 2 +- tests/qemu-iotests/037.out | 2 +- tests/qemu-iotests/038 | 2 +- tests/qemu-iotests/038.out | 2 +- tests/qemu-iotests/039 | 3 +- tests/qemu-iotests/039.out | 2 +- tests/qemu-iotests/040 | 47 +++++++++++++------ tests/qemu-iotests/041 | 37 ++++++++++----- tests/qemu-iotests/042 | 4 +- tests/qemu-iotests/043 | 18 +++---- tests/qemu-iotests/043.out | 16 ++++--- tests/qemu-iotests/046 | 2 +- tests/qemu-iotests/046.out | 2 +- tests/qemu-iotests/049.out | 8 ++-- tests/qemu-iotests/050 | 4 +- tests/qemu-iotests/050.out | 2 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/051.pc.out | 2 +- tests/qemu-iotests/054.out | 2 +- tests/qemu-iotests/056 | 3 +- tests/qemu-iotests/060 | 2 +- tests/qemu-iotests/060.out | 2 +- tests/qemu-iotests/061 | 10 ++-- tests/qemu-iotests/061.out | 11 +++-- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/069.out | 2 +- tests/qemu-iotests/073 | 2 +- tests/qemu-iotests/073.out | 2 +- tests/qemu-iotests/079.out | 2 +- tests/qemu-iotests/082 | 10 ++-- tests/qemu-iotests/082.out | 14 +++--- tests/qemu-iotests/085 | 4 +- tests/qemu-iotests/085.out | 6 +-- tests/qemu-iotests/089 | 2 +- tests/qemu-iotests/089.out | 2 +- tests/qemu-iotests/095 | 4 +- tests/qemu-iotests/095.out | 4 +- tests/qemu-iotests/097 | 4 +- tests/qemu-iotests/097.out | 16 +++---- tests/qemu-iotests/098 | 2 +- tests/qemu-iotests/098.out | 8 ++-- tests/qemu-iotests/110 | 4 +- tests/qemu-iotests/110.out | 4 +- tests/qemu-iotests/111.out | 2 +- tests/qemu-iotests/112.out | 4 +- tests/qemu-iotests/114 | 12 +++++ tests/qemu-iotests/114.out | 9 ++++ tests/qemu-iotests/122 | 34 +++++++++----- tests/qemu-iotests/122.out | 12 +++-- tests/qemu-iotests/126 | 4 +- tests/qemu-iotests/126.out | 4 +- tests/qemu-iotests/127 | 4 +- tests/qemu-iotests/127.out | 4 +- tests/qemu-iotests/129 | 3 +- tests/qemu-iotests/133 | 2 +- tests/qemu-iotests/133.out | 2 +- tests/qemu-iotests/139 | 2 +- tests/qemu-iotests/141 | 4 +- tests/qemu-iotests/141.out | 4 +- tests/qemu-iotests/142 | 2 +- tests/qemu-iotests/142.out | 2 +- tests/qemu-iotests/153 | 14 +++--- tests/qemu-iotests/153.out | 35 +++++++------- tests/qemu-iotests/154 | 42 ++++++++--------- tests/qemu-iotests/154.out | 42 ++++++++--------- tests/qemu-iotests/155 | 12 +++-- tests/qemu-iotests/156 | 9 ++-- tests/qemu-iotests/156.out | 6 +-- tests/qemu-iotests/158 | 2 +- tests/qemu-iotests/158.out | 2 +- tests/qemu-iotests/161 | 8 ++-- tests/qemu-iotests/161.out | 8 ++-- tests/qemu-iotests/176 | 4 +- tests/qemu-iotests/176.out | 32 ++++++------- tests/qemu-iotests/177 | 2 +- tests/qemu-iotests/177.out | 2 +- tests/qemu-iotests/179 | 2 +- tests/qemu-iotests/179.out | 2 +- tests/qemu-iotests/189 | 2 +- tests/qemu-iotests/189.out | 2 +- tests/qemu-iotests/191 | 12 ++--- tests/qemu-iotests/191.out | 12 ++--- tests/qemu-iotests/195 | 6 +-- tests/qemu-iotests/195.out | 6 +-- tests/qemu-iotests/198 | 2 +- tests/qemu-iotests/198.out | 3 +- tests/qemu-iotests/204 | 2 +- tests/qemu-iotests/204.out | 2 +- tests/qemu-iotests/216 | 2 +- tests/qemu-iotests/224 | 4 +- tests/qemu-iotests/225 | 2 +- tests/qemu-iotests/225.out | 2 +- tests/qemu-iotests/228 | 5 +- tests/qemu-iotests/245 | 3 +- tests/qemu-iotests/249 | 4 +- tests/qemu-iotests/249.out | 4 +- tests/qemu-iotests/252 | 2 +- tests/qemu-iotests/257 | 3 +- tests/qemu-iotests/259.out | 2 +- tests/qemu-iotests/267 | 4 +- tests/qemu-iotests/267.out | 6 +-- tests/qemu-iotests/270 | 2 +- tests/qemu-iotests/270.out | 2 +- tests/qemu-iotests/273 | 4 +- tests/qemu-iotests/273.out | 4 +- tests/qemu-iotests/274 | 12 ++--- tests/qemu-iotests/274.out | 29 ++++++------ tests/qemu-iotests/279 | 4 +- tests/qemu-iotests/279.out | 4 +- tests/qemu-iotests/290 | 2 +- tests/qemu-iotests/290.out | 4 +- tests/qemu-iotests/293 | 88 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/293.out | 59 +++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 141 files changed, 792 insertions(+), 402 deletions(-) create mode 100755 tests/qemu-iotests/293 create mode 100644 tests/qemu-iotests/293.out -- 2.27.0

3 14

[GSoC][PATCH v3 0/4] removal of qemu_domainjob dependencies
by Prathamesh Chavan 12 Jul '20

12 Jul '20

The following series of patches work on isolating the qemu_domainjob from its dependency on other files such as `qemu_migration_params`, `qemu_monitor`, etc. This is done by the introduction of a `privateData` structure, which is further handled by a structure of callback functions. Previous version of this patch can be found here[1]. As the previous patch was a bulky one, this series of patches are the result of splitting the previous one. [1]: https://www.redhat.com/archives/libvir-list/2020-July/msg00423.html Prathamesh Chavan (4): qemu_domain: moved qemuDomainNamespace to `qemu_domain` qemu_domainjob: job funcitons moved out of `qemu_domain` qemu_domainjob: introduce `privateData` for `qemuDomainJob` qemu_domainjob: introduce `privateData` for `qemuDomainJobInfo` src/qemu/qemu_backup.c | 15 +- src/qemu/qemu_domain.c | 250 +------------------ src/qemu/qemu_domain.h | 28 +++ src/qemu/qemu_domainjob.c | 406 +++++++++++++++++++++++++++---- src/qemu/qemu_domainjob.h | 54 ++-- src/qemu/qemu_driver.c | 21 +- src/qemu/qemu_migration.c | 42 ++-- src/qemu/qemu_migration_cookie.c | 7 +- src/qemu/qemu_migration_params.c | 9 +- src/qemu/qemu_process.c | 26 +- 10 files changed, 510 insertions(+), 348 deletions(-) -- 2.17.1

2 8

[PATCH v2 0/2] Fix resctrl locking
by Martin Kletzander 10 Jul '20

10 Jul '20

Le Blurb: Re-sending even when reviewed because I don't feel that confident, even after reading the commit messages after myself. Let's be honest, I'm resending it only because of the commit messages. Martin Kletzander (2): util: Rework virFileFlock() to be unambiguous resctrl: Use exclusive lock for /sys/fs/resctrl src/util/virfile.c | 27 ++++++++++++++++++--------- src/util/virfile.h | 9 ++++++++- src/util/virresctrl.c | 4 ++-- 3 files changed, 28 insertions(+), 12 deletions(-) -- 2.27.0

1 3

[PATCH] util: Rework virFileFlock() to be unambiguous
by Martin Kletzander 10 Jul '20

10 Jul '20

The boolean parameters for lock/unlock and read/write (shared/exclusive) caused a lot of confusion when reading the callers. The new approach is explicit and unambiguous. While at it, also change the only caller so that it acquires an exclusive lock as it should've been all the time. This was caused because the function was ambiguous since it was created in commit 5a0a5f7fb5f5, and due to that it was misused in commit 657ddeff2313 and since then the lock being taken was shared rather than exclusive. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virfile.c | 27 ++++++++++++++++++--------- src/util/virfile.h | 9 ++++++++- src/util/virresctrl.c | 4 ++-- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 213acdbcaa2b..554011eecb25 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -465,23 +465,33 @@ int virFileUnlock(int fd, off_t start, off_t len) /** * virFileFlock: * @fd: file descriptor to call flock on - * @lock: true for lock, false for unlock - * @shared: true if shared, false for exclusive, ignored if `@lock == false` + * @op: operation to perform * * This is just a simple wrapper around flock(2) that errors out on unsupported * platforms. * * The lock will be released when @fd is closed or this function is called with - * `@lock == false`. + * `@op == VIR_FILE_FLOCK_UNLOCK`. * * Returns 0 on success, -1 otherwise (with errno set) */ -int virFileFlock(int fd, bool lock, bool shared) +int virFileFlock(int fd, virFileFlockOperation op) { - if (lock) - return flock(fd, shared ? LOCK_SH : LOCK_EX); + int flock_op = -1; - return flock(fd, LOCK_UN); + switch (op) { + case VIR_FILE_FLOCK_SHARED: + flock_op = LOCK_SH; + break; + case VIR_FILE_FLOCK_EXCLUSIVE: + flock_op = LOCK_EX; + break; + case VIR_FILE_FLOCK_UNLOCK: + flock_op = LOCK_UN; + break; + } + + return flock(fd, flock_op); } #else /* WIN32 */ @@ -505,8 +515,7 @@ int virFileUnlock(int fd G_GNUC_UNUSED, int virFileFlock(int fd G_GNUC_UNUSED, - bool lock G_GNUC_UNUSED, - bool shared G_GNUC_UNUSED) + virFileFlockOperation op G_GNUC_UNUSED) { errno = ENOSYS; return -1; diff --git a/src/util/virfile.h b/src/util/virfile.h index 7a92364a5c9f..04428727fd3b 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -118,7 +118,14 @@ int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock) int virFileUnlock(int fd, off_t start, off_t len) G_GNUC_NO_INLINE; -int virFileFlock(int fd, bool lock, bool shared); + +typedef enum { + VIR_FILE_FLOCK_EXCLUSIVE, + VIR_FILE_FLOCK_SHARED, + VIR_FILE_FLOCK_UNLOCK, +} virFileFlockOperation; + +int virFileFlock(int fd, virFileFlockOperation op); typedef int (*virFileRewriteFunc)(int fd, const void *opaque); int virFileRewrite(const char *path, diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 3563fc560db5..784a8d43bb2f 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -463,7 +463,7 @@ virResctrlLockWrite(void) return -1; } - if (virFileFlock(fd, true, true) < 0) { + if (virFileFlock(fd, VIR_FILE_FLOCK_EXCLUSIVE) < 0) { virReportSystemError(errno, "%s", _("Cannot lock resctrl")); VIR_FORCE_CLOSE(fd); return -1; @@ -485,7 +485,7 @@ virResctrlUnlock(int fd) virReportSystemError(errno, "%s", _("Cannot close resctrl")); /* Trying to save the already broken */ - if (virFileFlock(fd, false, false) < 0) + if (virFileFlock(fd, VIR_FILE_FLOCK_UNLOCK) < 0) virReportSystemError(errno, "%s", _("Cannot unlock resctrl")); return -1; -- 2.27.0

2 2

[PATCH] resctrl: Do not open directory for writing
by Martin Kletzander 10 Jul '20

10 Jul '20

When preparing for the removal of GNULIB commit 18dca21a32e9 removed the unneeded O_DIRECTORY, but unfortunately started opening the directory for writing which fails every time for a directory. There is also no need for that as flock() works on O_RDONLY file descriptor as well, even for LOCK_EX. https://bugzilla.redhat.com/1852741 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virresctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 33044da3a1ef..f6da13645ae3 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -456,7 +456,7 @@ VIR_ONCE_GLOBAL_INIT(virResctrl); static int virResctrlLockWrite(void) { - int fd = open(SYSFS_RESCTRL_PATH, O_RDWR | O_CLOEXEC); + int fd = open(SYSFS_RESCTRL_PATH, O_RDONLY | O_CLOEXEC); if (fd < 0) { virReportSystemError(errno, "%s", _("Cannot open resctrl")); -- 2.27.0

4 9

Re: [PATCH 2/2] x86/cpu: Handle GUEST_MAXPHYADDR < HOST_MAXPHYADDR for hosts that don't support it
by Eduardo Habkost 10 Jul '20

10 Jul '20

(CCing libvir-list, and people who were included in the OVMF thread[1]) [1] https://lore.kernel.org/qemu-devel/99779e9c-f05f-501b-b4be-ff719f140a88@can… On Fri, Jun 19, 2020 at 05:53:44PM +0200, Mohammed Gamal wrote: > If the CPU doesn't support GUEST_MAXPHYADDR < HOST_MAXPHYADDR we > let QEMU choose to use the host MAXPHYADDR and print a warning to the > user. > > Signed-off-by: Mohammed Gamal <mgamal(a)redhat.com> > --- > target/i386/cpu.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index b1b311baa2..91c57117ce 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -6589,6 +6589,17 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > uint32_t host_phys_bits = x86_host_phys_bits(); > static bool warned; > > + /* > + * If host doesn't support setting physical bits on the guest, > + * report it and return > + */ > + if (cpu->phys_bits < host_phys_bits && > + !kvm_has_smaller_maxphyaddr()) { > + warn_report("Host doesn't support setting smaller phys-bits." > + " Using host phys-bits\n"); > + cpu->phys_bits = host_phys_bits; > + } > + This looks like a regression from existing behavior. Today, using smaller phys-bits doesn't crash most guests, and still allows live migration to smaller hosts. I agree using the host phys-bits is probably a better default, but we shouldn't override options set explicitly in the command line. Also, it's important that we work with libvirt and management software to ensure they have appropriate APIs to choose what to do when a cluster has hosts with different MAXPHYADDR. > /* Print a warning if the user set it to a value that's not the > * host value. > */ > -- > 2.26.2 > -- Eduardo

6 10

[libvirt PATCH v2 0/5] fixes and cleanups for current build system
by Pavel Hrdina 10 Jul '20

10 Jul '20

While working on rewrite to Meson I discovered some parts of our current build system that could be improved to help with the transition to Meson. It will make the review of the Meson patches a bit easier. Changes in v2: - dropped patches: src: unify virFileActivateDirOverride() tools: virsh-secret: fix compilation error - fixed pointed out issues - added a patch to covert FIG files into SVG files Pavel Hrdina (5): docs: drop %.png: %.fig rule docs: convert FIG files into SVG format m4: virt-secdriver-selinux: drop obsolete function checks m4: virt-xdr: rewrite XDR check wireshark: fix compilation errors docs/Makefile.am | 3 - docs/architecture.fig | 87 ---------- docs/architecture.svg | 239 +++++++++++++++++++++++++++ docs/libvirt-daemon-arch.fig | 114 ------------- docs/libvirt-daemon-arch.svg | 185 +++++++++++++++++++++ docs/libvirt-driver-arch.fig | 62 ------- docs/libvirt-driver-arch.svg | 94 +++++++++++ docs/libvirt-object-model.fig | 61 ------- docs/libvirt-object-model.svg | 138 ++++++++++++++++ docs/libvirt-virConnect-example.fig | 58 ------- docs/libvirt-virConnect-example.svg | 138 ++++++++++++++++ docs/migration-managed-direct.fig | 58 ------- docs/migration-managed-direct.svg | 107 ++++++++++++ docs/migration-managed-p2p.fig | 58 ------- docs/migration-managed-p2p.svg | 107 ++++++++++++ docs/migration-native.fig | 43 ----- docs/migration-native.svg | 68 ++++++++ docs/migration-tunnel.fig | 49 ------ docs/migration-tunnel.svg | 92 +++++++++++ docs/migration-unmanaged-direct.fig | 58 ------- docs/migration-unmanaged-direct.svg | 107 ++++++++++++ docs/node.fig | 30 ---- docs/node.svg | 36 ++++ docs/structures.fig | 72 -------- docs/structures.svg | 187 +++++++++++++++++++++ libvirt.spec.in | 4 + m4/virt-secdriver-selinux.m4 | 24 +-- m4/virt-xdr.m4 | 39 ++--- src/Makefile.am | 4 +- src/admin/Makefile.inc.am | 1 + src/internal.h | 4 + src/locking/Makefile.inc.am | 2 + src/logging/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + src/security/security_selinux.c | 18 +- tests/securityselinuxhelper.c | 6 - tools/Makefile.am | 2 +- tools/wireshark/src/packet-libvirt.c | 17 +- 38 files changed, 1545 insertions(+), 829 deletions(-) delete mode 100644 docs/architecture.fig create mode 100644 docs/architecture.svg delete mode 100644 docs/libvirt-daemon-arch.fig create mode 100644 docs/libvirt-daemon-arch.svg delete mode 100644 docs/libvirt-driver-arch.fig create mode 100644 docs/libvirt-driver-arch.svg delete mode 100644 docs/libvirt-object-model.fig create mode 100644 docs/libvirt-object-model.svg delete mode 100644 docs/libvirt-virConnect-example.fig create mode 100644 docs/libvirt-virConnect-example.svg delete mode 100644 docs/migration-managed-direct.fig create mode 100644 docs/migration-managed-direct.svg delete mode 100644 docs/migration-managed-p2p.fig create mode 100644 docs/migration-managed-p2p.svg delete mode 100644 docs/migration-native.fig create mode 100644 docs/migration-native.svg delete mode 100644 docs/migration-tunnel.fig create mode 100644 docs/migration-tunnel.svg delete mode 100644 docs/migration-unmanaged-direct.fig create mode 100644 docs/migration-unmanaged-direct.svg delete mode 100644 docs/node.fig create mode 100644 docs/node.svg delete mode 100644 docs/structures.fig create mode 100644 docs/structures.svg -- 2.26.2

4 12

[libvirt PATCH] docs: rename fig to svg in Makefile.am
by Pavel Hrdina 10 Jul '20

10 Jul '20

Commit <9ad637c9651ff29955dd6aa8fe31f639b42b7315> converted all fig files into svg files but did not change the Makefile.am. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. docs/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 3fd8256e668..a480123e33f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -343,15 +343,15 @@ api_DATA = \ libvirt-lxc-api.xml \ libvirt-admin-api.xml -fig = \ - libvirt-daemon-arch.fig \ - libvirt-driver-arch.fig \ - libvirt-object-model.fig \ - migration-managed-direct.fig \ - migration-managed-p2p.fig \ - migration-native.fig \ - migration-tunnel.fig \ - migration-unmanaged-direct.fig +svg = \ + libvirt-daemon-arch.svg \ + libvirt-driver-arch.svg \ + libvirt-object-model.svg \ + migration-managed-direct.svg \ + migration-managed-p2p.svg \ + migration-native.svg \ + migration-tunnel.svg \ + migration-unmanaged-direct.svg schemadir = $(pkgdatadir)/schemas schema_DATA = $(wildcard $(srcdir)/schemas/*.rng) @@ -359,7 +359,7 @@ schema_DATA = $(wildcard $(srcdir)/schemas/*.rng) EXTRA_DIST= \ site.xsl subsite.xsl newapi.xsl page.xsl \ $(dot_html_in) $(dot_rst) $(apipng) \ - $(fig) $(assets) \ + $(svg) $(assets) \ $(javascript) $(logofiles) \ $(internals_html_in) $(internals_rst) $(fonts) \ $(kbase_html_in) $(kbase_rst) \ -- 2.26.2

1 0

[PATCH 0/2] virSecurityManagerMetadataLock: Ignore RO filesystem
by Michal Privoznik 10 Jul '20

10 Jul '20

See 2/2 for explanation. Michal Prívozník (2): virSecurityManagerMetadataLock: Clarify directory locking comment virSecurityManagerMetadataLock: Ignore RO filesystem src/security/security_manager.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.26.2

2 3

[PATCH 0/7] qemu: Stop chowning domain restore file
by Michal Privoznik 10 Jul '20

10 Jul '20

See 4/7 for detailed explanation. Michal Prívozník (7): security: Reintroduce virSecurityManager{Set,Restore}SavedStateLabel qemu_security: Implement virSecurityManager{Set,Restore}SavedStateLabel security_selinux: Implement virSecurityManager{Set,Restore}SavedStateLabel qemu: Use qemuSecuritySetSavedStateLabel() to label restore path Revert "qemuSecurityDomainRestorePathLabel: Introduce @ignoreNS argument" secdrivers: Rename @stdin_path argument of virSecurityDomainSetAllLabel() qemu_security: Complete renaming of virSecurityManagerSetAllLabel() argument src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_process.c | 12 +++++++ src/qemu/qemu_security.c | 17 +++------- src/qemu/qemu_security.h | 13 ++++++-- src/security/security_apparmor.c | 8 ++--- src/security/security_dac.c | 2 +- src/security/security_driver.h | 11 ++++++- src/security/security_manager.c | 38 ++++++++++++++++++++-- src/security/security_manager.h | 8 ++++- src/security/security_nop.c | 2 +- src/security/security_selinux.c | 37 ++++++++++++++++++++- src/security/security_stack.c | 55 ++++++++++++++++++++++++++++++-- 13 files changed, 177 insertions(+), 30 deletions(-) -- 2.26.2

2 9

[PATCH] docs: point out that locals should be defined at the top of a block of code
by Laine Stump 10 Jul '20

10 Jul '20

Although we have nothing in make syntax-check to enforce this, and apparently there are places where it isn't the case (according to Dan), we should discourage the practice of defining new variables in the middle of a block of code. https://www.redhat.com/archives/libvir-list/2020-July/msg00433.html Signed-off-by: Laine Stump <laine(a)redhat.com> --- docs/coding-style.rst | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index 03b89c86e5..b9b4a16987 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -541,6 +541,44 @@ diligent about this, when you see a non-const pointer, you're guaranteed that it is used to modify the storage it points to, or it is aliased to another pointer that is. +Defining Local Variables +------------------------ + +Always define local variables at the top of the block in which they +are used (before any pure code). Although modern C compilers allow +defining a local variable in the middle of a block of code, this +practice can lead to bugs, and must be avoided in all libvirt +code. (As indicated in these examples, it is okay to initialize +variables where they are defined, even if the initialization involves +calling another function.) + +:: + + GOOD: + int + Bob(char *loblaw) + { + int x; + int y = lawBlog(loblaw); + char *z = NULL; + + x = y + 20; + ... + } + + BAD: + int + Bob(char *loblaw) + { + int x; + int y = lawBlog(loblaw); + + x = y + 20; + + char *z = NULL; <=== + ... + } + Attribute annotations --------------------- -- 2.25.4

4 3

[RFC PATCH 0/2] hw/sd: Deprecate the SPI mode and the SPI to SD adapter
by Philippe Mathieu-Daudé 10 Jul '20

10 Jul '20

I tried to maintain the SPI mode because it is useful in tiny embedded devices, and thought it would be helpful for the AVR MCUs. As AVR was blocked, I thought it was wise to deprecate the SPI mode as users are interested in the faster MMC mode. Today Thomas surprised me by posting an update of it! https://www.mail-archive.com/qemu-devel@nongnu.org/msg720089.html I'm still posting this as RFC to discuss, but I'm reconsiderating keeping this mode a bit more. Philippe Mathieu-Daudé (2): hw/sd/ssi-sd: Deprecate the SPI to SD card 'adapter' hw/sd/sdcard: Deprecate the SPI mode docs/system/deprecated.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.21.3

5 9

[libvirt PATCH 00/31] fixes and cleanups for current build system
by Pavel Hrdina 10 Jul '20

10 Jul '20

While working on rewrite to Meson I discovered some parts of our current build system that could be improved to help with the transition to Meson. It will make the review of the Meson patches a bit easier. Pavel Hrdina (31): build: use DLOPEN_LIBS directly configure: drop check for unsupported FreeBSD configure: introduce FLAT_NAMESPACE_FLAGS configure: remove usage of AC_HEADER_MAJOR Makefile: drop undefined LIB_CLOCK_GETTIME docs: remove incorrect generated files by apibuild.py docs: remove unused wrapstring.xsl file docs: drop %.png: %.fig rule m4: virt-sanlock: drop check for sanlock_inq_lockspace m4: virt-sanlock: use pkg-config to find libsanlock_client m4: virt-sanlock: drop check for SANLK_INQ_WAIT m4: virt-sanlock: drop check for sanlock_killpath() m4: virt-sanlock: drop check for sanlock_write_lockspace() m4: virt-secdriver-selinux: drop obsolete function checks m4: virt-selinux: drop check for selabel_open signature change m4: virt-xdr: rewrite XDR check po: change the format of POTFILES.in scripts: check-remote-protocol: remove unused OBJEXT argument src: Makefile: remove LOCK_CHECKING_CFLAGS leftover src: remove unnecessary -I$(srcdir)/secret include src: remote: Makefile: drop CFLAGS and LDFLAGS duplication src: logging: Makefile: drop undefined LOG_DRIVER src: util: rename some program macros src: util: Makefile: drop undefined LDEXP_LIBM src: util: Makefile: drop undefined OPENPTY_LIBS src: remote: Makefile: properly format sysconfdir in virtproxyd.conf src: unify virFileActivateDirOverride() tests: commandhelper: change how we detect if running as daemon tests: use WITH_NSS instead of NSS tools: virsh-secret: fix compilation error tools: wireshark: fix compilation errors build-aux/syntax-check.mk | 4 +- configure.ac | 26 +- docs/Makefile.am | 12 +- docs/wrapstring.xsl | 56 --- m4/virt-driver-modules.m4 | 3 - m4/virt-external-programs.m4 | 8 +- m4/virt-nss.m4 | 2 +- m4/virt-sanlock.m4 | 33 +- m4/virt-secdriver-selinux.m4 | 24 +- m4/virt-selinux.m4 | 17 - m4/virt-xdr.m4 | 39 +- po/Makefile.am | 6 +- po/POTFILES.in | 726 +++++++++++++-------------- scripts/check-remote-protocol.py | 5 +- src/Makefile.am | 25 +- src/admin/Makefile.inc.am | 1 + src/libvirt.c | 2 +- src/libvirt_private.syms | 3 +- src/libxl/Makefile.inc.am | 1 - src/locking/Makefile.inc.am | 2 + src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_sanlock.c | 38 -- src/logging/Makefile.inc.am | 2 +- src/logging/log_daemon.c | 2 +- src/qemu/Makefile.inc.am | 1 - src/qemu/qemu_shim.c | 2 +- src/remote/Makefile.inc.am | 13 +- src/remote/remote_daemon.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/Makefile.inc.am | 4 - src/util/Makefile.inc.am | 3 - src/util/virfile.c | 25 +- src/util/virfile.h | 4 +- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevopenvswitch.c | 16 +- tests/Makefile.am | 10 +- tests/commandhelper.c | 2 +- tests/nssmock.c | 2 +- tests/nsstest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/securityselinuxhelper.c | 5 +- tests/testutils.c | 2 +- tools/virsh-secret.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- tools/wireshark/src/packet-libvirt.c | 19 +- 46 files changed, 472 insertions(+), 693 deletions(-) delete mode 100644 docs/wrapstring.xsl -- 2.26.2

4 77

libvirt opens kernel+initrd in read-write mode
by Olaf Hering 10 Jul '20

10 Jul '20

Is there a reason why libvirtd v6.5.0 opens kernel+initrd in mode RW? 'virsh start vm' fails of both are on a read-only filesystem. Not sure if this ever worked before. <domain type='kvm'> <os> <type arch='x86_64' machine='pc-i440fx-5.1'>hvm</type> <kernel>/path/to/kernel</kernel> <initrd>/path/to/initrd</initrd> <cmdline>net.ifnames=0 console=ttyS0,115200 linemode=1 panic=9 start_shell</cmdline> <boot dev='hd'/> </os> </domain> .... 13111 stat("/path/to/initrd", {st_mode=S_IFREG|0755, st_size=119207064, ...}) = 0 13111 openat(AT_FDCWD, "/path/to/initrd", O_RDWR) = -1 EROFS (Read-only file system) .... Olaf

2 3

[libvirt PATCH] All pointers to virXMLPropString() use g_autofree.
by Nicolas Brignone 09 Jul '20

09 Jul '20

All modified functions are similar, in all cases "cleanup" label is removed, along with all the "goto" calls. Signed-off-by: Nicolas Brignone <nmbrignone(a)gmail.com> --- src/conf/device_conf.c | 183 +++++++++++++---------------------------- 1 file changed, 56 insertions(+), 127 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 7d48a3f..9fa6141 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -208,45 +208,43 @@ int virPCIDeviceAddressParseXML(xmlNodePtr node, virPCIDeviceAddressPtr addr) { - char *domain, *slot, *bus, *function, *multi; xmlNodePtr cur; xmlNodePtr zpci = NULL; - int ret = -1; memset(addr, 0, sizeof(*addr)); - domain = virXMLPropString(node, "domain"); - bus = virXMLPropString(node, "bus"); - slot = virXMLPropString(node, "slot"); - function = virXMLPropString(node, "function"); - multi = virXMLPropString(node, "multifunction"); + g_autofree char *domain = virXMLPropString(node, "domain"); + g_autofree char *bus = virXMLPropString(node, "bus"); + g_autofree char *slot = virXMLPropString(node, "slot"); + g_autofree char *function = virXMLPropString(node, "function"); + g_autofree char *multi = virXMLPropString(node, "multifunction"); if (domain && virStrToLong_uip(domain, NULL, 0, &addr->domain) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'domain' attribute")); - goto cleanup; + return -1; } if (bus && virStrToLong_uip(bus, NULL, 0, &addr->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'bus' attribute")); - goto cleanup; + return -1; } if (slot && virStrToLong_uip(slot, NULL, 0, &addr->slot) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'slot' attribute")); - goto cleanup; + return -1; } if (function && virStrToLong_uip(function, NULL, 0, &addr->function) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'function' attribute")); - goto cleanup; + return -1; } if (multi && @@ -254,11 +252,11 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown value '%s' for <address> 'multifunction' attribute"), multi); - goto cleanup; + return -1; } if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(addr, true)) - goto cleanup; + return -1; cur = node->children; while (cur) { @@ -270,17 +268,9 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, } if (zpci && virZPCIDeviceAddressParseXML(zpci, addr) < 0) - goto cleanup; + return -1; - ret = 0; - - cleanup: - VIR_FREE(domain); - VIR_FREE(bus); - VIR_FREE(slot); - VIR_FREE(function); - VIR_FREE(multi); - return ret; + return 0; } void @@ -309,187 +299,149 @@ int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressPtr addr) { - int ret = -1; - char *cssid; - char *ssid; - char *devno; - memset(addr, 0, sizeof(*addr)); - cssid = virXMLPropString(node, "cssid"); - ssid = virXMLPropString(node, "ssid"); - devno = virXMLPropString(node, "devno"); + g_autofree char *cssid = virXMLPropString(node, "cssid"); + g_autofree char *ssid = virXMLPropString(node, "ssid"); + g_autofree char *devno = virXMLPropString(node, "devno"); if (cssid && ssid && devno) { if (cssid && virStrToLong_uip(cssid, NULL, 0, &addr->cssid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'cssid' attribute")); - goto cleanup; + return -1; } if (ssid && virStrToLong_uip(ssid, NULL, 0, &addr->ssid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'ssid' attribute")); - goto cleanup; + return -1; } if (devno && virStrToLong_uip(devno, NULL, 0, &addr->devno) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'devno' attribute")); - goto cleanup; + return -1; } if (!virDomainDeviceCCWAddressIsValid(addr)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid specification for virtio ccw" " address: cssid='%s' ssid='%s' devno='%s'"), cssid, ssid, devno); - goto cleanup; + return -1; } addr->assigned = true; } else if (cssid || ssid || devno) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid partial specification for virtio ccw" " address")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(cssid); - VIR_FREE(ssid); - VIR_FREE(devno); - return ret; + return 0; } int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddressPtr addr) { - char *bus, *unit, *controller, *target; - int ret = -1; - memset(addr, 0, sizeof(*addr)); - controller = virXMLPropString(node, "controller"); - bus = virXMLPropString(node, "bus"); - target = virXMLPropString(node, "target"); - unit = virXMLPropString(node, "unit"); + g_autofree char *controller = virXMLPropString(node, "controller"); + g_autofree char *bus = virXMLPropString(node, "bus"); + g_autofree char *target = virXMLPropString(node, "target"); + g_autofree char *unit = virXMLPropString(node, "unit"); if (controller && virStrToLong_uip(controller, NULL, 10, &addr->controller) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'controller' attribute")); - goto cleanup; + return -1; } if (bus && virStrToLong_uip(bus, NULL, 10, &addr->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'bus' attribute")); - goto cleanup; + return -1; } if (target && virStrToLong_uip(target, NULL, 10, &addr->target) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'target' attribute")); - goto cleanup; + return -1; } if (unit && virStrToLong_uip(unit, NULL, 10, &addr->unit) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'unit' attribute")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(controller); - VIR_FREE(bus); - VIR_FREE(target); - VIR_FREE(unit); - return ret; + return 0; } int virDomainDeviceVirtioSerialAddressParseXML(xmlNodePtr node, virDomainDeviceVirtioSerialAddressPtr addr) { - char *controller, *bus, *port; - int ret = -1; - memset(addr, 0, sizeof(*addr)); - controller = virXMLPropString(node, "controller"); - bus = virXMLPropString(node, "bus"); - port = virXMLPropString(node, "port"); + g_autofree char *controller = virXMLPropString(node, "controller"); + g_autofree char *bus = virXMLPropString(node, "bus"); + g_autofree char *port = virXMLPropString(node, "port"); if (controller && virStrToLong_uip(controller, NULL, 10, &addr->controller) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'controller' attribute")); - goto cleanup; + return -1; } if (bus && virStrToLong_uip(bus, NULL, 10, &addr->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'bus' attribute")); - goto cleanup; + return -1; } if (port && virStrToLong_uip(port, NULL, 10, &addr->port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'port' attribute")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(controller); - VIR_FREE(bus); - VIR_FREE(port); - return ret; + return 0; } int virDomainDeviceCcidAddressParseXML(xmlNodePtr node, virDomainDeviceCcidAddressPtr addr) { - char *controller, *slot; - int ret = -1; - memset(addr, 0, sizeof(*addr)); - controller = virXMLPropString(node, "controller"); - slot = virXMLPropString(node, "slot"); + g_autofree char *controller = virXMLPropString(node, "controller"); + g_autofree char *slot = virXMLPropString(node, "slot"); if (controller && virStrToLong_uip(controller, NULL, 10, &addr->controller) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'controller' attribute")); - goto cleanup; + return -1; } if (slot && virStrToLong_uip(slot, NULL, 10, &addr->slot) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'slot' attribute")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(controller); - VIR_FREE(slot); - return ret; + return 0; } static int @@ -519,57 +471,41 @@ int virDomainDeviceUSBAddressParseXML(xmlNodePtr node, virDomainDeviceUSBAddressPtr addr) { - char *port, *bus; - int ret = -1; memset(addr, 0, sizeof(*addr)); - port = virXMLPropString(node, "port"); - bus = virXMLPropString(node, "bus"); + g_autofree char *port = virXMLPropString(node, "port"); + g_autofree char *bus = virXMLPropString(node, "bus"); if (port && virDomainDeviceUSBAddressParsePort(addr, port) < 0) - goto cleanup; + return -1; if (bus && virStrToLong_uip(bus, NULL, 10, &addr->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'bus' attribute")); - goto cleanup; + return -1; } - - ret = 0; - - cleanup: - VIR_FREE(bus); - VIR_FREE(port); - return ret; + return 0; } int virDomainDeviceSpaprVioAddressParseXML(xmlNodePtr node, virDomainDeviceSpaprVioAddressPtr addr) { - char *reg; - int ret; - memset(addr, 0, sizeof(*addr)); - reg = virXMLPropString(node, "reg"); + g_autofree char *reg = virXMLPropString(node, "reg"); if (reg) { if (virStrToLong_ull(reg, NULL, 16, &addr->reg) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'reg' attribute")); - ret = -1; - goto cleanup; + return -1; } addr->has_reg = true; } - - ret = 0; - cleanup: - VIR_FREE(reg); - return ret; + return 0; } bool @@ -604,19 +540,17 @@ int virInterfaceLinkParseXML(xmlNodePtr node, virNetDevIfLinkPtr lnk) { - int ret = -1; - char *stateStr, *speedStr; int state; - stateStr = virXMLPropString(node, "state"); - speedStr = virXMLPropString(node, "speed"); + g_autofree char *stateStr = virXMLPropString(node, "state"); + g_autofree char *speedStr = virXMLPropString(node, "speed"); if (stateStr) { if ((state = virNetDevIfStateTypeFromString(stateStr)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown link state: %s"), stateStr); - goto cleanup; + return -1; } lnk->state = state; } @@ -626,14 +560,9 @@ virInterfaceLinkParseXML(xmlNodePtr node, virReportError(VIR_ERR_XML_ERROR, _("Unable to parse link speed: %s"), speedStr); - goto cleanup; + return -1; } - - ret = 0; - cleanup: - VIR_FREE(stateStr); - VIR_FREE(speedStr); - return ret; + return 0; } int -- 2.25.2

4 6

[libvirt PATCH] docs: kbase: Fix the libvirt-host-validate typo
by Erik Skultety 09 Jul '20

09 Jul '20

I overlooked this typo during review of 2c3ffa37. Reported-by: Yalan Zhang <yalzhang(a)redhat.com> Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. docs/kbase/launch_security_sev.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/launch_security_sev.rst b/docs/kbase/launch_security_sev.rst index 19b978481a..cfdc2a6120 100644 --- a/docs/kbase/launch_security_sev.rst +++ b/docs/kbase/launch_security_sev.rst @@ -30,7 +30,7 @@ Enabling SEV on the host ======================== Before VMs can make use of the SEV feature you need to make sure your -AMD CPU does support SEV. You can run ``libvirt-host-validate`` +AMD CPU does support SEV. You can run ``virt-host-validate`` (libvirt >= 6.5.0) to check if your host supports secure guests or you can follow the manual checks below. -- 2.26.2

2 3

[PATCH] cpu_arm: fix build on non-Linux
by Roman Bogorodskiy 09 Jul '20

09 Jul '20

- Add a check for asm/hwcap.h header presence, - Add a check for getauxval() function that is used on Linux, and for elf_aux_info() which is a FreeBSD equivalent. This is based on a patch submitted by Mikael Urankar in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247722. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- configure.ac | 3 +++ src/cpu/cpu_arm.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 79055db9b1..40a326c1aa 100644 --- a/configure.ac +++ b/configure.ac @@ -345,7 +345,9 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([\ + elf_aux_info \ fallocate \ + getauxval \ getegid \ geteuid \ getgid \ @@ -374,6 +376,7 @@ AC_CHECK_FUNCS_ONCE([\ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([\ + asm/hwcap.h \ ifaddrs.h \ libtasn1.h \ util.h \ diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index cd4f720c95..fbc363e9c7 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -22,7 +22,9 @@ #include <config.h> #if defined(__aarch64__) -# include <asm/hwcap.h> +# if defined(HAVE_ASM_HWCAP_H) +# include <asm/hwcap.h> +# endif # include <sys/auxv.h> #endif @@ -518,11 +520,13 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) int cpu_feature_index = 0; size_t i; +# if defined(HAVE_GETAUXVAL) if (!(getauxval(AT_HWCAP) & HWCAP_CPUID)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("CPUID registers unavailable")); return -1; } +# endif /* read the cpuid data from MIDR_EL1 register */ asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); @@ -533,7 +537,13 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) /* parse the coresponding vendor_id bits */ data->vendor_id = (cpuid >> 24) & 0xff; +# if defined(HAVE_GETAUXVAL) hwcaps = getauxval(AT_HWCAP); +# elif defined(HAVE_ELF_AUX_INFO) + elf_aux_info(AT_HWCAP, &hwcaps, sizeof(u_long)); +# else +# error No routines to retrieve a value from the auxiliary vector +# endif VIR_DEBUG("CPU flags read from register: 0x%016lx", hwcaps); features = g_new0(char *, MAX_CPU_FLAGS + 1); -- 2.27.0

2 2

[PATCHv2] Add a changelog entry for the esx NIC limit changes
by Bastien Orivel 09 Jul '20

09 Jul '20

This was forgotten in 4bd375b6ce3a4c134bab19cd7c9a7a83609547c8 Signed-off-by: Bastien Orivel <bastien.orivel(a)diateam.net> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index cc35cb26b2..1928220854 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -20,6 +20,11 @@ v6.6.0 (unreleased) * **Improvements** + * esx: Change the NIC limit for recent virtualHW versions + + Specifying a virtualHW version greater or equal to 7 (ESXi 4.0) will allow + you to use up to 10 NICs instead of 4 as it was previously. + * **Bug fixes** -- 2.20.1

2 1

[PATCH] Add a changelog entry for the esx NIC limit changes
by Bastien Orivel 09 Jul '20

09 Jul '20

This was forgotten in 4bd375b6ce3a4c134bab19cd7c9a7a83609547c8 --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index cc35cb26b2..ce5d227068 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -20,6 +20,11 @@ v6.6.0 (unreleased) * **Improvements** + * esx: Change the NIC limit for recent virtualHW versions + + Specifying a virtualHW version greater or equal to 7 (ESXi 4.0) will allow + you to use up to 10 NICs instead of 4 as it was previously. + * **Bug fixes** -- 2.20.1

3 4

[GSoC][PATCH v2] qemu_domainjob: removal of its dependency on other qemu-files
by Prathamesh Chavan 09 Jul '20

09 Jul '20

It was seen that `qemu_domain.h` file depended upon `qemu_migration_params.h` and `qmeu_monitor.h` as they were required by some qemu_domainjob stuctures. This dependency was removed by the introduction of a `void *privateData` pointer. This privateData pointer was handled using a structure of callback functions. Additionally, the patch also moves funcitons `qemuDomainObjPrivateXMLFormatJob` and `qemuDomainObjPrivateXMLParseJob` from `qemu_domain` and handles them using the callback structure of domain jobs. Signed-off-by: Prathamesh Chavan <pc44800(a)gmail.com> --- Previous version of this patch can be found here[1]. This patch adds a funciton to the domainJobInfo callback structure to specifically to copy the jobInfo privateData structure. Also, it was noticed that qemuDomainNamespace was reciding in `qmeu_domainjob.c`, and should rather be in its original file `qmeu_domain.c`. hence was moved. src/qemu/qemu_backup.c | 13 +- src/qemu/qemu_domain.c | 251 +------------------- src/qemu/qemu_domainjob.c | 386 ++++++++++++++++++++++++++++--- src/qemu/qemu_domainjob.h | 69 ++++-- src/qemu/qemu_driver.c | 21 +- src/qemu/qemu_migration.c | 45 ++-- src/qemu/qemu_migration_cookie.c | 7 +- src/qemu/qemu_migration_params.c | 9 +- src/qemu/qemu_migration_params.h | 28 +++ src/qemu/qemu_process.c | 24 +- 10 files changed, 515 insertions(+), 338 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index b711f8f623..82dc7797cb 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -529,17 +529,19 @@ qemuBackupJobTerminate(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr completedJobInfo; size_t i; qemuDomainJobInfoUpdateTime(priv->job.current); g_clear_pointer(&priv->job.completed, qemuDomainJobInfoFree); priv->job.completed = qemuDomainJobInfoCopy(priv->job.current); + completedJobInfo = priv->job.completed->privateData; - priv->job.completed->stats.backup.total = priv->backup->push_total; - priv->job.completed->stats.backup.transferred = priv->backup->push_transferred; - priv->job.completed->stats.backup.tmp_used = priv->backup->pull_tmp_used; - priv->job.completed->stats.backup.tmp_total = priv->backup->pull_tmp_total; + completedJobInfo->stats.backup.total = priv->backup->push_total; + completedJobInfo->stats.backup.transferred = priv->backup->push_transferred; + completedJobInfo->stats.backup.tmp_used = priv->backup->pull_tmp_used; + completedJobInfo->stats.backup.tmp_total = priv->backup->pull_tmp_total; priv->job.completed->status = jobstatus; priv->job.completed->errmsg = g_strdup(priv->backup->errmsg); @@ -1069,7 +1071,8 @@ qemuBackupGetJobInfoStats(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainJobInfoPtr jobInfo) { - qemuDomainBackupStats *stats = &jobInfo->stats.backup; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainBackupStats *stats = &jobInfoPriv->stats.backup; qemuDomainObjPrivatePtr priv = vm->privateData; qemuMonitorJobInfoPtr *blockjobs = NULL; size_t nblockjobs = 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 42cc78ac1b..c77e809045 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -83,6 +83,11 @@ VIR_LOG_INIT("qemu.qemu_domain"); +VIR_ENUM_IMPL(qemuDomainNamespace, + QEMU_DOMAIN_NS_LAST, + "mount", +); + /** * qemuDomainObjFromDomain: * @domain: Domain pointer that has to be looked up @@ -2162,103 +2167,6 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf, virBufferAddLit(buf, "<prDaemon/>\n"); } - -static int -qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, - virStorageSourcePtr src, - virDomainXMLOptionPtr xmlopt) -{ - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - - virBufferAsprintf(&attrBuf, " type='%s' format='%s'", - virStorageTypeToString(src->type), - virStorageFileFormatTypeToString(src->format)); - - if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, - VIR_DOMAIN_DEF_FORMAT_STATUS, - false, false, xmlopt) < 0) - return -1; - - virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf); - - return 0; -} - - -static int -qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, - virDomainObjPtr vm) -{ - qemuDomainObjPrivatePtr priv = vm->privateData; - size_t i; - virDomainDiskDefPtr disk; - qemuDomainDiskPrivatePtr diskPriv; - - for (i = 0; i < vm->def->ndisks; i++) { - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - disk = vm->def->disks[i]; - diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - - virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'", - disk->dst, diskPriv->migrating ? "yes" : "no"); - - if (diskPriv->migrSource && - qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, - diskPriv->migrSource, - priv->driver->xmlopt) < 0) - return -1; - - virXMLFormatElement(buf, "disk", &attrBuf, &childBuf); - } - - return 0; -} - - -static int -qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, - virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv) -{ - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - qemuDomainJob job = priv->job.active; - - if (!qemuDomainTrackJob(job)) - job = QEMU_JOB_NONE; - - if (job == QEMU_JOB_NONE && - priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) - return 0; - - virBufferAsprintf(&attrBuf, " type='%s' async='%s'", - qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); - - if (priv->job.phase) { - virBufferAsprintf(&attrBuf, " phase='%s'", - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, - priv->job.phase)); - } - - if (priv->job.asyncJob != QEMU_ASYNC_JOB_NONE) - virBufferAsprintf(&attrBuf, " flags='0x%lx'", priv->job.apiFlags); - - if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && - qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) - return -1; - - if (priv->job.migParams) - qemuMigrationParamsFormat(&childBuf, priv->job.migParams); - - virXMLFormatElement(buf, "job", &attrBuf, &childBuf); - - return 0; -} - - static bool qemuDomainHasSlirp(virDomainObjPtr vm) { @@ -2394,7 +2302,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, if (priv->lockState) virBufferAsprintf(buf, "<lockstate>%s</lockstate>\n", priv->lockState); - if (qemuDomainObjPrivateXMLFormatJob(buf, vm, priv) < 0) + if (priv->job.cb.formatJob(buf, vm, &priv->job) < 0) return -1; if (priv->fakeReboot) @@ -2894,151 +2802,6 @@ qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctxt, } -static int -qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, - xmlXPathContextPtr ctxt, - virDomainDiskDefPtr disk, - virDomainXMLOptionPtr xmlopt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt); - qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - g_autofree char *format = NULL; - g_autofree char *type = NULL; - g_autoptr(virStorageSource) migrSource = NULL; - xmlNodePtr sourceNode; - - ctxt->node = node; - - if (!(ctxt->node = virXPathNode("./migrationSource", ctxt))) - return 0; - - if (!(type = virXMLPropString(ctxt->node, "type"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing storage source type")); - return -1; - } - - if (!(format = virXMLPropString(ctxt->node, "format"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing storage source format")); - return -1; - } - - if (!(migrSource = virDomainStorageSourceParseBase(type, format, NULL))) - return -1; - - /* newer libvirt uses the <source> subelement instead of formatting the - * source directly into <migrationSource> */ - if ((sourceNode = virXPathNode("./source", ctxt))) - ctxt->node = sourceNode; - - if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, - VIR_DOMAIN_DEF_PARSE_STATUS, xmlopt) < 0) - return -1; - - diskPriv->migrSource = g_steal_pointer(&migrSource); - return 0; -} - - -static int -qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv, - xmlXPathContextPtr ctxt) -{ - g_autofree xmlNodePtr *nodes = NULL; - size_t i; - int n; - - if ((n = virXPathNodeSet("./disk[@migrating='yes']", ctxt, &nodes)) < 0) - return -1; - - if (n > 0) { - if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { - VIR_WARN("Found disks marked for migration but we were not " - "migrating"); - n = 0; - } - for (i = 0; i < n; i++) { - virDomainDiskDefPtr disk; - g_autofree char *dst = NULL; - - if ((dst = virXMLPropString(nodes[i], "dev")) && - (disk = virDomainDiskByTarget(vm->def, dst))) { - QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating = true; - - if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt, - disk, - priv->driver->xmlopt) < 0) - return -1; - } - } - } - - return 0; -} - - -static int -qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv, - xmlXPathContextPtr ctxt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt); - g_autofree char *tmp = NULL; - - if (!(ctxt->node = virXPathNode("./job[1]", ctxt))) - return 0; - - if ((tmp = virXPathString("string(@type)", ctxt))) { - int type; - - if ((type = qemuDomainJobTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job type %s"), tmp); - return -1; - } - VIR_FREE(tmp); - priv->job.active = type; - } - - if ((tmp = virXPathString("string(@async)", ctxt))) { - int async; - - if ((async = qemuDomainAsyncJobTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown async job type %s"), tmp); - return -1; - } - VIR_FREE(tmp); - priv->job.asyncJob = async; - - if ((tmp = virXPathString("string(@phase)", ctxt))) { - priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp); - if (priv->job.phase < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job phase %s"), tmp); - return -1; - } - VIR_FREE(tmp); - } - } - - if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) == -2) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); - return -1; - } - - if (qemuDomainObjPrivateXMLParseJobNBD(vm, priv, ctxt) < 0) - return -1; - - if (qemuMigrationParamsParse(ctxt, &priv->job.migParams) < 0) - return -1; - - return 0; -} - - static int qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr featuresNode, xmlXPathContextPtr ctxt, @@ -3198,7 +2961,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->lockState = virXPathString("string(./lockstate)", ctxt); - if (qemuDomainObjPrivateXMLParseJob(vm, priv, ctxt) < 0) + if (priv->job.cb.parseJob(vm, &priv->job, ctxt, priv->driver->xmlopt) < 0) goto error; priv->fakeReboot = virXPathBoolean("boolean(./fakereboot)", ctxt) == 1; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 7111acadda..389777153b 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -63,11 +63,6 @@ VIR_ENUM_IMPL(qemuDomainAsyncJob, "backup", ); -VIR_ENUM_IMPL(qemuDomainNamespace, - QEMU_DOMAIN_NS_LAST, - "mount", -); - const char * qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, @@ -121,22 +116,68 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, return -1; } +static void +qemuJobInfoFreePrivateData(qemuDomainJobInfoPrivatePtr priv) +{ + g_free(&priv->stats); +} + +static void +qemuJobInfoFreePrivate(void *opaque) +{ + qemuDomainJobInfoPtr jobInfo = (qemuDomainJobInfoPtr) opaque; + qemuJobInfoFreePrivateData(jobInfo->privateData); +} void qemuDomainJobInfoFree(qemuDomainJobInfoPtr info) { + info->cb.freeJobInfoPrivate(info); g_free(info->errmsg); g_free(info); } +static void * +qemuDomainJobInfoPrivateAlloc(void) +{ + qemuDomainJobInfoPrivatePtr retPriv = g_new0(qemuDomainJobInfoPrivate, 1); + return (void *)retPriv; +} + +static void +qemuDomainJobInfoPrivateCopy(qemuDomainJobInfoPtr src, + qemuDomainJobInfoPtr dest) +{ + memcpy(dest->privateData, src->privateData, + sizeof(qemuDomainJobInfoPrivate)); +} + +static qemuDomainJobInfoPtr +qemuDomainJobInfoAlloc(void) +{ + qemuDomainJobInfoPtr ret = g_new0(qemuDomainJobInfo, 1); + ret->cb.allocJobInfoPrivate = &qemuDomainJobInfoPrivateAlloc; + ret->cb.freeJobInfoPrivate = &qemuJobInfoFreePrivate; + ret->cb.copyJobInfoPrivate = &qemuDomainJobInfoPrivateCopy; + ret->privateData = ret->cb.allocJobInfoPrivate(); + return ret; +} + +static void +qemuDomainCurrentJobInfoInit(qemuDomainJobObjPtr job) +{ + job->current = qemuDomainJobInfoAlloc(); + job->current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; +} + qemuDomainJobInfoPtr qemuDomainJobInfoCopy(qemuDomainJobInfoPtr info) { - qemuDomainJobInfoPtr ret = g_new0(qemuDomainJobInfo, 1); + qemuDomainJobInfoPtr ret = qemuDomainJobInfoAlloc(); memcpy(ret, info, sizeof(*info)); - + ret->cb.copyJobInfoPrivate(info, ret); ret->errmsg = g_strdup(info->errmsg); return ret; @@ -166,10 +207,43 @@ qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, } +static void * +qemuJobAllocPrivate(void) +{ + qemuDomainJobPrivatePtr priv; + if (VIR_ALLOC(priv) < 0) + return NULL; + return (void *)priv; +} + + +static void +qemuJobFreePrivateData(qemuDomainJobPrivatePtr priv) +{ + priv->spiceMigration = false; + priv->spiceMigrated = false; + priv->dumpCompleted = false; + qemuMigrationParamsFree(priv->migParams); + priv->migParams = NULL; +} + +static void +qemuJobFreePrivate(void *opaque) +{ + qemuDomainJobObjPtr job = (qemuDomainJobObjPtr) opaque; + qemuJobFreePrivateData(job->privateData); +} + + int qemuDomainObjInitJob(qemuDomainJobObjPtr job) { memset(job, 0, sizeof(*job)); + job->cb.allocJobPrivate = &qemuJobAllocPrivate; + job->cb.freeJobPrivate = &qemuJobFreePrivate; + job->cb.formatJob = &qemuDomainObjPrivateXMLFormatJob; + job->cb.parseJob = &qemuDomainObjPrivateXMLParseJob; + job->privateData = job->cb.allocJobPrivate(); if (virCondInit(&job->cond) < 0) return -1; @@ -213,13 +287,9 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObjPtr job) job->phase = 0; job->mask = QEMU_JOB_DEFAULT_MASK; job->abortJob = false; - job->spiceMigration = false; - job->spiceMigrated = false; - job->dumpCompleted = false; VIR_FREE(job->error); g_clear_pointer(&job->current, qemuDomainJobInfoFree); - qemuMigrationParamsFree(job->migParams); - job->migParams = NULL; + job->cb.freeJobPrivate(job); job->apiFlags = 0; } @@ -235,7 +305,7 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj, job->asyncJob = priv->job.asyncJob; job->asyncOwner = priv->job.asyncOwner; job->phase = priv->job.phase; - job->migParams = g_steal_pointer(&priv->job.migParams); + job->privateData = g_steal_pointer(&priv->job.privateData); job->apiFlags = priv->job.apiFlags; qemuDomainObjResetJob(&priv->job); @@ -285,6 +355,7 @@ int qemuDomainJobInfoUpdateDowntime(qemuDomainJobInfoPtr jobInfo) { unsigned long long now; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; if (!jobInfo->stopped) return 0; @@ -298,8 +369,8 @@ qemuDomainJobInfoUpdateDowntime(qemuDomainJobInfoPtr jobInfo) return 0; } - jobInfo->stats.mig.downtime = now - jobInfo->stopped; - jobInfo->stats.mig.downtime_set = true; + jobInfoPriv->stats.mig.downtime = now - jobInfo->stopped; + jobInfoPriv->stats.mig.downtime_set = true; return 0; } @@ -334,38 +405,39 @@ int qemuDomainJobInfoToInfo(qemuDomainJobInfoPtr jobInfo, virDomainJobInfoPtr info) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; info->type = qemuDomainJobStatusToType(jobInfo->status); info->timeElapsed = jobInfo->timeElapsed; switch (jobInfo->statsType) { case QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION: - info->memTotal = jobInfo->stats.mig.ram_total; - info->memRemaining = jobInfo->stats.mig.ram_remaining; - info->memProcessed = jobInfo->stats.mig.ram_transferred; - info->fileTotal = jobInfo->stats.mig.disk_total + + info->memTotal = jobInfoPriv->stats.mig.ram_total; + info->memRemaining = jobInfoPriv->stats.mig.ram_remaining; + info->memProcessed = jobInfoPriv->stats.mig.ram_transferred; + info->fileTotal = jobInfoPriv->stats.mig.disk_total + jobInfo->mirrorStats.total; - info->fileRemaining = jobInfo->stats.mig.disk_remaining + + info->fileRemaining = jobInfoPriv->stats.mig.disk_remaining + (jobInfo->mirrorStats.total - jobInfo->mirrorStats.transferred); - info->fileProcessed = jobInfo->stats.mig.disk_transferred + + info->fileProcessed = jobInfoPriv->stats.mig.disk_transferred + jobInfo->mirrorStats.transferred; break; case QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP: - info->memTotal = jobInfo->stats.mig.ram_total; - info->memRemaining = jobInfo->stats.mig.ram_remaining; - info->memProcessed = jobInfo->stats.mig.ram_transferred; + info->memTotal = jobInfoPriv->stats.mig.ram_total; + info->memRemaining = jobInfoPriv->stats.mig.ram_remaining; + info->memProcessed = jobInfoPriv->stats.mig.ram_transferred; break; case QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP: - info->memTotal = jobInfo->stats.dump.total; - info->memProcessed = jobInfo->stats.dump.completed; + info->memTotal = jobInfoPriv->stats.dump.total; + info->memProcessed = jobInfoPriv->stats.dump.completed; info->memRemaining = info->memTotal - info->memProcessed; break; case QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP: - info->fileTotal = jobInfo->stats.backup.total; - info->fileProcessed = jobInfo->stats.backup.transferred; + info->fileTotal = jobInfoPriv->stats.backup.total; + info->fileProcessed = jobInfoPriv->stats.backup.transferred; info->fileRemaining = info->fileTotal - info->fileProcessed; break; @@ -387,7 +459,8 @@ qemuDomainMigrationJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuMonitorMigrationStats *stats = &jobInfo->stats.mig; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorMigrationStats *stats = &jobInfoPriv->stats.mig; qemuDomainMirrorStatsPtr mirrorStats = &jobInfo->mirrorStats; virTypedParameterPtr par = NULL; int maxpar = 0; @@ -564,7 +637,8 @@ qemuDomainDumpJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuMonitorDumpStats *stats = &jobInfo->stats.dump; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorDumpStats *stats = &jobInfoPriv->stats.dump; virTypedParameterPtr par = NULL; int maxpar = 0; int npar = 0; @@ -607,7 +681,8 @@ qemuDomainBackupJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuDomainBackupStats *stats = &jobInfo->stats.backup; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainBackupStats *stats = &jobInfoPriv->stats.backup; g_autoptr(virTypedParamList) par = g_new0(virTypedParamList, 1); if (virTypedParamListAddInt(par, jobInfo->operation, @@ -782,6 +857,7 @@ qemuDomainObjCanSetJob(qemuDomainJobObjPtr job, /* Give up waiting for mutex after 30 seconds */ #define QEMU_JOB_WAIT_TIME (1000ull * 30) + /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -890,8 +966,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, qemuDomainAsyncJobTypeToString(asyncJob), obj, obj->def->name); qemuDomainObjResetAsyncJob(&priv->job); - priv->job.current = g_new0(qemuDomainJobInfo, 1); - priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; + qemuDomainCurrentJobInfoInit(&priv->job); priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); priv->job.asyncOwnerAPI = virThreadJobGet(); @@ -1190,3 +1265,248 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj) priv->job.abortJob = true; virDomainObjBroadcast(obj); } + + +static int +qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, + virStorageSourcePtr src, + virDomainXMLOptionPtr xmlopt) +{ + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + + virBufferAsprintf(&attrBuf, " type='%s' format='%s'", + virStorageTypeToString(src->type), + virStorageFileFormatTypeToString(src->format)); + + if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, + VIR_DOMAIN_DEF_FORMAT_STATUS, + false, false, xmlopt) < 0) + return -1; + + virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf); + + return 0; +} + + +static int +qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, + virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + size_t i; + virDomainDiskDefPtr disk; + qemuDomainDiskPrivatePtr diskPriv; + + for (i = 0; i < vm->def->ndisks; i++) { + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + disk = vm->def->disks[i]; + diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + + virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'", + disk->dst, diskPriv->migrating ? "yes" : "no"); + + if (diskPriv->migrSource && + qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, + diskPriv->migrSource, + priv->driver->xmlopt) < 0) + return -1; + + virXMLFormatElement(buf, "disk", &attrBuf, &childBuf); + } + + return 0; +} + + +int +qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, + virDomainObjPtr vm, + qemuDomainJobObjPtr jobObj) +{ + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + qemuDomainJob job = jobObj->active; + qemuDomainJobPrivatePtr jobPriv = jobObj->privateData; + + if (!qemuDomainTrackJob(job)) + job = QEMU_JOB_NONE; + + if (job == QEMU_JOB_NONE && + jobObj->asyncJob == QEMU_ASYNC_JOB_NONE) + return 0; + + virBufferAsprintf(&attrBuf, " type='%s' async='%s'", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(jobObj->asyncJob)); + + if (jobObj->phase) { + virBufferAsprintf(&attrBuf, " phase='%s'", + qemuDomainAsyncJobPhaseToString(jobObj->asyncJob, + jobObj->phase)); + } + + if (jobObj->asyncJob != QEMU_ASYNC_JOB_NONE) + virBufferAsprintf(&attrBuf, " flags='0x%lx'", jobObj->apiFlags); + + if (jobObj->asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && + qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) + return -1; + + if (jobPriv->migParams) + qemuMigrationParamsFormat(&childBuf, jobPriv->migParams); + + virXMLFormatElement(buf, "job", &attrBuf, &childBuf); + + return 0; +} + + +static int +qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virDomainDiskDefPtr disk, + virDomainXMLOptionPtr xmlopt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt); + qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + g_autofree char *format = NULL; + g_autofree char *type = NULL; + g_autoptr(virStorageSource) migrSource = NULL; + xmlNodePtr sourceNode; + + ctxt->node = node; + + if (!(ctxt->node = virXPathNode("./migrationSource", ctxt))) + return 0; + + if (!(type = virXMLPropString(ctxt->node, "type"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing storage source type")); + return -1; + } + + if (!(format = virXMLPropString(ctxt->node, "format"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing storage source format")); + return -1; + } + + if (!(migrSource = virDomainStorageSourceParseBase(type, format, NULL))) + return -1; + + /* newer libvirt uses the <source> subelement instead of formatting the + * source directly into <migrationSource> */ + if ((sourceNode = virXPathNode("./source", ctxt))) + ctxt->node = sourceNode; + + if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, + VIR_DOMAIN_DEF_PARSE_STATUS, xmlopt) < 0) + return -1; + + diskPriv->migrSource = g_steal_pointer(&migrSource); + return 0; +} + + +static int +qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt) +{ + g_autofree xmlNodePtr *nodes = NULL; + size_t i; + int n; + + if ((n = virXPathNodeSet("./disk[@migrating='yes']", ctxt, &nodes)) < 0) + return -1; + + if (n > 0) { + if (job->asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { + VIR_WARN("Found disks marked for migration but we were not " + "migrating"); + n = 0; + } + for (i = 0; i < n; i++) { + virDomainDiskDefPtr disk; + g_autofree char *dst = NULL; + + if ((dst = virXMLPropString(nodes[i], "dev")) && + (disk = virDomainDiskByTarget(vm->def, dst))) { + QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating = true; + + if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt, + disk, + xmlopt) < 0) + return -1; + } + } + } + + return 0; +} + + +int +qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt) +{ + qemuDomainJobPrivatePtr jobPriv = job->privateData; + VIR_XPATH_NODE_AUTORESTORE(ctxt); + g_autofree char *tmp = NULL; + + if (!(ctxt->node = virXPathNode("./job[1]", ctxt))) + return 0; + + if ((tmp = virXPathString("string(@type)", ctxt))) { + int type; + + if ((type = qemuDomainJobTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown job type %s"), tmp); + return -1; + } + VIR_FREE(tmp); + job->active = type; + } + + if ((tmp = virXPathString("string(@async)", ctxt))) { + int async; + + if ((async = qemuDomainAsyncJobTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown async job type %s"), tmp); + return -1; + } + VIR_FREE(tmp); + job->asyncJob = async; + + if ((tmp = virXPathString("string(@phase)", ctxt))) { + job->phase = qemuDomainAsyncJobPhaseFromString(async, tmp); + if (job->phase < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown job phase %s"), tmp); + return -1; + } + VIR_FREE(tmp); + } + } + + if (virXPathULongHex("string(@flags)", ctxt, &job->apiFlags) == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); + return -1; + } + + if (qemuDomainObjPrivateXMLParseJobNBD(vm, job, ctxt, xmlopt) < 0) + return -1; + + if (qemuMigrationParamsParse(ctxt, &jobPriv->migParams) < 0) + return -1; + + return 0; +} diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 124664354d..ca546c8844 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -19,7 +19,6 @@ #pragma once #include <glib-object.h> -#include "qemu_migration_params.h" #define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) #define QEMU_JOB_DEFAULT_MASK \ @@ -99,7 +98,6 @@ typedef enum { QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP, } qemuDomainJobStatsType; - typedef struct _qemuDomainMirrorStats qemuDomainMirrorStats; typedef qemuDomainMirrorStats *qemuDomainMirrorStatsPtr; struct _qemuDomainMirrorStats { @@ -107,16 +105,22 @@ struct _qemuDomainMirrorStats { unsigned long long total; }; -typedef struct _qemuDomainBackupStats qemuDomainBackupStats; -struct _qemuDomainBackupStats { - unsigned long long transferred; - unsigned long long total; - unsigned long long tmp_used; - unsigned long long tmp_total; -}; typedef struct _qemuDomainJobInfo qemuDomainJobInfo; typedef qemuDomainJobInfo *qemuDomainJobInfoPtr; + +typedef void *(*qemuDomainObjJobInfoPrivateAlloc)(void); +typedef void (*qemuDomainObjJobInfoPrivateFree)(void *); +typedef void (*qemuDomainObjJobInfoPrivateCopy)(qemuDomainJobInfoPtr, + qemuDomainJobInfoPtr); + +typedef struct _qemuDomainObjPrivateJobInfoCallbacks qemuDomainObjPrivateJobInfoCallbacks; +struct _qemuDomainObjPrivateJobInfoCallbacks { + qemuDomainObjJobInfoPrivateAlloc allocJobInfoPrivate; + qemuDomainObjJobInfoPrivateFree freeJobInfoPrivate; + qemuDomainObjJobInfoPrivateCopy copyJobInfoPrivate; +}; + struct _qemuDomainJobInfo { qemuDomainJobStatus status; virDomainJobOperation operation; @@ -136,16 +140,15 @@ struct _qemuDomainJobInfo { bool timeDeltaSet; /* Raw values from QEMU */ qemuDomainJobStatsType statsType; - union { - qemuMonitorMigrationStats mig; - qemuMonitorDumpStats dump; - qemuDomainBackupStats backup; - } stats; qemuDomainMirrorStats mirrorStats; char *errmsg; /* optional error message for failed completed jobs */ + + void *privateData; /* job specific collection of info */ + qemuDomainObjPrivateJobInfoCallbacks cb; }; + void qemuDomainJobInfoFree(qemuDomainJobInfoPtr info); @@ -156,6 +159,25 @@ qemuDomainJobInfoCopy(qemuDomainJobInfoPtr info); typedef struct _qemuDomainJobObj qemuDomainJobObj; typedef qemuDomainJobObj *qemuDomainJobObjPtr; + +typedef void *(*qemuDomainObjPrivateJobAlloc)(void); +typedef void (*qemuDomainObjPrivateJobFree)(void *); +typedef int (*qemuDomainObjPrivateJobFormat)(virBufferPtr, + virDomainObjPtr, + qemuDomainJobObjPtr); +typedef int (*qemuDomainObjPrivateJobParse)(virDomainObjPtr, + qemuDomainJobObjPtr, + xmlXPathContextPtr, + virDomainXMLOptionPtr); + +typedef struct _qemuDomainObjPrivateJobCallbacks qemuDomainObjPrivateJobCallbacks; +struct _qemuDomainObjPrivateJobCallbacks { + qemuDomainObjPrivateJobAlloc allocJobPrivate; + qemuDomainObjPrivateJobFree freeJobPrivate; + qemuDomainObjPrivateJobFormat formatJob; + qemuDomainObjPrivateJobParse parseJob; +}; + struct _qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ @@ -182,14 +204,10 @@ struct _qemuDomainJobObj { qemuDomainJobInfoPtr current; /* async job progress data */ qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */ bool abortJob; /* abort of the job requested */ - bool spiceMigration; /* we asked for spice migration and we - * should wait for it to finish */ - bool spiceMigrated; /* spice migration completed */ char *error; /* job event completion error */ - bool dumpCompleted; /* dump completed */ - - qemuMigrationParamsPtr migParams; unsigned long apiFlags; /* flags passed to the API which started the async job */ + void *privateData; /* job specific collection of data */ + qemuDomainObjPrivateJobCallbacks cb; }; const char *qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, @@ -267,3 +285,14 @@ void qemuDomainObjFreeJob(qemuDomainJobObjPtr job); int qemuDomainObjInitJob(qemuDomainJobObjPtr job); bool qemuDomainJobAllowed(qemuDomainJobObjPtr jobs, qemuDomainJob newJob); + +int +qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, + virDomainObjPtr vm, + qemuDomainJobObjPtr jobObj); + +int +qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd8d7ffb56..3ff5c5db53 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3701,14 +3701,16 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = priv->job.current->privateData; VIR_DEBUG("Waiting for dump completion"); - while (!priv->job.dumpCompleted && !priv->job.abortJob) { + while (!jobPriv->dumpCompleted && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } - if (priv->job.current->stats.dump.status == QEMU_MONITOR_DUMP_STATUS_FAILED) { + if (jobInfoPriv->stats.dump.status == QEMU_MONITOR_DUMP_STATUS_FAILED) { if (priv->job.error) virReportError(VIR_ERR_OPERATION_FAILED, _("memory-only dump failed: %s"), @@ -13554,6 +13556,7 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriverPtr driver, qemuDomainJobInfoPtr jobInfo) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; qemuMonitorDumpStats stats = { 0 }; int rc; @@ -13565,33 +13568,33 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) return -1; - jobInfo->stats.dump = stats; + jobInfoPriv->stats.dump = stats; if (qemuDomainJobInfoUpdateTime(jobInfo) < 0) return -1; - switch (jobInfo->stats.dump.status) { + switch (jobInfoPriv->stats.dump.status) { case QEMU_MONITOR_DUMP_STATUS_NONE: case QEMU_MONITOR_DUMP_STATUS_FAILED: case QEMU_MONITOR_DUMP_STATUS_LAST: virReportError(VIR_ERR_OPERATION_FAILED, _("dump query failed, status=%d"), - jobInfo->stats.dump.status); + jobInfoPriv->stats.dump.status); return -1; break; case QEMU_MONITOR_DUMP_STATUS_ACTIVE: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; VIR_DEBUG("dump active, bytes written='%llu' remaining='%llu'", - jobInfo->stats.dump.completed, - jobInfo->stats.dump.total - - jobInfo->stats.dump.completed); + jobInfoPriv->stats.dump.completed, + jobInfoPriv->stats.dump.total - + jobInfoPriv->stats.dump.completed); break; case QEMU_MONITOR_DUMP_STATUS_COMPLETED: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; VIR_DEBUG("dump completed, bytes written='%llu'", - jobInfo->stats.dump.completed); + jobInfoPriv->stats.dump.completed); break; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13427c1203..a45d13aaac 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1422,12 +1422,13 @@ static int qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.spiceMigration) + if (!jobPriv->spiceMigration) return 0; VIR_DEBUG("Waiting for SPICE to finish migration"); - while (!priv->job.spiceMigrated && !priv->job.abortJob) { + while (!jobPriv->spiceMigrated && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } @@ -1438,7 +1439,8 @@ qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) static void qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo) { - switch ((qemuMonitorMigrationStatus) jobInfo->stats.mig.status) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + switch ((qemuMonitorMigrationStatus) jobInfoPriv->stats.mig.status) { case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_POSTCOPY; break; @@ -1485,6 +1487,7 @@ qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, char **error) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; qemuMonitorMigrationStats stats; int rv; @@ -1496,7 +1499,7 @@ qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) return -1; - jobInfo->stats.mig = stats; + jobInfoPriv->stats.mig = stats; return 0; } @@ -1538,12 +1541,14 @@ qemuMigrationJobCheckStatus(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = priv->job.current; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + char *error = NULL; bool events = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT); int ret = -1; if (!events || - jobInfo->stats.mig.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { + jobInfoPriv->stats.mig.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { if (qemuMigrationAnyFetchStats(driver, vm, asyncJob, jobInfo, &error) < 0) return -1; } @@ -1777,6 +1782,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, const char *graphicsuri) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; int ret = -1; const char *listenAddress = NULL; virSocketAddr addr; @@ -1858,7 +1864,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); - priv->job.spiceMigration = !ret; + jobPriv->spiceMigration = !ret; if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; } @@ -1993,6 +1999,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, @@ -2018,7 +2025,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, " domain was successfully started on destination or not", vm->def->name); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); /* clear the job and let higher levels decide what to do */ qemuDomainObjDiscardAsyncJob(driver, vm); break; @@ -2403,6 +2410,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, bool relabel = false; int rv; char *tlsAlias = NULL; + qemuDomainJobPrivatePtr jobPriv = NULL; virNWFilterReadLockFilterUpdates(); @@ -2410,7 +2418,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("offline migration cannot handle " + _("offlineqemuDomainJobPrivatePtr jobPriv = priv->job.privateData;priv migration cannot handle " "non-shared storage")); goto cleanup; } @@ -2519,6 +2527,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; + jobPriv = priv->job.privateData; priv->origname = g_strdup(origname); if (taint_hook) { @@ -2726,7 +2735,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, stopjob: qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (stopProcess) { unsigned int stopFlags = VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -3000,6 +3009,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = NULL; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "flags=0x%x, retcode=%d", @@ -3025,6 +3035,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, /* Update times with the values sent by the destination daemon */ if (mig->jobInfo && jobInfo) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainJobInfoPrivatePtr migJobInfoPriv = mig->jobInfo->privateData; int reason; /* We need to refresh migration statistics after a completed post-copy @@ -3040,8 +3052,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuDomainJobInfoUpdateTime(jobInfo); jobInfo->timeDeltaSet = mig->jobInfo->timeDeltaSet; jobInfo->timeDelta = mig->jobInfo->timeDelta; - jobInfo->stats.mig.downtime_set = mig->jobInfo->stats.mig.downtime_set; - jobInfo->stats.mig.downtime = mig->jobInfo->stats.mig.downtime; + jobInfoPriv->stats.mig.downtime_set = migJobInfoPriv->stats.mig.downtime_set; + jobInfoPriv->stats.mig.downtime = migJobInfoPriv->stats.mig.downtime; } if (flags & VIR_MIGRATE_OFFLINE) @@ -3084,7 +3096,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuMigrationSrcRestoreDomainState(driver, vm); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); @@ -4681,6 +4693,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) @@ -4738,7 +4751,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, */ if (!v3proto && ret < 0) qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationSrcRestoreDomainState(driver, vm); @@ -4780,6 +4793,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, unsigned long resource) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; int ret = -1; /* If we didn't start the job in the begin phase, start it now. */ @@ -4814,7 +4828,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, endjob: if (ret < 0) { qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); } else { qemuMigrationJobContinue(vm); @@ -5019,6 +5033,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; int cookie_flags = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); unsigned short port; unsigned long long timeReceived = 0; @@ -5272,7 +5287,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index fb8b5bcd92..b5f4647539 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -641,7 +641,8 @@ static void qemuMigrationCookieStatisticsXMLFormat(virBufferPtr buf, qemuDomainJobInfoPtr jobInfo) { - qemuMonitorMigrationStats *stats = &jobInfo->stats.mig; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorMigrationStats *stats = &jobInfoPriv->stats.mig; virBufferAddLit(buf, "<statistics>\n"); virBufferAdjustIndent(buf, 2); @@ -1044,6 +1045,7 @@ static qemuDomainJobInfoPtr qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) { qemuDomainJobInfoPtr jobInfo = NULL; + qemuDomainJobInfoPrivatePtr jobInfoPriv = NULL; qemuMonitorMigrationStats *stats; VIR_XPATH_NODE_AUTORESTORE(ctxt); @@ -1051,8 +1053,9 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) return NULL; jobInfo = g_new0(qemuDomainJobInfo, 1); + jobInfoPriv = jobInfo->privateData; - stats = &jobInfo->stats.mig; + stats = &jobInfoPriv->stats.mig; jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; virXPathULongLong("string(./started[1])", ctxt, &jobInfo->started); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 6953badcfe..ba3eb14831 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -953,6 +953,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; virJSONValuePtr tlsProps = NULL; virJSONValuePtr secProps = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -965,7 +966,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, goto error; } - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("TLS migration is not supported with this " "QEMU binary")); @@ -1038,8 +1039,9 @@ qemuMigrationParamsDisableTLS(virDomainObjPtr vm, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) return 0; if (qemuMigrationParamsSetString(migParams, @@ -1168,6 +1170,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, virBitmapPtr remoteCaps) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; qemuMigrationCapability cap; qemuMigrationParty party; size_t i; @@ -1221,7 +1224,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, * to ask QEMU for their current settings. */ - return qemuMigrationParamsFetch(driver, vm, asyncJob, &priv->job.migParams); + return qemuMigrationParamsFetch(driver, vm, asyncJob, &jobPriv->migParams); } diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 9aea24725f..381eabbe4a 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -70,6 +70,34 @@ typedef enum { QEMU_MIGRATION_DESTINATION = (1 << 1), } qemuMigrationParty; +typedef struct _qemuDomainJobPrivate qemuDomainJobPrivate; +typedef qemuDomainJobPrivate *qemuDomainJobPrivatePtr; +struct _qemuDomainJobPrivate { + bool spiceMigration; /* we asked for spice migration and we + * should wait for it to finish */ + bool spiceMigrated; /* spice migration completed */ + bool dumpCompleted; /* dump completed */ + qemuMigrationParamsPtr migParams; +}; + + +typedef struct _qemuDomainBackupStats qemuDomainBackupStats; +struct _qemuDomainBackupStats { + unsigned long long transferred; + unsigned long long total; + unsigned long long tmp_used; + unsigned long long tmp_total; +}; + +typedef struct _qemuDomainJobInfoPrivate qemuDomainJobInfoPrivate; +typedef qemuDomainJobInfoPrivate *qemuDomainJobInfoPrivatePtr; +struct _qemuDomainJobInfoPrivate { + union { + qemuMonitorMigrationStats mig; + qemuMonitorDumpStats dump; + qemuDomainBackupStats backup; + } stats; +}; virBitmapPtr qemuMigrationParamsGetAlwaysOnCaps(qemuMigrationParty party); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d36088ba98..97c6b2ec27 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1608,6 +1608,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; virObjectLock(vm); @@ -1615,12 +1616,13 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name); priv = vm->privateData; + jobPriv = priv->job.privateData; if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { VIR_DEBUG("got SPICE_MIGRATE_COMPLETED event without a migration job"); goto cleanup; } - priv->job.spiceMigrated = true; + jobPriv->spiceMigrated = true; virDomainObjBroadcast(vm); cleanup: @@ -1636,6 +1638,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque) { qemuDomainObjPrivatePtr priv; + qemuDomainJobInfoPrivatePtr jobInfoPriv; virQEMUDriverPtr driver = opaque; virObjectEventPtr event = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -1648,12 +1651,13 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, qemuMonitorMigrationStatusTypeToString(status)); priv = vm->privateData; + jobInfoPriv = priv->job.current->privateData; if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) { VIR_DEBUG("got MIGRATION event without a migration job"); goto cleanup; } - priv->job.current->stats.mig.status = status; + jobInfoPriv->stats.mig.status = status; virDomainObjBroadcast(vm); if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY && @@ -1720,6 +1724,8 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; + qemuDomainJobInfoPrivatePtr jobInfoPriv; virObjectLock(vm); @@ -1727,18 +1733,20 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name, stats, NULLSTR(error)); priv = vm->privateData; + jobPriv = priv->job.privateData; + jobInfoPriv = priv->job.current->privateData; if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) { VIR_DEBUG("got DUMP_COMPLETED event without a dump_completed job"); goto cleanup; } - priv->job.dumpCompleted = true; - priv->job.current->stats.dump = *stats; + jobPriv->dumpCompleted = true; + jobInfoPriv->stats.dump = *stats; priv->job.error = g_strdup(error); /* Force error if extracting the DUMP_COMPLETED status failed */ if (!error && status < 0) { priv->job.error = g_strdup(virGetLastErrorMessage()); - priv->job.current->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; + jobInfoPriv->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; } virDomainObjBroadcast(vm); @@ -3411,6 +3419,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, virDomainState state, int reason) { + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = (state == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED) || (state == VIR_DOMAIN_RUNNING && @@ -3459,7 +3468,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } @@ -3471,6 +3480,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, int reason, unsigned int *stopFlags) { + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = state == VIR_DOMAIN_PAUSED && (reason == VIR_DOMAIN_PAUSED_POSTCOPY || reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED); @@ -3554,7 +3564,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } -- 2.17.1

2 1

[PATCH] src: fix word spell typos
by Fangge Jin 09 Jul '20

09 Jul '20

Signed-off-by: Fangge Jin <fjin(a)redhat.com> --- src/bhyve/libvirtd_bhyve.aug | 2 +- src/cpu/cpu_arm.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/interface/interface_backend_udev.c | 4 ++-- src/internal.h | 2 +- src/libvirt-domain.c | 2 +- src/libvirt-nodedev.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/locking/libvirt_lockd.aug | 2 +- src/locking/libvirt_sanlock.aug | 2 +- src/locking/virtlockd.aug | 2 +- src/logging/virtlogd.aug | 2 +- src/lxc/libvirtd_lxc.aug | 2 +- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_process.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 8 ++++---- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_qapi.c | 4 ++-- src/qemu/qemu_security.c | 2 +- src/remote/libvirtd.aug.in | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/rpc/virnetlibsshsession.c | 4 ++-- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsshsession.c | 4 ++-- src/storage/storage_util.c | 4 ++-- src/util/virbuffer.h | 2 +- src/util/vircommand.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virhostcpu.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virnetdevopenvswitch.c | 4 ++-- src/util/virnetdevtap.c | 2 +- src/util/virqemu.c | 2 +- src/util/virresctrl.c | 2 +- src/util/virsysinfo.c | 2 +- src/util/virsystemd.c | 2 +- src/util/virtpm.c | 2 +- src/vbox/vbox_common.h | 2 +- src/vbox/vbox_network.c | 4 ++-- src/vbox/vbox_snapshot_conf.c | 4 ++-- src/vbox/vbox_tmpl.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 4 ++-- 56 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/bhyve/libvirtd_bhyve.aug b/src/bhyve/libvirtd_bhyve.aug index 66079376c4..b6bee261a6 100644 --- a/src/bhyve/libvirtd_bhyve.aug +++ b/src/bhyve/libvirtd_bhyve.aug @@ -24,7 +24,7 @@ module Libvirtd_bhyve = let log_entry = str_entry "firmware_dir" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index cd4f720c95..016d414143 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -528,9 +528,9 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); VIR_DEBUG("CPUID read from register: 0x%016lx", cpuid); - /* parse the coresponding part_id bits */ + /* parse the corresponding part_id bits */ data->pvr = (cpuid >> 4) & 0xfff; - /* parse the coresponding vendor_id bits */ + /* parse the corresponding vendor_id bits */ data->vendor_id = (cpuid >> 24) & 0xff; hwcaps = getauxval(AT_HWCAP); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 16690edfbe..7564ece7e9 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3419,7 +3419,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, if (STREQ(directoryName, directoryAndFileName)) { /* - * The <path> part of the datatore path didn't contain a '/', assume + * The <path> part of the datastore path didn't contain a '/', assume * that the <path> part is actually the file name. */ datastorePathWithoutFileName = g_strdup_printf("[%s]", datastoreName); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index e388f98536..670de48d52 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -653,7 +653,7 @@ udevGetIfaceDefBond(struct udev *udev, /* bonding/mode is in the format: "balance-rr 0" so we find the * space and increment the pointer to get the number and convert - * it to an interger. libvirt uses 1 through 7 while the raw + * it to an integer. libvirt uses 1 through 7 while the raw * number is 0 through 6 so increment it by 1. */ tmp_str = udev_device_get_sysattr_value(dev, "bonding/mode"); @@ -684,7 +684,7 @@ udevGetIfaceDefBond(struct udev *udev, /* bonding/arp_validate is in the format: "none 0" so we find the * space and increment the pointer to get the number and convert - * it to an interger. + * it to an integer. */ tmp_str = udev_device_get_sysattr_value(dev, "bonding/arp_validate"); if (!tmp_str) { diff --git a/src/internal.h b/src/internal.h index e181218067..c054e3ce96 100644 --- a/src/internal.h +++ b/src/internal.h @@ -490,7 +490,7 @@ enum { #endif /* Ideally callers would use the g_*printf - * functions directly but there are alot to + * functions directly but there are a lot to * convert, so until then... */ #ifndef VIR_NO_GLIB_STDIO diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 52ce3ef798..9f65cba2e8 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -10016,7 +10016,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, * @bandwidth: specify bandwidth limit; flags determine the unit * @flags: bitwise-OR of virDomainBlockJobSetSpeedFlags * - * Set the maximimum allowable bandwidth that a block job may consume. If + * Set the maximum allowable bandwidth that a block job may consume. If * bandwidth is 0, the limit will revert to the hypervisor default of * unlimited. * diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index cdec123568..ca6c2bb057 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -492,7 +492,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) * virNodeDeviceDettach: * @dev: pointer to the node device * - * Dettach the node device from the node itself so that it may be + * Detach the node device from the node itself so that it may be * assigned to a guest domain. * * Depending on the hypervisor, this may involve operations such diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0059fc2a7..a2a2abfd8d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1866,7 +1866,7 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, } /* - * dom0's maximum memory can be controled by the user with the 'dom0_mem' Xen + * dom0's maximum memory can be controlled by the user with the 'dom0_mem' Xen * command line parameter. E.g. to set dom0's initial memory to 4G and max * memory to 8G: dom0_mem=4G,max:8G * Supported unit suffixes are [bBkKmMgGtT]. If not specified the default diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a80bc3fe3a..1585d8d0b3 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1533,7 +1533,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int flags) goto endjob; } virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_WAKEUP); - /* reenable death event - libxl reports it only once */ + /* re-enable death event - libxl reports it only once */ if (priv->deathW) libxl_evdisable_domain_death(cfg->ctx, priv->deathW); if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 379d7a8d00..58b6e7bfa1 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -119,7 +119,7 @@ libvirt_progress(xentoollog_logger *logger_in G_GNUC_UNUSED, unsigned long done G_GNUC_UNUSED, unsigned long total G_GNUC_UNUSED) { - /* This function purposedly does nothing: it's no logging info */ + /* This function purposely does nothing: it's no logging info */ } static void diff --git a/src/locking/libvirt_lockd.aug b/src/locking/libvirt_lockd.aug index 6888e8e9b7..8cdb71a8a4 100644 --- a/src/locking/libvirt_lockd.aug +++ b/src/locking/libvirt_lockd.aug @@ -16,7 +16,7 @@ module Libvirt_lockd = let int_entry (kw:string) = [ key kw . value_sep . int_val ] - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = bool_entry "auto_disk_leases" | bool_entry "require_lease_for_disks" | str_entry "file_lockspace_dir" diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug index 88435902d2..184ea1f181 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -16,7 +16,7 @@ module Libvirt_sanlock = let int_entry (kw:string) = [ key kw . value_sep . int_val ] - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = str_entry "disk_lease_dir" | bool_entry "auto_disk_leases" | int_entry "host_id" diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug index 06d508e6e5..4b8224b7bc 100644 --- a/src/locking/virtlockd.aug +++ b/src/locking/virtlockd.aug @@ -30,7 +30,7 @@ module Virtlockd = | int_entry "max_clients" | int_entry "admin_max_clients" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = logging_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/logging/virtlogd.aug b/src/logging/virtlogd.aug index 04580734d6..0f1b290c72 100644 --- a/src/logging/virtlogd.aug +++ b/src/logging/virtlogd.aug @@ -32,7 +32,7 @@ module Virtlogd = | int_entry "max_size" | int_entry "max_backups" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = logging_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/lxc/libvirtd_lxc.aug b/src/lxc/libvirtd_lxc.aug index be6402cc01..0e7666a70e 100644 --- a/src/lxc/libvirtd_lxc.aug +++ b/src/lxc/libvirtd_lxc.aug @@ -28,7 +28,7 @@ module Libvirtd_lxc = | bool_entry "security_default_confined" | bool_entry "security_require_confined" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 9e879e438a..cc545f5fda 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -713,7 +713,7 @@ lxcNetworkGetParseDataByIndexLegacy(lxcNetworkParseDataArray *networks, if (ndata > 0) return networks->parseData[ndata - 1]; - /* Not able to retrive an element */ + /* Not able to retrieve an element */ return NULL; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f3d57875ad..fc59c2e5af 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -861,7 +861,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, /* If the LXC domain is suspended we send all processes a SIGKILL * and thaw them. Upon wakeup the process sees the pending signal * and dies immediately. It is guaranteed that priv->cgroup != NULL - * here because the domain has aleady been suspended using the + * here because the domain has already been suspended using the * freezer cgroup. */ if (reason == VIR_DOMAIN_SHUTOFF_DESTROYED && diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index cec99cb898..ab993438ee 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1409,7 +1409,7 @@ udevEnumerateAddMatches(struct udev_enumerate *udev_enumerate) for (i = 0; i < G_N_ELEMENTS(subsystem_ignored); i++) { const char *s = subsystem_ignored[i]; if (udev_enumerate_add_nomatch_subsystem(udev_enumerate, s) < 0) { - virReportSystemError(errno, "%s", _("failed to add susbsystem filter")); + virReportSystemError(errno, "%s", _("failed to add subsystem filter")); return -1; } } diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 6fa48c06e3..609567664f 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -90,7 +90,7 @@ struct _qemuAgentMessage { bool finished; /* true for sync command */ bool sync; - /* id of the issued sync comand */ + /* id of the issued sync command */ unsigned long long id; bool first; }; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 435c945b78..0039bc0e9f 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -519,7 +519,7 @@ qemuBlockJobRefreshJobs(virQEMUDriverPtr driver, /* try cancelling invalid jobs - this works only if the job is not * concluded. In such case it will fail. We'll leave such job linger * in qemu and just forget about it in libvirt because there's not much - * we coud do besides killing the VM */ + * we could do besides killing the VM */ if (job->invalidData) { qemuBlockJobMarkBroken(job); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8d5b76d9ec..eb86cd9e81 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -615,7 +615,7 @@ typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData; typedef virQEMUCapsHostCPUData *virQEMUCapsHostCPUDataPtr; struct _virQEMUCapsHostCPUData { /* Only the "info" part is stored in the capabilities cache, the rest is - * re-computed from other fields and external data sources everytime we + * re-computed from other fields and external data sources every time we * probe QEMU or load the cache. */ qemuMonitorCPUModelInfoPtr info; @@ -5280,7 +5280,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasicArch(qemuCaps); - /* initiate all capapbilities based on qemu version */ + /* initiate all capabilities based on qemu version */ virQEMUCapsInitQMPVersionCaps(qemuCaps); if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7f215b4cc6..7b497f5330 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -806,7 +806,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, /* qemuBuildTLSx509BackendProps: * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @listen: boolean listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @alias: alias for the TLS credentials object * @secalias: if one exists, the alias of the security object for passwordid @@ -847,7 +847,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, /* qemuBuildTLSx509CommandLine: * @cmd: Pointer to command * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @listen: boolean listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @certEncSecretAlias: alias of a 'secret' object for decrypting TLS private key * (optional) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 30d7c61cf9..4762f2a88a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1646,7 +1646,7 @@ qemuSharedDeviceEntryRemove(virQEMUDriverPtr driver, if (!(entry = virHashLookup(driver->sharedDevices, key))) return -1; - /* Nothing to do if the shared disk is not recored in the table. */ + /* Nothing to do if the shared disk is not recorded in the table. */ if (!qemuSharedDeviceEntryDomainExists(entry, name, &idx)) return 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 42cc78ac1b..befe95f819 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4931,7 +4931,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && qemuCaps) { /* Pick a suitable default model for the USB controller if none * has been selected by the user and we have the qemuCaps for - * figuring out which contollers are supported. + * figuring out which controllers are supported. * * We rely on device availability instead of setting the model * unconditionally because, for some machine types, there's a @@ -8193,7 +8193,7 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) * @mem: memory device definition object * * Aligns the size of the memory module as qemu enforces it. The size is updated - * inplace. Default rounding is now to 1 MiB (qemu requires rouding to page, + * inplace. Default rounding is now to 1 MiB (qemu requires rounding to page, * size so this should be safe). */ int @@ -9307,7 +9307,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, if (vm->def->virtType == VIR_DOMAIN_VIRT_QEMU) return 0; - /* The halted state is interresting only on s390(x). On other platforms + /* The halted state is interesting only on s390(x). On other platforms * the data would be stale at the time when it would be used. * Calling qemuMonitorGetCpuHalted() can adversely affect the running * VM's performance unless QEMU supports query-cpus-fast. @@ -9402,7 +9402,7 @@ qemuDomainDiskByName(virDomainDefPtr def, * * Validate whether the disk source is valid for disk device='lun'. * - * Returns 0 if the configuration is valid -1 and a libvirt error if the soure + * Returns 0 if the configuration is valid -1 and a libvirt error if the source * is invalid. */ int diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index d2a0bd9c02..058cbda2a2 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2580,7 +2580,7 @@ qemuDomainAddressFindNewBusNr(virDomainDefPtr def) * never need any additional child buses (probably only a few of the * 32 will ever be used). So for pci-expander-bus we find the lowest * existing busNr, and set this one to the current lowest - 2 (one - * for the pxb, one for the intergrated pci-bridge), thus leaving the + * for the pxb, one for the integrated pci-bridge), thus leaving the * maximum possible bus numbers available for other buses plugged * into pci-root (i.e. pci-bridges and other * pci-expander-buses). Anyone who needs more than 32 devices diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd8d7ffb56..63b54e9f7b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6432,7 +6432,7 @@ qemuDomainDelIOThread(virDomainPtr dom, * * Alter the specified @iothread_id with the values provided. * - * Returs 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ static int qemuDomainSetIOThreadParams(virDomainPtr dom, @@ -6770,7 +6770,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, } if (header->version > QEMU_SAVE_VERSION) { - /* convert endianess and try again */ + /* convert endianness and try again */ bswap_header(header); } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3954ad1109..e897c059dd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -62,7 +62,7 @@ VIR_LOG_INIT("qemu.qemu_hotplug"); #define CHANGE_MEDIA_TIMEOUT 5000 -/* Timeout in miliseconds for device removal. PPC64 domains +/* Timeout in milliseconds for device removal. PPC64 domains * can experience a bigger delay in unplug operations during * heavy guest activity (vcpu being the most notable case), thus * the timeout for PPC64 is also bigger. */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13427c1203..ee3371c098 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3288,7 +3288,7 @@ static void qemuMigrationSrcIOFunc(void *arg) virErrorRestore(&err); error: - /* Let the source qemu know that the transfer cant continue anymore. + /* Let the source qemu know that the transfer can't continue anymore. * Don't copy the error for EPIPE as destination has the actual error. */ VIR_FORCE_CLOSE(data->sock); if (!virLastErrorIsSystemErrno(EPIPE)) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5033cbeabf..4b7e6e4e90 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4340,7 +4340,7 @@ qemuMonitorSetWatchdogAction(qemuMonitorPtr mon, * @jobname: name of the job * @props: JSON object describing the blockdev to add * - * Instructs qemu to create/format a new stroage or format layer. Note that + * Instructs qemu to create/format a new storage or format layer. Note that * the job does not add the created/formatted image into qemu and * qemuMonitorBlockdevAdd needs to be called separately with corresponding * arguments. Note that the arguments for creating and adding are different. diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index e6b5ea3763..a793ae74dd 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -403,12 +403,12 @@ virQEMUQAPISchemaTraverse(const char *baseName, * '*subattribute': same as above but the selected member must be optional * (has a property named 'default' in the schema) * '+variant": In the case of unionized objects, select a specific variant of - * the prevously selected member + * the previously selected member * * - Boolean queries - @entry remains NULL, return value indicates success: * '^enumval': returns true if the previously selected enum contains 'enumval' * '!basictype': returns true if previously selected type is of 'basictype' - * JSON type. Spported are 'null', 'string', 'number', 'value', + * JSON type. Supported are 'null', 'string', 'number', 'value', * 'int' and 'boolean. * '$feature': returns true if the previously selected type supports 'feature' * ('feature' is in the 'features' array of given type) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 3b6d6e91f4..f93d189df9 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -455,7 +455,7 @@ qemuSecurityRestoreChardevLabel(virQEMUDriverPtr driver, * @existstatus: pointer to int returning exit status of process * @cmdret: pointer to int returning result of virCommandRun * - * Start the vhost-user-gpu process with approriate labels. + * Start the vhost-user-gpu process with appropriate labels. * This function returns -1 on security setup error, 0 if all the * setup was done properly. In case the virCommand failed to run * 0 is returned but cmdret is set appropriately with the process diff --git a/src/remote/libvirtd.aug.in b/src/remote/libvirtd.aug.in index 23a01c41e2..61ea8067b9 100644 --- a/src/remote/libvirtd.aug.in +++ b/src/remote/libvirtd.aug.in @@ -91,7 +91,7 @@ module @DAEMON_NAME_UC@ = | str_entry "host_uuid_source" | int_entry "ovs_timeout" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following three ... *) let entry = sock_acl_entry | authentication_entry @CUT_ENABLE_IP@ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 67b86cff78..85ca78a261 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1931,7 +1931,7 @@ void *remoteClientNew(virNetServerClientPtr client, * stateless ones inside libvirt.so). All the interesting * drivers are in separate daemons. Thus when we get a NULL * URI we need to simulate probing that virConnectOpen would - * previously do. We use the existance of the UNIX domain + * previously do. We use the existence of the UNIX domain * socket as our hook for probing. * * This assumes no stale sockets left over from a now dead diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 0a566eaa54..9c0875ef9f 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -598,7 +598,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSessionPtr sess, VIR_DEBUG("sess=%p", sess); if (priv->password) { - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = ssh_userauth_password(sess->session, NULL, priv->password)) == 0) return SSH_AUTH_SUCCESS; @@ -621,7 +621,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSessionPtr sess, sess->hostname))) return SSH_AUTH_ERROR; - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = ssh_userauth_password(sess->session, NULL, password)) == 0) return SSH_AUTH_SUCCESS; diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 8df92fb8df..f8d7fe85ed 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -354,7 +354,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, * * This method is used to dispatch a message representing an * incoming method call from a client. It decodes the payload - * to obtain method call arguments, invokves the method and + * to obtain method call arguments, invokes the method and * then sends a reply packet with the return values * * Returns 0 if the reply was sent, or -1 upon fatal error diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index b4dea15452..752c3fc915 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -681,7 +681,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, VIR_DEBUG("sess=%p", sess); if (priv->password) { - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = libssh2_userauth_password(sess->session, priv->username, priv->password)) == 0) { @@ -705,7 +705,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, sess->hostname))) goto cleanup; - /* tunelled password authentication */ + /* tunnelled password authentication */ if ((rc = libssh2_userauth_password(sess->session, priv->username, password)) == 0) { diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 1ec1d13625..666a7a91e8 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2403,7 +2403,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virCheckFlags(VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM, -1); /* if volume has target format VIR_STORAGE_FILE_PLOOP * we need to restore DiskDescriptor.xml, according to - * new contents of volume. This operation will be perfomed + * new contents of volume. This operation will be performed * when volUpload is fully finished. */ if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { /* Fail if the volume contains snapshots or we failed to check it.*/ @@ -2989,7 +2989,7 @@ virStorageBackendBLKIDFindPart(blkid_probe probe, * however, the blkid_do_probe for "dvh" returns "sgi" and * for "pc98" it returns "dos". Although "bsd" is recognized, * it seems that the parted created partition table is not being - * properly recogized. Since each of these will cause problems + * properly recognized. Since each of these will cause problems * with startup comparison, let's just treat them as UNKNOWN causing * the caller to fallback to using PARTED */ if (STREQ(format, "dvh") || STREQ(format, "pc98") || STREQ(format, "bsd")) diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index b66b1f2b23..e035135c1c 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -39,7 +39,7 @@ typedef virBuffer *virBufferPtr; * VIR_BUFFER_INIT_CHILD: * @parentbuf: parent buffer for XML element formatting * - * Intitialize a virBuffer structure and set up the indentation level for + * Initialize a virBuffer structure and set up the indentation level for * formatting XML subelements of @parentbuf. */ #define VIR_BUFFER_INIT_CHILD(parentbuf) { NULL, (parentbuf)->indent + 2 } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index aae0ddb730..f87400fc38 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1426,7 +1426,7 @@ virCommandAddEnvBuffer(virCommandPtr cmd, virBufferPtr buf) * @name: the name to look up in current environment * * Pass an environment variable to the child - * using current process' value + * using current process's value */ void virCommandAddEnvPass(virCommandPtr cmd, const char *name) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 818219fbeb..b0f180cd85 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -868,7 +868,7 @@ dnsmasqCapsGet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag) * * Turns a vector of dnsmasqDhcpHost into the string that is ought to be * stored in the hostsfile, this functionality is split to make hostsfiles - * testable. Returs NULL if nhosts is 0. + * testable. Returns NULL if nhosts is 0. */ char * dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 39bbcf8ca8..c9a9b016a9 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -663,7 +663,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, * subcore will vary accordingly to 8, 4 and 2 respectively. * So, On host threads_per_core what is arrived at from sysfs in the * current logic is actually the subcores_per_core. Threads per subcore - * can only be obtained from the kvm device. For example, on P8 wih 1 + * can only be obtained from the kvm device. For example, on P8 with 1 * core having 8 threads, sub_cores_percore=4, the threads 0,2,4 & 6 * will be online. The sysfs reflects this and in the current logic * variable 'threads' will be 4 which is nothing but subcores_per_core. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 1d024b8b97..41dc5bd4c4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1067,7 +1067,7 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, * * https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html * - * Returns true if devpath's susbsystem is pci, false otherwise. + * Returns true if devpath's subsystem is pci, false otherwise. */ static bool virNetDevIsPCIDevice(const char *devpath) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index dbb489d174..45fbf3f360 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -35,7 +35,7 @@ VIR_LOG_INIT("util.netdevopenvswitch"); /* - * Set openvswitch default timout + * Set openvswitch default timeout */ static unsigned int virNetDevOpenvswitchTimeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT; @@ -473,7 +473,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) * @path: the path of the unix socket * @ifname: the retrieved name of the interface * - * Retreives the ovs ifname from vhostuser unix socket path. + * Retrieves the ovs ifname from vhostuser unix socket path. * * Returns: 1 if interface is an openvswitch interface, * 0 if it is not, but no other error occurred, diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 7bd30ea0f9..c0a7c3019e 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -515,7 +515,7 @@ virNetDevTapAttachBridge(const char *tapname, * the bridge, or if it is smaller than the current MTU of the * bridge). If MTU isn't specified for the new device (i.e. 0), * we need to set the interface MTU to the current MTU of the - * bridge (to avoid inadvertantly changing the bridge's MTU). + * bridge (to avoid inadvertently changing the bridge's MTU). */ if (mtu > 0) { if (virNetDevSetMTU(tapname, mtu) < 0) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 321ddeb7e3..c3626189b9 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -110,7 +110,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, /** - * This array convertor is for quirky cases where the QMP schema mandates an + * This array converter is for quirky cases where the QMP schema mandates an * array of objects with only one attribute 'str' which needs to be formatted as * repeated key-value pairs without the 'str' being printed: * diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index e17f6bd1bd..f77adcfd6d 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1412,7 +1412,7 @@ virResctrlAllocGetID(virResctrlAllocPtr alloc) * * MB:0=100;1=100 * - * which indicates node id 0 has 100 percent bandwith and node id 1 + * which indicates node id 0 has 100 percent bandwidth and node id 1 * has 100 percent bandwidth. A trailing semi-colon is not formatted. */ static int diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index db84339bda..1e993ec53f 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -1002,7 +1002,7 @@ virSysinfoParseOEMStrings(const char *base, /* If OEM String contains newline, dmidecode escapes it as a dot. * If this is the case then run dmidecode again to get raw string. - * Unfortunately, we can't dinstinguish betwen dot an new line at + * Unfortunately, we can't dinstinguish between dot an new line at * this level. */ if (memchr(cur, '.', eol - cur)) { char *str; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 1d41ed34f7..9227b7aeba 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -916,7 +916,7 @@ virSystemdActivationNew(virSystemdActivationMap *map, * * Acquire an object for handling systemd activation. * If no activation FDs have been provided the returned object - * will be NULL, indicating normal sevice setup can be performed + * will be NULL, indicating normal service setup can be performed * If the returned object is non-NULL then at least one file * descriptor will be present. No normal service setup should * be performed. diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 71c1a2ecb3..1a3b5a05aa 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -89,7 +89,7 @@ virTPMCreateCancelPath(const char *devpath) /* * executables for the swtpm; to be found on the host along with - * capabilties bitmap + * capabilities bitmap */ static virMutex swtpm_tools_lock = VIR_MUTEX_INITIALIZER; static char *swtpm_path; diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index 6144714477..8b1fb2ac30 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -34,7 +34,7 @@ * vbox_CAPI_v*.h, or it would cause multiple * definitions. * - * You can see the more informations in vbox_api.h + * You can see the more information in vbox_api.h */ /* Copied definitions from vbox_CAPI_*.h. diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index cf273b9a48..dafbc114f6 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -439,7 +439,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); /* Currently support only one dhcp server per network - * with contigious address space from start to end + * with contiguous address space from start to end */ addr = ipdef->ranges[0].addr; if ((ipdef->nranges >= 1) && @@ -834,7 +834,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) gVBoxAPI.UIDHCPServer.GetLowerIP(dhcpServer, &fromIPAddressUtf16); gVBoxAPI.UIDHCPServer.GetUpperIP(dhcpServer, &toIPAddressUtf16); /* Currently virtualbox supports only one dhcp server per network - * with contigious address space from start to end + * with contiguous address space from start to end */ addr = ipdef->ranges[0].addr; if (vboxSocketParseAddrUtf16(data, ipAddressUtf16, diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 3876955981..5c3269b825 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -877,7 +877,7 @@ virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfMachinePtr machine, if (snapshot->nchildren > 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("This snapshot has children, " - "please delete theses snapshots before")); + "please delete these snapshots before")); return -1; } @@ -1387,7 +1387,7 @@ virVBoxSnapshotConfHardDiskUuidByLocation(virVBoxSnapshotConfMachinePtr machine, return hardDisk->uuid; } -/*Retreive the whole ancestry of the vboxSnapshotXmlHardDiskPtr whose location is +/*Retrieve the whole ancestry of the vboxSnapshotXmlHardDiskPtr whose location is *'location', and store them in a newly allocated list of vboxSnapshotXmlHardDiskPtr. *This list begins with the requested disk, and ends with the farthest ancestor. *return array length on success, -1 on failure.*/ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index a1a462cc74..a8ffd9f148 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1556,7 +1556,7 @@ _vrdeServerGetPorts(vboxDriverPtr data, IVRDEServer *VRDEServer, char *portUtf8 = NULL; /* get active (effective) port - available only when VM is running and has - * the VBOX extensions installed (without extenstions RDP server + * the VBOX extensions installed (without extensions RDP server * functionality is disabled) */ port = vboxGetActiveVRDEServerPort(data->vboxSession, machine); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 67bbe27fde..b9130d0902 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -888,7 +888,7 @@ virVMXSCSIDiskNameToControllerAndUnit(const char *name, int *controller, int *un *controller = idx / 15; *unit = idx % 15; - /* Skip the controller ifself at unit 7 */ + /* Skip the controller itself at unit 7 */ if (*unit >= 7) ++(*unit); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d882b91def..8d11719e7a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2628,7 +2628,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, if (vzEnsureDomainExists(dom) < 0) goto cleanup; - /* snaphot name is ignored, it will be set to auto generated by sdk uuid */ + /* snapshot name is ignored, it will be set to auto generated by sdk uuid */ if (prlsdkCreateSnapshot(dom, def->parent.description) < 0) goto cleanup; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9cee6f1fde..b5e69b385f 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2073,7 +2073,7 @@ prlsdkNewStateToEvent(VIRTUAL_MACHINE_STATE domainState, int *lvEventTypeDetails) { /* We skip all intermediate states here, because - * libvirt doesn't have correspoding event types for + * libvirt doesn't have corresponding event types for * them */ switch ((int)domainState) { case VMS_STOPPED: @@ -2549,7 +2549,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) /* * Though we don't support NUMA configuration at the moment * virDomainDefPtr always contain non zero NUMA configuration - * So, just make sure this configuration does't differ from auto generated. + * So, just make sure this configuration doesn't differ from auto generated. */ if ((virDomainNumatuneGetMode(def->numa, -1, &memMode) == 0 && memMode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) || -- 2.20.1

2 1

[libvirt PATCH] Replace "OS-X" with "macOS" in index.html.in
by Ján Tomko 09 Jul '20

09 Jul '20

From: Ryan Schmidt <git(a)ryandesign.com> Apple changed the operating system's name from "OS X" to "macOS" a few years ago. Signed-off-by: Ryan Schmidt <git(a)ryandesign.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/index.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html.in b/docs/index.html.in index 586defff54..20184a7441 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -27,7 +27,7 @@ <a href="drvlxc.html">LXC</a>, <a href="drvbhyve.html">BHyve</a> and <a href="drivers.html">more</a></li> - <li>targets Linux, FreeBSD, <a href="windows.html">Windows</a> and OS-X</li> + <li>targets Linux, FreeBSD, <a href="windows.html">Windows</a> and macOS</li> <li>is used by many <a href="apps.html">applications</a></li> </ul> <p>Recent / forthcoming <a href="news.html">release changes</a></p> -- 2.25.4

1 1

[PULL 00/20] Audio 20200706 patches
by Gerd Hoffmann 08 Jul '20

08 Jul '20

The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100) are available in the Git repository at: git://git.kraxel.org/qemu tags/audio-20200706-pull-request for you to fetch changes up to 2336172d9b396b4fa4483712f5560a563c25352f: audio: set default value for pcspk.iobase property (2020-07-06 17:01:11 +0200) ---------------------------------------------------------------- audio: deprecate -soundhw ---------------------------------------------------------------- Gerd Hoffmann (20): stubs: add isa_create_simple stubs: add pci_create_simple audio: add deprecated_register_soundhw audio: deprecate -soundhw ac97 audio: deprecate -soundhw es1370 audio: deprecate -soundhw adlib audio: deprecate -soundhw cs4231a audio: deprecate -soundhw gus audio: deprecate -soundhw sb16 audio: deprecate -soundhw hda pc_basic_device_init: pass PCMachineState pc_basic_device_init: drop has_pit arg pc_basic_device_init: drop no_vmport arg softmmu: initialize spice and audio earlier audio: rework pcspk_init() audio: create pcspk device early audio: deprecate -soundhw pcspk audio: add soundhw deprecation notice pcspk: update docs/system/target-i386-desc.rst.inc audio: set default value for pcspk.iobase property include/hw/audio/pcspk.h | 12 ++---------- include/hw/audio/soundhw.h | 2 ++ include/hw/i386/pc.h | 6 +++--- hw/audio/ac97.c | 9 ++------- hw/audio/adlib.c | 8 +------- hw/audio/cs4231a.c | 8 +------- hw/audio/es1370.c | 9 ++------- hw/audio/gus.c | 8 +------- hw/audio/intel-hda.c | 3 +++ hw/audio/pcspk.c | 26 ++++++++++++++++++++++---- hw/audio/sb16.c | 9 ++------- hw/audio/soundhw.c | 24 +++++++++++++++++++++++- hw/i386/pc.c | 14 ++++++++------ hw/i386/pc_piix.c | 3 +-- hw/i386/pc_q35.c | 3 +-- hw/isa/i82378.c | 2 +- hw/mips/jazz.c | 2 +- qdev-monitor.c | 2 ++ softmmu/vl.c | 12 ++++++------ stubs/isa-bus.c | 7 +++++++ stubs/pci-bus.c | 7 +++++++ docs/system/deprecated.rst | 9 +++++++++ docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- stubs/Makefile.objs | 2 ++ 24 files changed, 121 insertions(+), 79 deletions(-) create mode 100644 stubs/isa-bus.c create mode 100644 stubs/pci-bus.c -- 2.18.4

2 21

[PATCH] Change the virtual NICs limit for the ESX driver
by Bastien Orivel 08 Jul '20

08 Jul '20

Since the ESX virtual hardware version 4.0, virtual machines support up to 10 virtual NICs instead of 4 previously. This changes the limit accordingly based on the provided `virtualHW.version`. Signed-off-by: Bastien Orivel <bastien.orivel(a)diateam.net> --- src/vmx/vmx.c | 20 ++++++++++++++------ src/vmx/vmx.h | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 67bbe27fde..afe6fe0a1a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -290,7 +290,7 @@ def->fss[0]... <=> sharedFolder0.present = "true" ################################################################################ ## nets ######################################################################## - ethernet[0..3] -> <controller> + ethernet[0..9] -> <controller> ethernet0.present = "true" # defaults to "false" ethernet0.startConnected = "true" # defaults to "true" @@ -3376,7 +3376,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe /* def:nets */ for (i = 0; i < def->nnets; ++i) { - if (virVMXFormatEthernet(def->nets[i], i, &buffer) < 0) + if (virVMXFormatEthernet(def->nets[i], i, &buffer, virtualHW_version) < 0) goto cleanup; } @@ -3732,15 +3732,23 @@ virVMXFormatFileSystem(virDomainFSDefPtr def, int number, virBufferPtr buffer) int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, - virBufferPtr buffer) + virBufferPtr buffer, int virtualHW_version) { char mac_string[VIR_MAC_STRING_BUFLEN]; unsigned int prefix, suffix; - if (controller < 0 || controller > 3) { + /* + * Machines older than virtualHW.version = 7 (ESXi 4.0) only support up to 4 + * virtual NICs. New machines support up to 10. + */ + int controller_limit = 4; + if (virtualHW_version >= 7) + controller_limit = 10; + + if (controller < 0 || controller > controller_limit) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Ethernet controller index %d out of [0..3] range"), - controller); + _("Ethernet controller index %d out of [0..%d] range"), + controller, controller_limit - 1); return -1; } diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index 63f47822fb..7069a50b6e 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -131,7 +131,7 @@ int virVMXFormatFileSystem(virDomainFSDefPtr def, int number, virBufferPtr buffer); int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, - virBufferPtr buffer); + virBufferPtr buffer, int virtualHW_version); int virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, virBufferPtr buffer); -- 2.20.1

3 4

[PATCH 0/7] consider available CPUs in vcpupin/emulatorpin output
by Daniel Henrique Barboza 08 Jul '20

08 Jul '20

Hi, This series contains 5 cleanups and refactorings I found on my way to fixing [1]. Last 2 patches contains the actual fix for the bug. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1434276 Daniel Henrique Barboza (7): qemu_driver.c: use g_autoptr in qemuDomainGetEmulatorPinInfo() virhostcpu.c: use g_autoptr in virHostCPUGetMap() virsh-domain.c: modernize virshVcpuinfoInactive() virsh-domain.c: modernize cmdVcpuinfo() virhostcpu.c: refactor virHostCPUParseCountLinux() virhostcpu.c: introduce virHostCPUGetAvailableCPUsBitmap() conf, qemu: consider available CPUs in vcpupin/emulatorpin output src/conf/domain_conf.c | 4 +-- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 10 ++----- src/util/virhostcpu.c | 63 ++++++++++++++++++++++++---------------- src/util/virhostcpu.h | 2 ++ tools/virsh-domain.c | 44 ++++++++++------------------ 6 files changed, 59 insertions(+), 65 deletions(-) -- 2.26.2

2 9

[PATCH] docs: kbase: Fix the libvirt-host--validate typo
by Boris Fiuczynski 08 Jul '20

08 Jul '20

In f0d0cd61797 I introduced this typo. Suggested-by: Erik Skultety <eskultet(a)redhat.com> Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- docs/kbase/s390_protected_virt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/s390_protected_virt.rst b/docs/kbase/s390_protected_virt.rst index f38d16d743..1718a556d4 100644 --- a/docs/kbase/s390_protected_virt.rst +++ b/docs/kbase/s390_protected_virt.rst @@ -57,7 +57,7 @@ or an IBM LinuxONE III (or newer). It is also necessary that the IBM Secure Execution feature is enabled for that system. With libvirt >= 6.5.0 you can run -``libvirt-host--validate`` or otherwise check for facility '158', e.g. +``virt-host-validate`` or otherwise check for facility '158', e.g. :: -- 2.25.1

2 2

How to best handle NULL return from xmlNodeGetContent()
by Laine Stump 08 Jul '20

08 Jul '20

libvirt has several uses of xmlNodeGetContent() (from libxml2) added at different times over the years. Some of those uses report an Out of Memory error when xmlNodeGetContent() returns NULL, and some of them ignore a NULL return (treating it as if it were ""), and some just assume that the return will never be NULL, but always at least a pointer to "". I ran across this when I noticed a usage of the latter type - it wasn't checking for NULL at all. A lack of check seemed troubling, so I looked at other uses within libvirt and found the hodge-podge described above, so no help there in determining the right thing to do. I then looked at the libxml2 documentation for xmlNodeGetContent(), which says: Returns: a new #xmlChar * or NULL if no content is available. To an uninformed outsider, this sounds like the function could return NULL simply if the node was empty (e.g. "<wwn/>"). But when we look at the return from xmlNodeGetContent() for this example, it says that the content is "", not NULL. In the meantime, since libxml doesn't abort on OOM errors (as libvirt does), it could also be possible that it's returning NULL due to OOM. So using anecdotal evidence acquired so far, one *could* surmise that any time libvirt gets a NULL return from xmlNodeGetContent(), it is indeed an OOM error. The purist in me thinks that isn't right, though - I took a quick look at the libxml code and saw cases where it returns NULL that don't seem related to OOM, but rather to the type of node or something. But being an outsider and not wanting to learn any more than necessary about the internals of libxml, I'm not sure if any of those cases even apply to libvirt's simple use of xmlNodeGetContent(). So, in the end I just want to modify libvirt's dozen or so calls to xmlNodeGetContent() to consistently do the right thing, but first I want to learn the true answers to these questions: 1) Keeping in mind that we've already successfully parsed the XML, will calls to xmlNodeGetContent() in the simple cases as when libvirt calls it only return NULL for OOM, but not for any other reason? 2) If not, is the proper way to distinguish OOM in this case to call xmlGetLasterror(), and check if the domain is XML_FROM_MEMORY? 3) Aside from returning NULL in the case of errors, would it ever be possible for correct XML to return NULL as valid "node content", or is it always an error of some kind? Since libvirt now aborts on OOM, an OOM error could be handled in one place by a wrapper function around xmlNodeGetContent() (we already have such a function, currently a one-liner passthrough, and not called by everyone). But if there is any chance that any other libxml error could be encountered, then I suppose we really should be reporting those without aborting, and then still checking for NULL on return from the wrapper function (presumably by just logging the contents of "message" from the xmlErrorPtr returned from xmlGetLastError().

2 2

[PATCH v4 0/3] tpm: Fix default choices for CRB and SPAPR dev models
by Stefan Berger 08 Jul '20

08 Jul '20

From: Stefan Berger <stefanb(a)linux.ibm.com> This series of patches adds an additional check for the SPAPR device model that prevents the choice of a TPM 1.2 backend and chooses a TPM 2 as default. Also CRB now chooses a TPM 2 as default since TPM 1.2 wouldn't work with it, either. Stefan Stefan Berger (3): qemu: Move setting of TPM default to post parse function qemu: Set SPAPR TPM default to 2.0 and prevent 1.2 choice qemu: Choose TPM 2 for backend as default for CRB interface src/qemu/qemu_domain.c | 12 +++++++++--- src/qemu/qemu_validate.c | 10 ++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) -- 2.17.1

3 5

[PATCH v3 0/2] tpm: Prevent choice of TPM 1.2 backend for SPAPR
by Stefan Berger 08 Jul '20

08 Jul '20

From: Stefan Berger <stefanb(a)linux.ibm.com> This series of patches adds an additional check for the SPAPR device model that prevents the choice of a TPM 1.2 backend. Stefan Stefan Berger (2): qemu: Move setting of TPM default to post parse function conf: Set SPAPR TPM default to 2.0 and prevent 1.2 choice src/qemu/qemu_domain.c | 11 ++++++++--- src/qemu/qemu_validate.c | 10 ++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) -- 2.17.1

4 8

[PATCH] conf: Set SPAPR TPM default to 2.0 and prevent 1.2 choice
by Stefan Berger 08 Jul '20

08 Jul '20

From: Stefan Berger <stefanb(a)linux.ibm.com> The firmware (SLOF) on QEMU for ppc64 does not support TPM 1.2, so prevent the choice of TPM 1.2 when the SPAPR device model is chosen and use a default of '2.0' (TPM 2) for the backend. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_validate.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index bd7590a00a..f4d71aebf5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3645,8 +3645,12 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm, virQEMUCapsFlags flag; /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */ - if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT) - tpm->version = VIR_DOMAIN_TPM_VERSION_1_2; + if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT) { + if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR) + tpm->version = VIR_DOMAIN_TPM_VERSION_2_0; + else + tpm->version = VIR_DOMAIN_TPM_VERSION_1_2; + } switch (tpm->version) { case VIR_DOMAIN_TPM_VERSION_1_2: @@ -3658,6 +3662,12 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm, virDomainTPMModelTypeToString(tpm->model)); return -1; } + /* TPM 1.2 + SPAPR do not work with any 'type' (backend) */ + if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("TPM 1.2 is not supported with the SPAPR device model")); + return -1; + } break; case VIR_DOMAIN_TPM_VERSION_2_0: case VIR_DOMAIN_TPM_VERSION_DEFAULT: -- 2.17.1

3 5

[PATCH] domain_conf: Replace the name string with 'vcpu' if it is 'vcpus'
by Yi Wang 08 Jul '20

08 Jul '20

From: Liao Pingfang <liao.pingfang(a)zte.com.cn> If the name is 'vcpus', we will get 'vcpussched' instead of 'vcpusched' in the error message as following: ... 19155 : vcpussched attributes 'vcpus' must not overlap So we use 'vcpu' to replace 'vcpus'. Signed-off-by: Liao Pingfang <liao.pingfang(a)zte.com.cn> --- 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 0c883cd..5dcc836 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20050,7 +20050,7 @@ virDomainThreadSchedParseHelper(xmlNodePtr node, if (sched->policy != VIR_PROC_POLICY_NONE) { virReportError(VIR_ERR_XML_DETAIL, _("%ssched attributes 'vcpus' must not overlap"), - name); + STREQ(name, "vcpus") ? "vcpu" : name); return -1; } -- 2.9.5

3 2

[PATCH] conf: Set SPAPR TPM default to 2.0 and prevent 1.2 choice
by Stefan Berger 08 Jul '20

08 Jul '20

From: Stefan Berger <stefanb(a)linux.ibm.com> The firmware (SLOF) on QEMU for ppc64 does not support TPM 1.2, so prevent the choice of TPM 1.2 when the SPAPR device model is chosen and use a default of '2.0' (TPM 2) for the emulator. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/conf/domain_conf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2f4528d336..749d135f96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13633,7 +13633,10 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, version = virXMLPropString(backends[0], "version"); if (!version) { - def->version = VIR_DOMAIN_TPM_VERSION_DEFAULT; + if (def->model == VIR_DOMAIN_TPM_MODEL_SPAPR) + def->version = VIR_DOMAIN_TPM_VERSION_2_0; + else + def->version = VIR_DOMAIN_TPM_VERSION_DEFAULT; } else { if ((def->version = virDomainTPMVersionTypeFromString(version)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -13641,6 +13644,12 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, version); goto error; } + if (def->version == VIR_DOMAIN_TPM_VERSION_1_2 && + def->model == VIR_DOMAIN_TPM_MODEL_SPAPR) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("TPM 1.2 is not supported with the SPAPR device model")); + goto error; + } } switch (def->type) { -- 2.17.1

3 3

[PATCH] qemuBuildNumaCommandLine: Fix @masterInitiator check
by Michal Privoznik 08 Jul '20

08 Jul '20

A few commits ago, in aeecbc87b73, I've implemented command line generation for ACPI HMAT. For this, we need to know if at least one guest NUMA node has vCPUs. This is tracked in @masterInitiator variable, which is initialized to -1, then we iterate through guest NUMA nodes and break the loop if we find a node with a vCPU. After the loop, if masterInitiator is still negative then no NUMA node has a vCPU and we error out. But this exact check was missing comparison for negativeness. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under oops and trivial rules. src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7f215b4cc6..f06a2f2754 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7312,7 +7312,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, } } - if (masterInitiator) { + if (masterInitiator < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("At least one NUMA node has to have CPUs")); goto cleanup; -- 2.26.2

1 0

[PATCH 00/32] always use g_auto() for virBuffer and virFirewall objects
by Laine Stump 08 Jul '20

08 Jul '20

Like most other things I do, this started as a distraction from something else. I noticed that a function that took a virBufferPtr as an argument was clearing that buffer on error, but most (but *not all*) of its callers (which were the creators/owners of said virBuffer) were already clearing the buffer object on error anyway. Here's the original patch resulting from my seeing this in one place: https://www.redhat.com/archives/libvir-list/2020-June/msg01163.html In the example I saw, eliminating the extra clearing of the virBuffer in the subordinate function would simplify the error-cleanup code for that function, but it turned out the calling function *wasn't* clearing the virBuffer when an error occurred. Looking further, I saw this same pattern occurred in other places in the code - a function would create a new buffer (with "virBuffer buf = VIR_BUFFER_INITIALIZER;"), and clear/free that buffer when it was finished *unless there was an error*, in which case some functions would properly clear the buffer, and some would just return, I guess assuming the caller that generated the error had cleared the buffer. This not only makes the error cleanup logic in subordinate functions messier, it seems philosophically wrong to me, it also sounds like a memory leak just waiting to happen. So I decided that the way it should more properly work is this: 1) all virBuffers should be declared with g_auto(virBuffer), so that they are automatically cleared (with virBufferFreeAndReset()) when that toplevel function declaring/initializing the buffer returns to its caller. 2) subordinate functions called with the virBuffer object as an arg should just leave the buffer in whatever state it was when the error occurred. Since those functions don't use the virBuffer after the error happens, and the caller doesn't look at anything in the virBuffer to determine an error has occurred, this is completely safe. (obvious exceptions to (2) are of course those functions whose main intent is in fact to consume the virBuffer, e.g. virBufferContentAndReset(), and virCommandAddArgBuffer()) Patches 01 - 15 handle part (1) - *all* declarations of virBuffer as an automatic are changed to g_auto(virBuffer), and any virBufferFreeAndReset() calls in those same functions are removed. (I have it split into so many patches because virBuffer is used all over the place, and I figured it would make it easier to backport just one part of the entire set if needed when backported some unrelated bugfix that only touched one of the many directories represented here. I would happily squash together any group of patches anyone wants, however). Patches 16 and 17 fix a couple "one-off" anomolies in the code related to virBuffers. Patch 18 then takes care of point (2) above, by removing any extraneous virBufferFreeAndReset() calls in subordinate functions that are no longer necessary due to the guarantee that the toplevel will cleanup after error. Patches 19-30 just eliminate any labels (and associated "ret" variables and "goto's) that have been rendered pointless by removal of virBufferFreeAndReset(). Finally Patches 31 and 32 convert all usages of virFirewall to use g_autoptr(). They are included in this same set because virFirewall objects are often declared right next to virBuffer objects, so doing those patches in a different order would have caused merge conflicts.. NB: In many of the cases where "virBuffer" was changed to "g_auto(virBuffer)", it doesn't actually eliminate any code from the function, due to the function *always* calling virBufferContentAndReset() anyway. I considered not changing those cases, but in the ended decided it was better to add g_auto() even in those cases for two reasons: 1) consistency makes verification easier, and means someone a year from now won't come up with the same idea and waste time verifying all those cases of virBuffer don't need g_auto(). 2) if those functions ever change to have an alternate return that doesn't explicitly call virBufferContentAndReset(), they will still be safe. 3) the extra overhead is very minimal; a small price to pay for (1) and (2) NB2: these patches aren't just academic code churning; they have fixed some actual (well, theoretically actual) memory leaks, I just haven't taken the time to try and track all of them down or document them, because they only occur in error cases which will likely never happen. One example from my notes: virStoragePoolSaveState calls virStoragePoolDefFormatBuf which calls virStoragePoolSourceFormat, which errors, returns virStoragePoolDefFormatBuf, returns virStoragePoolSaveState returns without freeing virBuffer Laine Stump (32): bhyve: use g_auto() for all virBuffers esx: use g_auto() for all virBuffers hyperv: use g_auto() for all virBuffers libxl: use g_auto() for all virBuffers lxc: use g_auto() for all virBuffers qemu: use g_auto() for all virBuffers tests: use g_auto for all virBuffers tools: use g_auto() for all virBuffers conf: use g_auto() for all virBuffers util: use g_auto() for all virBuffers cpu: use g_auto() for all virBuffers rpc: use g_auto() for all virBuffers nwfilter: use g_auto() for all virBuffers network: use g_auto() for all virBuffers use g_auto() for all remaining non-g_auto() virBuffers qemu: remove unnecessary virBufferFreeAndReset() after virCommandAddArgBuffer() conf: consistently check for error when calling virSysinfoFormat() remove redundant calls to virBufferFreeAndReset() libxml: eliminate extra copy of string bhyve: eliminate unnecessary labels conf: eliminate unnecessary labels libxl: eliminate unnecessary labels util: eliminate unnecessary labels tests: eliminate unnecessary labels tools: eliminate unnecessary labels network: eliminate unnecessary labels lxc: eliminate unnecessary labels esx: eliminate unnecessary labels nwfilter: eliminate unnecessary labels storage: eliminate unnecessary labels use g_autoptr() for all usages of virFirewallNew/Free eliminate unnecessary labels and ret variables src/bhyve/bhyve_command.c | 40 +++--- src/bhyve/bhyve_driver.c | 4 +- src/conf/capabilities.c | 13 +- src/conf/checkpoint_conf.c | 11 +- src/conf/cpu_conf.c | 27 ++-- src/conf/domain_addr.c | 2 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 105 +++++++------- src/conf/interface_conf.c | 7 +- src/conf/network_conf.c | 8 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 12 +- src/conf/secret_conf.c | 8 +- src/conf/snapshot_conf.c | 14 +- src/conf/storage_capabilities.c | 6 +- src/conf/storage_conf.c | 28 ++-- src/conf/virnetworkobj.c | 10 +- src/conf/virnetworkportdef.c | 6 +- src/conf/virnwfilterbindingdef.c | 6 +- src/conf/virnwfilterbindingobj.c | 6 +- src/conf/virsavecookie.c | 8 +- src/cpu/cpu_map.c | 2 +- src/cpu/cpu_x86.c | 6 +- src/esx/esx_driver.c | 19 +-- src/esx/esx_util.c | 4 +- src/esx/esx_vi.c | 28 ++-- src/esx/esx_vi_methods.c | 6 +- src/hyperv/hyperv_driver.c | 34 +++-- src/hyperv/hyperv_wmi.c | 11 +- src/hypervisor/domain_driver.c | 7 +- src/libxl/libxl_conf.c | 19 +-- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.c | 2 +- src/libxl/xen_common.c | 28 ++-- src/libxl/xen_xl.c | 45 ++---- src/libxl/xen_xm.c | 10 +- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_container.c | 4 +- src/lxc/lxc_controller.c | 12 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_fuse.c | 3 +- src/network/bridge_driver.c | 25 ++-- src/network/bridge_driver_linux.c | 36 ++--- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 160 +++++++++------------- src/nwfilter/nwfilter_gentech_driver.c | 6 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_driver.c | 5 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 5 +- src/qemu/qemu_dbus.c | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration_cookie.c | 6 +- src/qemu/qemu_monitor.c | 2 +- src/rpc/virnetclient.c | 4 +- src/rpc/virnetlibsshsession.c | 7 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 2 +- src/security/virt-aa-helper.c | 4 +- src/storage/storage_backend_rbd.c | 7 +- src/storage/storage_util.c | 14 +- src/util/virbitmap.c | 4 +- src/util/vircommand.c | 3 +- src/util/virconf.c | 5 +- src/util/virdnsmasq.c | 6 +- src/util/virebtables.c | 24 +--- src/util/virfile.c | 2 +- src/util/virfilecache.c | 2 +- src/util/virfirewall.c | 2 +- src/util/viriptables.c | 14 +- src/util/virlog.c | 5 +- src/util/virnetdevip.c | 3 +- src/util/virpidfile.c | 2 +- src/util/virqemu.c | 11 +- src/util/virresctrl.c | 10 +- src/util/virsocketaddr.c | 25 ++-- src/util/virstoragefile.c | 2 +- src/util/virstring.c | 4 +- src/util/virsysinfo.c | 5 +- src/util/virsystemd.c | 4 +- src/util/viruri.c | 2 +- src/util/virxml.c | 12 +- src/vmx/vmx.c | 5 +- src/vz/vz_driver.c | 4 +- tests/commandtest.c | 3 +- tests/cputest.c | 2 +- tests/networkxml2firewalltest.c | 3 +- tests/nodedevmdevctltest.c | 6 +- tests/nwfilterebiptablestest.c | 21 +-- tests/nwfilterxml2firewalltest.c | 3 +- tests/qemublocktest.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemumigparamstest.c | 6 +- tests/qemumonitorjsontest.c | 9 +- tests/qemumonitortestutils.c | 2 +- tests/testutils.c | 2 +- tests/vboxsnapshotxmltest.c | 3 +- tests/virbuftest.c | 58 ++++---- tests/vircgrouptest.c | 3 +- tests/virfirewalltest.c | 80 +++-------- tests/virhostcputest.c | 3 +- tests/virkmodtest.c | 4 +- tests/virnetdevbandwidthtest.c | 3 +- tools/virsh-checkpoint.c | 3 +- tools/virsh-domain-monitor.c | 3 +- tools/virsh-domain.c | 58 ++++---- tools/virsh-pool.c | 19 ++- tools/virsh-secret.c | 2 +- tools/virsh-snapshot.c | 3 +- tools/virsh-volume.c | 3 +- tools/vsh-table.c | 2 +- tools/vsh.c | 15 +- 116 files changed, 505 insertions(+), 853 deletions(-) -- 2.25.4

2 65

[PATCH] qemuBuildMemoryBackendProps: Use boolean type for 'pmem' property
by Peter Krempa 08 Jul '20

08 Jul '20

Commit 82576d8f35e used a string "on" to enable the 'pmem' property. This is okay for the command line visitor, but the property is declared as boolean in qemu and thus it will not work when using QMP. Modify the type to boolean. This changes the command line, but fortunately the command line visitor in qemu parses both 'yes' and 'on' as true for the property. https://bugzilla.redhat.com/show_bug.cgi?id=1854684 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c4c77cf8c..c32db06e34 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3187,7 +3187,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, "with this QEMU binary")); return -1; } - if (virJSONValueObjectAdd(props, "s:pmem", "on", NULL) < 0) + if (virJSONValueObjectAdd(props, "b:pmem", true, NULL) < 0) return -1; } diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 5dfba9b50a..00a78baa92 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -share=no,size=536870912,pmem=on \ +share=no,size=536870912,pmem=yes \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -- 2.26.2

2 2

[libvirt PATCH v2 0/2] Use the default capabilities cache lookup rather than an arch based lookup
by Erik Skultety 08 Jul '20

08 Jul '20

https://bugzilla.redhat.com/show_bug.cgi?id=1852311 Since v1: - dropped virQEMUCapsCacheLookupByArch since after patch 1 there was no further usage - dropped virQEMUCapsCompareArch since virQEMUCapsCacheLookupByArch was the only caller pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/164239584 Erik Skultety (2): qemu: Use virQEMUCapsCacheLookupDefault instead of lookup by arch qemu: capabilities: Drop the virQEMUCapsCacheLookupByArch function src/qemu/qemu_capabilities.c | 63 ------------------------------------ src/qemu/qemu_capabilities.h | 2 -- src/qemu/qemu_driver.c | 6 ++-- 3 files changed, 4 insertions(+), 67 deletions(-) -- 2.26.2

2 3

[PATCH] docs/index.html.in: Add knowledge base link and description on index page
by Jianan Gao 08 Jul '20

08 Jul '20

Add link and description of libvirt knowledge base to make it easier for users and testers to understand libvirt. Signed-off-by: Jianan Gao <jgao(a)redhat.com> --- docs/index.html.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/index.html.in b/docs/index.html.in index 26e8406917..586defff54 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -63,6 +63,9 @@ <a href="formatbackup.html">backup jobs</a></dd> <dt><a href="http://wiki.libvirt.org">Wiki</a></dt> <dd>Read further community contributed content</dd> + + <dt><a href="https://libvirt.org/kbase.html">Knowledge base</a></dt> + <dd>Learn more about libvirt through knowledge base</dd> </dl> </div> -- 2.21.3

2 1

[PATCH 00/13] Allow HMAT configuration
by Michal Privoznik 08 Jul '20

08 Jul '20

Heterogeneous Memory Attribute Table describes links between NUMA nodes (what's the bandwidth and/or latency between two nodes and/or their side caches). This enables guests to fine tune their performance. Michal Prívozník (13): qemuxml2xmltest: Add "numatune-distance" test case conf: Move and rename virDomainParseScaledValue() numa_conf: Drop CPU from name of two functions qemu_command: Rename qemuBuildNumaArgStr() qemuBuildMachineCommandLine: Drop needless check numa_conf: Make virDomainNumaSetNodeCpumask() return void Allow NUMA nodes without vCPUs conf: Parse and format HMAT conf: Validate NUMA HMAT configuration numa: expose HMAT APIs qemu: Introduce QEMU_CAPS_NUMA_HMAT capability qemu: Build HMAT command line news: Document HMAT addition NEWS.rst | 5 + docs/formatdomain.html.in | 90 +++ docs/schemas/cputypes.rng | 118 +++- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 140 +--- src/conf/numa_conf.c | 664 ++++++++++++++++-- src/conf/numa_conf.h | 72 +- src/libvirt_private.syms | 13 + src/libxl/xen_xl.c | 14 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 226 +++++- src/qemu/qemu_validate.c | 22 +- src/util/virxml.c | 72 ++ src/util/virxml.h | 8 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../numatune-hmat.x86_64-latest.args | 53 ++ tests/qemuxml2argvdata/numatune-hmat.xml | 52 ++ tests/qemuxml2argvdata/numatune-no-vcpu.args | 33 + tests/qemuxml2argvdata/numatune-no-vcpu.xml | 42 ++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmloutdata/numatune-distances.xml | 96 +++ tests/qemuxml2xmloutdata/numatune-hmat.xml | 1 + tests/qemuxml2xmloutdata/numatune-no-vcpu.xml | 1 + tests/qemuxml2xmltest.c | 3 + 29 files changed, 1536 insertions(+), 201 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-hmat.xml create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.xml create mode 100644 tests/qemuxml2xmloutdata/numatune-distances.xml create mode 120000 tests/qemuxml2xmloutdata/numatune-hmat.xml create mode 120000 tests/qemuxml2xmloutdata/numatune-no-vcpu.xml -- 2.26.2

3 31

[PATCH v2 0/4] backup: Allow configuring incremental backup per-disk individually
by Peter Krempa 07 Jul '20

07 Jul '20

This series addresses some of the testing issues raised in the review of 4/4. Patches 1-3 are new adding testing of virDomainBackupAlignDisks. Peter Krempa (4): backupxml2xmltest: Remove output symlink of 'backup-pull-internal-invalid' virDomainBackupDiskDefFormat: Format internal disk state only when valid backupxml2xmltest: Call 'virDomainBackupAlignDisks' before formatting output backup: Allow configuring incremental backup per-disk individually docs/formatbackup.rst | 11 ++++ docs/schemas/domainbackup.rng | 23 +++++++++ src/conf/backup_conf.c | 51 ++++++++++++++++++- src/conf/backup_conf.h | 11 ++++ tests/domainbackupxml2xmlin/backup-pull.xml | 12 +++++ .../backup-pull-encrypted.xml | 7 +-- .../backup-pull-internal-invalid.xml | 38 +++++++++++++- .../backup-pull-seclabel.xml | 5 +- tests/domainbackupxml2xmlout/backup-pull.xml | 15 +++++- .../backup-push-encrypted.xml | 7 +-- .../backup-push-seclabel.xml | 5 +- tests/domainbackupxml2xmlout/backup-push.xml | 3 +- tests/domainbackupxml2xmlout/empty.xml | 8 ++- tests/genericxml2xmltest.c | 36 +++++++++++++ 14 files changed, 216 insertions(+), 16 deletions(-) mode change 120000 => 100644 tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml -- 2.26.2

2 8

[PATCH 00/24] qemu: Incremental backup and TLS handling fixes
by Peter Krempa 07 Jul '20

07 Jul '20

This series consists of multiple parts fixing the following bugs. Some of them depend on previous so I'm sending it as one to prevent conflicts. - Patches 1 - 11: https://bugzilla.redhat.com/show_bug.cgi?id=1602328 [RFE] Add support for encrypted TLS client keys for disks - Patch 12: https://bugzilla.redhat.com/show_bug.cgi?id=1840053 [incremental_backup] cannot do FULL backup for a READONLY disk - Patches 13 - 14: https://bugzilla.redhat.com/show_bug.cgi?id=1829829 [incremental backup] Creating incremental backup that includes a new VM disk that requires full backup is impossible - Patch 15: https://bugzilla.redhat.com/show_bug.cgi?id=1799010 incremental-backup: RFE: Handle backup bitmaps during virDomainBlockPull - Patches 16 - 24: https://bugzilla.redhat.com/show_bug.cgi?id=1822631 [incremental backup] RFE: Support TLS for NBD connections for pull mode backup Peter Krempa (24): qemu: domain: Introduce helper for always fetching virStorageSource private data qemuDomainDiskHasEncryptionSecret: unexport qemu.conf: Remove misleading mention of 'migrate_tls' qemu: conf: Move 'nbd' and 'vxhs' tls config variables together with rest of tls setup virQEMUDriverConfigLoadSpecificTLSEntry: Move fetching of 'chardev_tls' above macro virQEMUDriverConfigLoadSpecificTLSEntry: Split up fetching of server-only config options qemu: domain: Add infrastructure passing in TLS key's decryption key via 'secret' qemu block: Add internals for handling 'secret' corresponding to TLS key qemu: conf: Add configuration of TLS key encryption for 'vxhs' and 'nbd' disks qemu: domain: Setup secret for TLS key for nbd/vxhs disks tests: qemuxml2argv: Test encrypted TLS key for nbd/vxhs disks conf: backup: Don't explicitly forbid backup of read-only disk docs: backup: Convert XML documentation to RST backup: Allow configuring incremental backup per-disk individually qemu: backup: integrate with blockpull docs: checkpoint: Convert XML documentation to RST conf: checkpoint: Add a flag storing whether disk 'size' is valid qemu: checkpoint: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE checkpoint: Mention that VIR_DOMAIN_CHECKPOINT_XML_SIZE is expensive and stale testCompareBackupXML: Add infrastructure for testing internal fields conf: backup: Store 'tlsAlias' and 'tlsSecretAlias' as internals of a backup qemu: conf: Add configuration of TLS environment for NBD transport of pull-backups conf: backup: Add 'tls' attribute for 'server' element qemu: backup: Setup TLS environment for pull-mode backup jobs docs/formatbackup.html.in | 191 ----------------- docs/formatbackup.rst | 164 +++++++++++++++ docs/formatcheckpoint.html.in | 198 ------------------ docs/formatcheckpoint.rst | 166 +++++++++++++++ docs/schemas/domainbackup.rng | 25 ++- src/conf/backup_conf.c | 123 ++++++++++- src/conf/backup_conf.h | 17 ++ src/conf/checkpoint_conf.c | 2 +- src/conf/checkpoint_conf.h | 1 + src/libvirt-domain-checkpoint.c | 3 +- src/qemu/libvirtd_qemu.aug | 19 +- src/qemu/qemu.conf | 63 +++++- src/qemu/qemu_backup.c | 80 ++++++- src/qemu/qemu_block.c | 12 ++ src/qemu/qemu_block.h | 2 + src/qemu/qemu_blockjob.c | 37 ++++ src/qemu/qemu_checkpoint.c | 143 ++++++++++++- src/qemu/qemu_command.c | 11 +- src/qemu/qemu_conf.c | 57 +++-- src/qemu/qemu_conf.h | 19 +- src/qemu/qemu_domain.c | 66 ++++-- src/qemu/qemu_domain.h | 8 +- src/qemu/test_libvirtd_qemu.aug.in | 5 + .../backup-pull-encrypted.xml | 2 +- .../backup-pull-internal-invalid.xml | 36 ++++ tests/domainbackupxml2xmlin/backup-pull.xml | 12 ++ .../backup-pull-encrypted.xml | 2 +- .../backup-pull-internal-invalid.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 12 ++ tests/genericxml2xmltest.c | 32 ++- tests/qemudomaincheckpointxml2xmltest.c | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + .../disk-network-tlsx509.x86_64-2.12.0.args | 15 +- .../disk-network-tlsx509.x86_64-latest.args | 18 +- tests/qemuxml2argvtest.c | 2 + 35 files changed, 1079 insertions(+), 467 deletions(-) delete mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatbackup.rst delete mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/formatcheckpoint.rst create mode 100644 tests/domainbackupxml2xmlin/backup-pull-internal-invalid.xml create mode 120000 tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml -- 2.26.2

4 55

[libvirt PATCH] util: fix accessibility check for hook directory
by Ján Tomko 07 Jul '20

07 Jul '20

virFileIsAccessible does not return true on accessible directories. Check whether it set EISDIR and only then assume the directory is inaccessible. Return 0 (not found) instead of 1 (found), since the bridge driver taints the network based on this return value, not whether the hook actually ran. Remove the bogus check from virHookCall, since it already checks the virHooksFound bitmap that was filled before by virHookCheck. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: 7fa7f7eeb6e969e002845928e155914da2fc8cd0 Closes: https://gitlab.com/libvirt/libvirt/-/issues/47 --- src/util/virhook.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index d1ac518c24..119ad1aae6 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -172,9 +172,9 @@ virHookCheck(int no, const char *driver) dir_path = g_strdup_printf("%s.d", path); - if (!virFileIsExecutable(dir_path)) { + if (!virFileIsExecutable(dir_path) && errno != EISDIR) { VIR_DEBUG("Hook dir %s is not accessible", dir_path); - return 1; + return 0; } if ((ret = virDirOpenIfExists(&dir, dir_path)) < 0) @@ -422,9 +422,6 @@ virHookCall(int driver, dir_path = g_strdup_printf("%s.d", path); - if (!virFileIsExecutable(dir_path)) - return script_ret; - if ((ret = virDirOpenIfExists(&dir, dir_path)) < 0) return -1; -- 2.25.4

2 1

[libvirt PATCH v2 0/2] docs: Point to pkg.go.dev instead of godoc.org
by Andrea Bolognani 07 Jul '20

07 Jul '20

Changes from [v1]: * fix a few instances where we were still using github.com instead of libvirt.org for Go imports; * replace all uses of godoc.org, not just a subset. [v1] https://www.redhat.com/archives/libvir-list/2020-July/msg00270.html Andrea Bolognani (2): docs: Use libvirt.org namespace for Go bindings docs: Point to pkg.go.dev instead of godoc.org docs/bindings.html.in | 2 +- docs/docs.html.in | 2 +- docs/downloads.html.in | 4 ++-- docs/libvirt-go-xml.rst | 2 +- docs/libvirt-go.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) -- 2.25.4

2 3

[libvirt PATCH] docs: Point to pkg.go.dev instead of godoc.org
by Andrea Bolognani 07 Jul '20

07 Jul '20

The former is the new recommended frontend for browsing Go API documentation online. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/libvirt-go-xml.rst | 2 +- docs/libvirt-go.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/libvirt-go-xml.rst b/docs/libvirt-go-xml.rst index ee3b878068..995fdd2b07 100644 --- a/docs/libvirt-go-xml.rst +++ b/docs/libvirt-go-xml.rst @@ -7,4 +7,4 @@ annotated Go struct definitions for parsing (and formatting) XML documents used with libvirt APIs. For details of Go specific behaviour consult the -`Go package documentation <https://godoc.org/libvirt.org/libvirt-go-xml>`__ +`Go package documentation <https://pkg.go.dev/libvirt.org/libvirt-go-xml>`__. diff --git a/docs/libvirt-go.rst b/docs/libvirt-go.rst index 6ec5c0c123..f2d3f80fb2 100644 --- a/docs/libvirt-go.rst +++ b/docs/libvirt-go.rst @@ -10,4 +10,4 @@ concepts to Go, so the native API documentation should serve as a reference for most behaviour. For details of Go specific behaviour consult the -`Go package documentation <https://godoc.org/libvirt.org/libvirt-go>`__ +`Go package documentation <https://pkg.go.dev/libvirt.org/libvirt-go>`__. -- 2.25.4

2 1

[question]qemu: any plan to support ivshmem-plain migration?
by Wangxin (Alexander, Cloud Infrastructure Service Product Dept.) 07 Jul '20

07 Jul '20

Hi, Martin Ivshmem-plain device support property role with 'master'(master=on) or 'peer'(master=off, default mode), which controls to copy the shared memory on migration to the destination host or not. https://git.qemu.org/?p=qemu.git;a=blob;f=docs/system/ivshmem.rst;h=b03a48a… And libvirt does not support to configure 'role' yet, see msg https://www.redhat.com/archives/libvir-list/2016-August/msg00591.html Qemu use 'master=off' as ivshmem-plain default property, the guest create by libvirt api can't be migrated now. Do you have an plan to support the property 'role' and ivshmem-palin migration? Regards, Xin

2 2

[PATCH] news.html: Add 3 new features
by Yanqiu Zhang 04 Jul '20

04 Jul '20

Add 'virtio packed' in 6.3.0, 'virDomainGetHostnameFlags' and 'Panic Crashloaded event' for 6.1.0. Signed-off-by: Yanqiu Zhang <yanqzhan(a)redhat.com> --- NEWS.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 0e9822cd03..eb72b1be00 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -173,6 +173,11 @@ v6.3.0 (2020-05-05) (Cache Flush on Privilege Change), SBBC (Speculation Barrier Bounds Checking) and IBS (Indirect Branch Speculation). + * qemu: Add support for virtio packed option + + The attribute ``packed`` controls if QEMU should try to use packed + virtqueues. Possible values are ``on`` or ``off``. + * **Improvements** * qemu: Allow checkpoint redefine for offline VMs @@ -365,6 +370,17 @@ v6.1.0 (2020-03-03) This device, available starting from QEMU 5.0, is limited to pSeries guests. + * qemu: support Panic Crashloaded event handling + + Pvpanic device supports bit 1 as crashloaded event, it means that guest + actually panicked and run kexec to handle error by guest side. + + * qemu: Implement virDomainGetHostnameFlags + + The --source argument can be used to specify what data source to use for + the domain hostnames. Currently, except 'agent', libvirt could also use + 'lease' information from dnsmasq to get current hostname. + * **Improvements** * qemu: Image format probing is allowed in certain cases -- 2.25.4

2 1

[PATCH 0/9] Allow sparse streams for block devices
by Michal Privoznik 04 Jul '20

04 Jul '20

The way our sparse streams are implemented is: 1) user facing APIs (virStreamSparseRecvAll() and virStreamSparseSendAll()) take callbacks as arguments. These callbacks read/write data or determine if there is a hole in the underlying file and big it is. 2) libvirtd has something similar - virFDStream, except here the functions for read/write of data and hole handling are called directly. Sparse streams were originally implemented for regular files only => both ends of stream has to be regular files. This limitation exists because the callbacks from 1) (implemented in virsh for vol-download/vol-upload commands) and also from 2) (which is basically the same code) uses lseek(..., SEEK_DATA) and/or lseek(..., SEEK_HOLE) to get map of allocated file blocks. They also take a shortcut (valid for regular files) - when one side of the stream is asked to create a hole it merely lseek() + ftruncate(). For regular files this creates a hole and later, when somebody reads it all they get is zeroes. Neither of these two approaches work for block devices. Block devices have no notion of data/hole sections [1], nor can they be truncated. What we can do instead is read data from the block device and check if its full of zeroes. And for "creating a hole" we just write zeroes of requested size. There is a follow up patch that I am working on: this implementation I'm posting here has one disadvantage: after some blocks are read from the block device and they are found to contain data, the whole buffer is freed only to be read again. For instance, when uploading volume, virshStreamInData() is called at the beginning to check if the file containing data to upload doesn't start with a hole. If the file is a block device, then virFileInDataDetectZeroes() is called which reads 1MiB from it, finds (say) data and throws the buffer away. Then virshStreamSource() is called, which reads the 1MiB buffer again. The patch is still under development though. 1: Okay, SSDs keep list of free blocks for wear levelling, but the list is kept private by the SSD controller and I am not aware of any way of getting it. Michal Prívozník (9): libvirt-storage: Document volume upload/download stream format virstring: Introduce virStringIsNull() virfile: Introduce virFileInDataDetectZeroes() virsh: Pass virshStreamCallbackDataPtr to virshStreamSink() and virshStreamSkip() virsh: Track if vol-upload or vol-download work over a block device virshStreamSkip: Emulate skip for block devices virfdstream: Allow sparse stream vol-download virshStreamInData: Handle block devices virfdstream: Emulate skip for block devices src/libvirt-storage.c | 8 +++-- src/libvirt_private.syms | 2 ++ src/util/virfdstream.c | 74 ++++++++++++++++++++++++++++++---------- src/util/virfile.c | 67 ++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 4 +++ src/util/virstring.c | 40 ++++++++++++++++++++++ src/util/virstring.h | 2 ++ tools/virsh-util.c | 52 ++++++++++++++++++++++------ tools/virsh-util.h | 1 + tools/virsh-volume.c | 20 ++++++++++- 10 files changed, 238 insertions(+), 32 deletions(-) -- 2.26.2

4 19

[GSoC][PATCH] qemu_domainjob: removal of its dependency on other qemu-files
by Prathamesh Chavan 03 Jul '20

03 Jul '20

It was seen that `qemu_domain.h` file depended upon `qemu_migration_params.h` and `qmeu_monitor.h` as they were required by some qemu_domainjob stuctures. This dependency was removed by the introduction of a `void *privateData` pointer. This privateData pointer was handled using a structure of callback functions. Additionally, the patch also moves funcitons `qemuDomainObjPrivateXMLFormatJob` and `qemuDomainObjPrivateXMLParseJob` from `qemu_domain` and handles them using the callback structure of domain jobs. Signed-off-by: Prathamesh Chavan <pc44800(a)gmail.com> --- src/qemu/qemu_backup.c | 13 +- src/qemu/qemu_domain.c | 246 +------------------- src/qemu/qemu_domainjob.c | 371 ++++++++++++++++++++++++++++--- src/qemu/qemu_domainjob.h | 62 ++++-- src/qemu/qemu_driver.c | 21 +- src/qemu/qemu_migration.c | 45 ++-- src/qemu/qemu_migration_cookie.c | 7 +- src/qemu/qemu_migration_params.c | 9 +- src/qemu/qemu_migration_params.h | 28 +++ src/qemu/qemu_process.c | 24 +- 10 files changed, 494 insertions(+), 332 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 8dc9d2504d..dc81d8d8de 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -528,17 +528,19 @@ qemuBackupJobTerminate(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr completedJobInfo; size_t i; qemuDomainJobInfoUpdateTime(priv->job.current); g_clear_pointer(&priv->job.completed, qemuDomainJobInfoFree); priv->job.completed = qemuDomainJobInfoCopy(priv->job.current); + completedJobInfo = priv->job.completed->privateData; - priv->job.completed->stats.backup.total = priv->backup->push_total; - priv->job.completed->stats.backup.transferred = priv->backup->push_transferred; - priv->job.completed->stats.backup.tmp_used = priv->backup->pull_tmp_used; - priv->job.completed->stats.backup.tmp_total = priv->backup->pull_tmp_total; + completedJobInfo->stats.backup.total = priv->backup->push_total; + completedJobInfo->stats.backup.transferred = priv->backup->push_transferred; + completedJobInfo->stats.backup.tmp_used = priv->backup->pull_tmp_used; + completedJobInfo->stats.backup.tmp_total = priv->backup->pull_tmp_total; priv->job.completed->status = jobstatus; priv->job.completed->errmsg = g_strdup(priv->backup->errmsg); @@ -997,7 +999,8 @@ qemuBackupGetJobInfoStats(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainJobInfoPtr jobInfo) { - qemuDomainBackupStats *stats = &jobInfo->stats.backup; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainBackupStats *stats = &jobInfoPriv->stats.backup; qemuDomainObjPrivatePtr priv = vm->privateData; qemuMonitorJobInfoPtr *blockjobs = NULL; size_t nblockjobs = 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c5b8d91f9a..d8328bb79a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2144,103 +2144,6 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf, virBufferAddLit(buf, "<prDaemon/>\n"); } - -static int -qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, - virStorageSourcePtr src, - virDomainXMLOptionPtr xmlopt) -{ - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - - virBufferAsprintf(&attrBuf, " type='%s' format='%s'", - virStorageTypeToString(src->type), - virStorageFileFormatTypeToString(src->format)); - - if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, - VIR_DOMAIN_DEF_FORMAT_STATUS, - false, false, xmlopt) < 0) - return -1; - - virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf); - - return 0; -} - - -static int -qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, - virDomainObjPtr vm) -{ - qemuDomainObjPrivatePtr priv = vm->privateData; - size_t i; - virDomainDiskDefPtr disk; - qemuDomainDiskPrivatePtr diskPriv; - - for (i = 0; i < vm->def->ndisks; i++) { - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - disk = vm->def->disks[i]; - diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - - virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'", - disk->dst, diskPriv->migrating ? "yes" : "no"); - - if (diskPriv->migrSource && - qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, - diskPriv->migrSource, - priv->driver->xmlopt) < 0) - return -1; - - virXMLFormatElement(buf, "disk", &attrBuf, &childBuf); - } - - return 0; -} - - -static int -qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, - virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv) -{ - g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - qemuDomainJob job = priv->job.active; - - if (!qemuDomainTrackJob(job)) - job = QEMU_JOB_NONE; - - if (job == QEMU_JOB_NONE && - priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) - return 0; - - virBufferAsprintf(&attrBuf, " type='%s' async='%s'", - qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); - - if (priv->job.phase) { - virBufferAsprintf(&attrBuf, " phase='%s'", - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, - priv->job.phase)); - } - - if (priv->job.asyncJob != QEMU_ASYNC_JOB_NONE) - virBufferAsprintf(&attrBuf, " flags='0x%lx'", priv->job.apiFlags); - - if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && - qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) - return -1; - - if (priv->job.migParams) - qemuMigrationParamsFormat(&childBuf, priv->job.migParams); - - virXMLFormatElement(buf, "job", &attrBuf, &childBuf); - - return 0; -} - - static bool qemuDomainHasSlirp(virDomainObjPtr vm) { @@ -2376,7 +2279,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, if (priv->lockState) virBufferAsprintf(buf, "<lockstate>%s</lockstate>\n", priv->lockState); - if (qemuDomainObjPrivateXMLFormatJob(buf, vm, priv) < 0) + if (priv->job.cb.formatJob(buf, vm, &priv->job) < 0) return -1; if (priv->fakeReboot) @@ -2876,151 +2779,6 @@ qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctxt, } -static int -qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, - xmlXPathContextPtr ctxt, - virDomainDiskDefPtr disk, - virDomainXMLOptionPtr xmlopt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt); - qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - g_autofree char *format = NULL; - g_autofree char *type = NULL; - g_autoptr(virStorageSource) migrSource = NULL; - xmlNodePtr sourceNode; - - ctxt->node = node; - - if (!(ctxt->node = virXPathNode("./migrationSource", ctxt))) - return 0; - - if (!(type = virXMLPropString(ctxt->node, "type"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing storage source type")); - return -1; - } - - if (!(format = virXMLPropString(ctxt->node, "format"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing storage source format")); - return -1; - } - - if (!(migrSource = virDomainStorageSourceParseBase(type, format, NULL))) - return -1; - - /* newer libvirt uses the <source> subelement instead of formatting the - * source directly into <migrationSource> */ - if ((sourceNode = virXPathNode("./source", ctxt))) - ctxt->node = sourceNode; - - if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, - VIR_DOMAIN_DEF_PARSE_STATUS, xmlopt) < 0) - return -1; - - diskPriv->migrSource = g_steal_pointer(&migrSource); - return 0; -} - - -static int -qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv, - xmlXPathContextPtr ctxt) -{ - g_autofree xmlNodePtr *nodes = NULL; - size_t i; - int n; - - if ((n = virXPathNodeSet("./disk[@migrating='yes']", ctxt, &nodes)) < 0) - return -1; - - if (n > 0) { - if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { - VIR_WARN("Found disks marked for migration but we were not " - "migrating"); - n = 0; - } - for (i = 0; i < n; i++) { - virDomainDiskDefPtr disk; - g_autofree char *dst = NULL; - - if ((dst = virXMLPropString(nodes[i], "dev")) && - (disk = virDomainDiskByTarget(vm->def, dst))) { - QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating = true; - - if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt, - disk, - priv->driver->xmlopt) < 0) - return -1; - } - } - } - - return 0; -} - - -static int -qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, - qemuDomainObjPrivatePtr priv, - xmlXPathContextPtr ctxt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt); - g_autofree char *tmp = NULL; - - if (!(ctxt->node = virXPathNode("./job[1]", ctxt))) - return 0; - - if ((tmp = virXPathString("string(@type)", ctxt))) { - int type; - - if ((type = qemuDomainJobTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job type %s"), tmp); - return -1; - } - VIR_FREE(tmp); - priv->job.active = type; - } - - if ((tmp = virXPathString("string(@async)", ctxt))) { - int async; - - if ((async = qemuDomainAsyncJobTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown async job type %s"), tmp); - return -1; - } - VIR_FREE(tmp); - priv->job.asyncJob = async; - - if ((tmp = virXPathString("string(@phase)", ctxt))) { - priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp); - if (priv->job.phase < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job phase %s"), tmp); - return -1; - } - VIR_FREE(tmp); - } - } - - if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) == -2) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); - return -1; - } - - if (qemuDomainObjPrivateXMLParseJobNBD(vm, priv, ctxt) < 0) - return -1; - - if (qemuMigrationParamsParse(ctxt, &priv->job.migParams) < 0) - return -1; - - return 0; -} - - static int qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr featuresNode, xmlXPathContextPtr ctxt, @@ -3180,7 +2938,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->lockState = virXPathString("string(./lockstate)", ctxt); - if (qemuDomainObjPrivateXMLParseJob(vm, priv, ctxt) < 0) + if (priv->job.cb.parseJob(vm, &priv->job, ctxt, priv->driver->xmlopt) < 0) goto error; priv->fakeReboot = virXPathBoolean("boolean(./fakereboot)", ctxt) == 1; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 7111acadda..5f59c9c61a 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -121,22 +121,58 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, return -1; } +static void +qemuJobInfoFreePrivateData(qemuDomainJobInfoPrivatePtr priv) +{ + g_free(&priv->stats); +} + +static void +qemuJobInfoFreePrivate(void *opaque) +{ + qemuDomainJobInfoPtr jobInfo = (qemuDomainJobInfoPtr) opaque; + qemuJobInfoFreePrivateData(jobInfo->privateData); +} void qemuDomainJobInfoFree(qemuDomainJobInfoPtr info) { + info->cb.freeJobInfoPrivate(info); g_free(info->errmsg); g_free(info); } +static void * +qemuDomainJobInfoPrivateAlloc(void) +{ + qemuDomainJobInfoPrivatePtr retPriv = g_new0(qemuDomainJobInfoPrivate, 1); + return (void *)retPriv; +} + +static qemuDomainJobInfoPtr +qemuDomainJobInfoAlloc(void) +{ + qemuDomainJobInfoPtr ret = g_new0(qemuDomainJobInfo, 1); + ret->cb.allocJobInfoPrivate = &qemuDomainJobInfoPrivateAlloc; + ret->cb.freeJobInfoPrivate = &qemuJobInfoFreePrivate; + ret->privateData = ret->cb.allocJobInfoPrivate(); + return ret; +} + +static void +qemuDomainCurrentJobInfoInit(qemuDomainJobObjPtr job) +{ + job->current = qemuDomainJobInfoAlloc(); + job->current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; +} qemuDomainJobInfoPtr qemuDomainJobInfoCopy(qemuDomainJobInfoPtr info) { - qemuDomainJobInfoPtr ret = g_new0(qemuDomainJobInfo, 1); + qemuDomainJobInfoPtr ret = qemuDomainJobInfoAlloc(); memcpy(ret, info, sizeof(*info)); - + memcpy(ret->privateData, info->privateData, sizeof(qemuDomainJobInfoPrivate)); ret->errmsg = g_strdup(info->errmsg); return ret; @@ -166,10 +202,43 @@ qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, } +static void * +qemuJobAllocPrivate(void) +{ + qemuDomainJobPrivatePtr priv; + if (VIR_ALLOC(priv) < 0) + return NULL; + return (void *)priv; +} + + +static void +qemuJobFreePrivateData(qemuDomainJobPrivatePtr priv) +{ + priv->spiceMigration = false; + priv->spiceMigrated = false; + priv->dumpCompleted = false; + qemuMigrationParamsFree(priv->migParams); + priv->migParams = NULL; +} + +static void +qemuJobFreePrivate(void *opaque) +{ + qemuDomainJobObjPtr job = (qemuDomainJobObjPtr) opaque; + qemuJobFreePrivateData(job->privateData); +} + + int qemuDomainObjInitJob(qemuDomainJobObjPtr job) { memset(job, 0, sizeof(*job)); + job->cb.allocJobPrivate = &qemuJobAllocPrivate; + job->cb.freeJobPrivate = &qemuJobFreePrivate; + job->cb.formatJob = &qemuDomainObjPrivateXMLFormatJob; + job->cb.parseJob = &qemuDomainObjPrivateXMLParseJob; + job->privateData = job->cb.allocJobPrivate(); if (virCondInit(&job->cond) < 0) return -1; @@ -213,13 +282,9 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObjPtr job) job->phase = 0; job->mask = QEMU_JOB_DEFAULT_MASK; job->abortJob = false; - job->spiceMigration = false; - job->spiceMigrated = false; - job->dumpCompleted = false; VIR_FREE(job->error); g_clear_pointer(&job->current, qemuDomainJobInfoFree); - qemuMigrationParamsFree(job->migParams); - job->migParams = NULL; + job->cb.freeJobPrivate(job); job->apiFlags = 0; } @@ -235,7 +300,7 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj, job->asyncJob = priv->job.asyncJob; job->asyncOwner = priv->job.asyncOwner; job->phase = priv->job.phase; - job->migParams = g_steal_pointer(&priv->job.migParams); + job->privateData = g_steal_pointer(&priv->job.privateData); job->apiFlags = priv->job.apiFlags; qemuDomainObjResetJob(&priv->job); @@ -285,6 +350,7 @@ int qemuDomainJobInfoUpdateDowntime(qemuDomainJobInfoPtr jobInfo) { unsigned long long now; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; if (!jobInfo->stopped) return 0; @@ -298,8 +364,8 @@ qemuDomainJobInfoUpdateDowntime(qemuDomainJobInfoPtr jobInfo) return 0; } - jobInfo->stats.mig.downtime = now - jobInfo->stopped; - jobInfo->stats.mig.downtime_set = true; + jobInfoPriv->stats.mig.downtime = now - jobInfo->stopped; + jobInfoPriv->stats.mig.downtime_set = true; return 0; } @@ -334,38 +400,39 @@ int qemuDomainJobInfoToInfo(qemuDomainJobInfoPtr jobInfo, virDomainJobInfoPtr info) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; info->type = qemuDomainJobStatusToType(jobInfo->status); info->timeElapsed = jobInfo->timeElapsed; switch (jobInfo->statsType) { case QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION: - info->memTotal = jobInfo->stats.mig.ram_total; - info->memRemaining = jobInfo->stats.mig.ram_remaining; - info->memProcessed = jobInfo->stats.mig.ram_transferred; - info->fileTotal = jobInfo->stats.mig.disk_total + + info->memTotal = jobInfoPriv->stats.mig.ram_total; + info->memRemaining = jobInfoPriv->stats.mig.ram_remaining; + info->memProcessed = jobInfoPriv->stats.mig.ram_transferred; + info->fileTotal = jobInfoPriv->stats.mig.disk_total + jobInfo->mirrorStats.total; - info->fileRemaining = jobInfo->stats.mig.disk_remaining + + info->fileRemaining = jobInfoPriv->stats.mig.disk_remaining + (jobInfo->mirrorStats.total - jobInfo->mirrorStats.transferred); - info->fileProcessed = jobInfo->stats.mig.disk_transferred + + info->fileProcessed = jobInfoPriv->stats.mig.disk_transferred + jobInfo->mirrorStats.transferred; break; case QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP: - info->memTotal = jobInfo->stats.mig.ram_total; - info->memRemaining = jobInfo->stats.mig.ram_remaining; - info->memProcessed = jobInfo->stats.mig.ram_transferred; + info->memTotal = jobInfoPriv->stats.mig.ram_total; + info->memRemaining = jobInfoPriv->stats.mig.ram_remaining; + info->memProcessed = jobInfoPriv->stats.mig.ram_transferred; break; case QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP: - info->memTotal = jobInfo->stats.dump.total; - info->memProcessed = jobInfo->stats.dump.completed; + info->memTotal = jobInfoPriv->stats.dump.total; + info->memProcessed = jobInfoPriv->stats.dump.completed; info->memRemaining = info->memTotal - info->memProcessed; break; case QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP: - info->fileTotal = jobInfo->stats.backup.total; - info->fileProcessed = jobInfo->stats.backup.transferred; + info->fileTotal = jobInfoPriv->stats.backup.total; + info->fileProcessed = jobInfoPriv->stats.backup.transferred; info->fileRemaining = info->fileTotal - info->fileProcessed; break; @@ -387,7 +454,8 @@ qemuDomainMigrationJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuMonitorMigrationStats *stats = &jobInfo->stats.mig; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorMigrationStats *stats = &jobInfoPriv->stats.mig; qemuDomainMirrorStatsPtr mirrorStats = &jobInfo->mirrorStats; virTypedParameterPtr par = NULL; int maxpar = 0; @@ -564,7 +632,8 @@ qemuDomainDumpJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuMonitorDumpStats *stats = &jobInfo->stats.dump; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorDumpStats *stats = &jobInfoPriv->stats.dump; virTypedParameterPtr par = NULL; int maxpar = 0; int npar = 0; @@ -607,7 +676,8 @@ qemuDomainBackupJobInfoToParams(qemuDomainJobInfoPtr jobInfo, virTypedParameterPtr *params, int *nparams) { - qemuDomainBackupStats *stats = &jobInfo->stats.backup; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainBackupStats *stats = &jobInfoPriv->stats.backup; g_autoptr(virTypedParamList) par = g_new0(virTypedParamList, 1); if (virTypedParamListAddInt(par, jobInfo->operation, @@ -782,6 +852,7 @@ qemuDomainObjCanSetJob(qemuDomainJobObjPtr job, /* Give up waiting for mutex after 30 seconds */ #define QEMU_JOB_WAIT_TIME (1000ull * 30) + /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -890,8 +961,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, qemuDomainAsyncJobTypeToString(asyncJob), obj, obj->def->name); qemuDomainObjResetAsyncJob(&priv->job); - priv->job.current = g_new0(qemuDomainJobInfo, 1); - priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; + qemuDomainCurrentJobInfoInit(&priv->job); priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); priv->job.asyncOwnerAPI = virThreadJobGet(); @@ -1190,3 +1260,248 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj) priv->job.abortJob = true; virDomainObjBroadcast(obj); } + + +static int +qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, + virStorageSourcePtr src, + virDomainXMLOptionPtr xmlopt) +{ + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + + virBufferAsprintf(&attrBuf, " type='%s' format='%s'", + virStorageTypeToString(src->type), + virStorageFileFormatTypeToString(src->format)); + + if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, + VIR_DOMAIN_DEF_FORMAT_STATUS, + false, false, xmlopt) < 0) + return -1; + + virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf); + + return 0; +} + + +static int +qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, + virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + size_t i; + virDomainDiskDefPtr disk; + qemuDomainDiskPrivatePtr diskPriv; + + for (i = 0; i < vm->def->ndisks; i++) { + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + disk = vm->def->disks[i]; + diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + + virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'", + disk->dst, diskPriv->migrating ? "yes" : "no"); + + if (diskPriv->migrSource && + qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, + diskPriv->migrSource, + priv->driver->xmlopt) < 0) + return -1; + + virXMLFormatElement(buf, "disk", &attrBuf, &childBuf); + } + + return 0; +} + + +int +qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, + virDomainObjPtr vm, + qemuDomainJobObjPtr jobObj) +{ + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); + qemuDomainJob job = jobObj->active; + qemuDomainJobPrivatePtr jobPriv = jobObj->privateData; + + if (!qemuDomainTrackJob(job)) + job = QEMU_JOB_NONE; + + if (job == QEMU_JOB_NONE && + jobObj->asyncJob == QEMU_ASYNC_JOB_NONE) + return 0; + + virBufferAsprintf(&attrBuf, " type='%s' async='%s'", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(jobObj->asyncJob)); + + if (jobObj->phase) { + virBufferAsprintf(&attrBuf, " phase='%s'", + qemuDomainAsyncJobPhaseToString(jobObj->asyncJob, + jobObj->phase)); + } + + if (jobObj->asyncJob != QEMU_ASYNC_JOB_NONE) + virBufferAsprintf(&attrBuf, " flags='0x%lx'", jobObj->apiFlags); + + if (jobObj->asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && + qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) + return -1; + + if (jobPriv->migParams) + qemuMigrationParamsFormat(&childBuf, jobPriv->migParams); + + virXMLFormatElement(buf, "job", &attrBuf, &childBuf); + + return 0; +} + + +static int +qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virDomainDiskDefPtr disk, + virDomainXMLOptionPtr xmlopt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt); + qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + g_autofree char *format = NULL; + g_autofree char *type = NULL; + g_autoptr(virStorageSource) migrSource = NULL; + xmlNodePtr sourceNode; + + ctxt->node = node; + + if (!(ctxt->node = virXPathNode("./migrationSource", ctxt))) + return 0; + + if (!(type = virXMLPropString(ctxt->node, "type"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing storage source type")); + return -1; + } + + if (!(format = virXMLPropString(ctxt->node, "format"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing storage source format")); + return -1; + } + + if (!(migrSource = virDomainStorageSourceParseBase(type, format, NULL))) + return -1; + + /* newer libvirt uses the <source> subelement instead of formatting the + * source directly into <migrationSource> */ + if ((sourceNode = virXPathNode("./source", ctxt))) + ctxt->node = sourceNode; + + if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, + VIR_DOMAIN_DEF_PARSE_STATUS, xmlopt) < 0) + return -1; + + diskPriv->migrSource = g_steal_pointer(&migrSource); + return 0; +} + + +static int +qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt) +{ + g_autofree xmlNodePtr *nodes = NULL; + size_t i; + int n; + + if ((n = virXPathNodeSet("./disk[@migrating='yes']", ctxt, &nodes)) < 0) + return -1; + + if (n > 0) { + if (job->asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { + VIR_WARN("Found disks marked for migration but we were not " + "migrating"); + n = 0; + } + for (i = 0; i < n; i++) { + virDomainDiskDefPtr disk; + g_autofree char *dst = NULL; + + if ((dst = virXMLPropString(nodes[i], "dev")) && + (disk = virDomainDiskByTarget(vm->def, dst))) { + QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating = true; + + if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt, + disk, + xmlopt) < 0) + return -1; + } + } + } + + return 0; +} + + +int +qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt) +{ + qemuDomainJobPrivatePtr jobPriv = job->privateData; + VIR_XPATH_NODE_AUTORESTORE(ctxt); + g_autofree char *tmp = NULL; + + if (!(ctxt->node = virXPathNode("./job[1]", ctxt))) + return 0; + + if ((tmp = virXPathString("string(@type)", ctxt))) { + int type; + + if ((type = qemuDomainJobTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown job type %s"), tmp); + return -1; + } + VIR_FREE(tmp); + job->active = type; + } + + if ((tmp = virXPathString("string(@async)", ctxt))) { + int async; + + if ((async = qemuDomainAsyncJobTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown async job type %s"), tmp); + return -1; + } + VIR_FREE(tmp); + job->asyncJob = async; + + if ((tmp = virXPathString("string(@phase)", ctxt))) { + job->phase = qemuDomainAsyncJobPhaseFromString(async, tmp); + if (job->phase < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown job phase %s"), tmp); + return -1; + } + VIR_FREE(tmp); + } + } + + if (virXPathULongHex("string(@flags)", ctxt, &job->apiFlags) == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); + return -1; + } + + if (qemuDomainObjPrivateXMLParseJobNBD(vm, job, ctxt, xmlopt) < 0) + return -1; + + if (qemuMigrationParamsParse(ctxt, &jobPriv->migParams) < 0) + return -1; + + return 0; +} diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 124664354d..73ac9b40d9 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -19,7 +19,6 @@ #pragma once #include <glib-object.h> -#include "qemu_migration_params.h" #define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) #define QEMU_JOB_DEFAULT_MASK \ @@ -99,7 +98,6 @@ typedef enum { QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP, } qemuDomainJobStatsType; - typedef struct _qemuDomainMirrorStats qemuDomainMirrorStats; typedef qemuDomainMirrorStats *qemuDomainMirrorStatsPtr; struct _qemuDomainMirrorStats { @@ -107,12 +105,13 @@ struct _qemuDomainMirrorStats { unsigned long long total; }; -typedef struct _qemuDomainBackupStats qemuDomainBackupStats; -struct _qemuDomainBackupStats { - unsigned long long transferred; - unsigned long long total; - unsigned long long tmp_used; - unsigned long long tmp_total; +typedef void *(*qemuDomainObjJobInfoPrivateAlloc)(void); +typedef void (*qemuDomainObjJobInfoPrivateFree)(void *); + +typedef struct _qemuDomainObjPrivateJobInfoCallbacks qemuDomainObjPrivateJobInfoCallbacks; +struct _qemuDomainObjPrivateJobInfoCallbacks { + qemuDomainObjJobInfoPrivateAlloc allocJobInfoPrivate; + qemuDomainObjJobInfoPrivateFree freeJobInfoPrivate; }; typedef struct _qemuDomainJobInfo qemuDomainJobInfo; @@ -136,16 +135,15 @@ struct _qemuDomainJobInfo { bool timeDeltaSet; /* Raw values from QEMU */ qemuDomainJobStatsType statsType; - union { - qemuMonitorMigrationStats mig; - qemuMonitorDumpStats dump; - qemuDomainBackupStats backup; - } stats; qemuDomainMirrorStats mirrorStats; char *errmsg; /* optional error message for failed completed jobs */ + + void *privateData; /* job specific collection of info */ + qemuDomainObjPrivateJobInfoCallbacks cb; }; + void qemuDomainJobInfoFree(qemuDomainJobInfoPtr info); @@ -156,6 +154,25 @@ qemuDomainJobInfoCopy(qemuDomainJobInfoPtr info); typedef struct _qemuDomainJobObj qemuDomainJobObj; typedef qemuDomainJobObj *qemuDomainJobObjPtr; + +typedef void *(*qemuDomainObjPrivateJobAlloc)(void); +typedef void (*qemuDomainObjPrivateJobFree)(void *); +typedef int (*qemuDomainObjPrivateJobFormat)(virBufferPtr, + virDomainObjPtr, + qemuDomainJobObjPtr); +typedef int (*qemuDomainObjPrivateJobParse)(virDomainObjPtr, + qemuDomainJobObjPtr, + xmlXPathContextPtr, + virDomainXMLOptionPtr); + +typedef struct _qemuDomainObjPrivateJobCallbacks qemuDomainObjPrivateJobCallbacks; +struct _qemuDomainObjPrivateJobCallbacks { + qemuDomainObjPrivateJobAlloc allocJobPrivate; + qemuDomainObjPrivateJobFree freeJobPrivate; + qemuDomainObjPrivateJobFormat formatJob; + qemuDomainObjPrivateJobParse parseJob; +}; + struct _qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ @@ -182,14 +199,10 @@ struct _qemuDomainJobObj { qemuDomainJobInfoPtr current; /* async job progress data */ qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */ bool abortJob; /* abort of the job requested */ - bool spiceMigration; /* we asked for spice migration and we - * should wait for it to finish */ - bool spiceMigrated; /* spice migration completed */ char *error; /* job event completion error */ - bool dumpCompleted; /* dump completed */ - - qemuMigrationParamsPtr migParams; unsigned long apiFlags; /* flags passed to the API which started the async job */ + void *privateData; /* job specific collection of data */ + struct _qemuDomainObjPrivateJobCallbacks cb; }; const char *qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, @@ -267,3 +280,14 @@ void qemuDomainObjFreeJob(qemuDomainJobObjPtr job); int qemuDomainObjInitJob(qemuDomainJobObjPtr job); bool qemuDomainJobAllowed(qemuDomainJobObjPtr jobs, qemuDomainJob newJob); + +int +qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, + virDomainObjPtr vm, + qemuDomainJobObjPtr jobObj); + +int +qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, + qemuDomainJobObjPtr job, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5b38b3d24..79fb38ae02 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3701,14 +3701,16 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = priv->job.current->privateData; VIR_DEBUG("Waiting for dump completion"); - while (!priv->job.dumpCompleted && !priv->job.abortJob) { + while (!jobPriv->dumpCompleted && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } - if (priv->job.current->stats.dump.status == QEMU_MONITOR_DUMP_STATUS_FAILED) { + if (jobInfoPriv->stats.dump.status == QEMU_MONITOR_DUMP_STATUS_FAILED) { if (priv->job.error) virReportError(VIR_ERR_OPERATION_FAILED, _("memory-only dump failed: %s"), @@ -13554,6 +13556,7 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriverPtr driver, qemuDomainJobInfoPtr jobInfo) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; qemuMonitorDumpStats stats = { 0 }; int rc; @@ -13565,33 +13568,33 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) return -1; - jobInfo->stats.dump = stats; + jobInfoPriv->stats.dump = stats; if (qemuDomainJobInfoUpdateTime(jobInfo) < 0) return -1; - switch (jobInfo->stats.dump.status) { + switch (jobInfoPriv->stats.dump.status) { case QEMU_MONITOR_DUMP_STATUS_NONE: case QEMU_MONITOR_DUMP_STATUS_FAILED: case QEMU_MONITOR_DUMP_STATUS_LAST: virReportError(VIR_ERR_OPERATION_FAILED, _("dump query failed, status=%d"), - jobInfo->stats.dump.status); + jobInfoPriv->stats.dump.status); return -1; break; case QEMU_MONITOR_DUMP_STATUS_ACTIVE: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; VIR_DEBUG("dump active, bytes written='%llu' remaining='%llu'", - jobInfo->stats.dump.completed, - jobInfo->stats.dump.total - - jobInfo->stats.dump.completed); + jobInfoPriv->stats.dump.completed, + jobInfoPriv->stats.dump.total - + jobInfoPriv->stats.dump.completed); break; case QEMU_MONITOR_DUMP_STATUS_COMPLETED: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; VIR_DEBUG("dump completed, bytes written='%llu'", - jobInfo->stats.dump.completed); + jobInfoPriv->stats.dump.completed); break; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13427c1203..a45d13aaac 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1422,12 +1422,13 @@ static int qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.spiceMigration) + if (!jobPriv->spiceMigration) return 0; VIR_DEBUG("Waiting for SPICE to finish migration"); - while (!priv->job.spiceMigrated && !priv->job.abortJob) { + while (!jobPriv->spiceMigrated && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } @@ -1438,7 +1439,8 @@ qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) static void qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo) { - switch ((qemuMonitorMigrationStatus) jobInfo->stats.mig.status) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + switch ((qemuMonitorMigrationStatus) jobInfoPriv->stats.mig.status) { case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY: jobInfo->status = QEMU_DOMAIN_JOB_STATUS_POSTCOPY; break; @@ -1485,6 +1487,7 @@ qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, char **error) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; qemuMonitorMigrationStats stats; int rv; @@ -1496,7 +1499,7 @@ qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) return -1; - jobInfo->stats.mig = stats; + jobInfoPriv->stats.mig = stats; return 0; } @@ -1538,12 +1541,14 @@ qemuMigrationJobCheckStatus(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = priv->job.current; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + char *error = NULL; bool events = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT); int ret = -1; if (!events || - jobInfo->stats.mig.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { + jobInfoPriv->stats.mig.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { if (qemuMigrationAnyFetchStats(driver, vm, asyncJob, jobInfo, &error) < 0) return -1; } @@ -1777,6 +1782,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, const char *graphicsuri) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; int ret = -1; const char *listenAddress = NULL; virSocketAddr addr; @@ -1858,7 +1864,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); - priv->job.spiceMigration = !ret; + jobPriv->spiceMigration = !ret; if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; } @@ -1993,6 +1999,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, @@ -2018,7 +2025,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, " domain was successfully started on destination or not", vm->def->name); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); /* clear the job and let higher levels decide what to do */ qemuDomainObjDiscardAsyncJob(driver, vm); break; @@ -2403,6 +2410,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, bool relabel = false; int rv; char *tlsAlias = NULL; + qemuDomainJobPrivatePtr jobPriv = NULL; virNWFilterReadLockFilterUpdates(); @@ -2410,7 +2418,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("offline migration cannot handle " + _("offlineqemuDomainJobPrivatePtr jobPriv = priv->job.privateData;priv migration cannot handle " "non-shared storage")); goto cleanup; } @@ -2519,6 +2527,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; + jobPriv = priv->job.privateData; priv->origname = g_strdup(origname); if (taint_hook) { @@ -2726,7 +2735,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, stopjob: qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (stopProcess) { unsigned int stopFlags = VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -3000,6 +3009,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = NULL; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "flags=0x%x, retcode=%d", @@ -3025,6 +3035,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, /* Update times with the values sent by the destination daemon */ if (mig->jobInfo && jobInfo) { + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuDomainJobInfoPrivatePtr migJobInfoPriv = mig->jobInfo->privateData; int reason; /* We need to refresh migration statistics after a completed post-copy @@ -3040,8 +3052,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuDomainJobInfoUpdateTime(jobInfo); jobInfo->timeDeltaSet = mig->jobInfo->timeDeltaSet; jobInfo->timeDelta = mig->jobInfo->timeDelta; - jobInfo->stats.mig.downtime_set = mig->jobInfo->stats.mig.downtime_set; - jobInfo->stats.mig.downtime = mig->jobInfo->stats.mig.downtime; + jobInfoPriv->stats.mig.downtime_set = migJobInfoPriv->stats.mig.downtime_set; + jobInfoPriv->stats.mig.downtime = migJobInfoPriv->stats.mig.downtime; } if (flags & VIR_MIGRATE_OFFLINE) @@ -3084,7 +3096,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuMigrationSrcRestoreDomainState(driver, vm); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); @@ -4681,6 +4693,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) @@ -4738,7 +4751,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, */ if (!v3proto && ret < 0) qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationSrcRestoreDomainState(driver, vm); @@ -4780,6 +4793,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, unsigned long resource) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; int ret = -1; /* If we didn't start the job in the begin phase, start it now. */ @@ -4814,7 +4828,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, endjob: if (ret < 0) { qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); } else { qemuMigrationJobContinue(vm); @@ -5019,6 +5033,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; int cookie_flags = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); unsigned short port; unsigned long long timeReceived = 0; @@ -5272,7 +5287,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index fb8b5bcd92..b5f4647539 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -641,7 +641,8 @@ static void qemuMigrationCookieStatisticsXMLFormat(virBufferPtr buf, qemuDomainJobInfoPtr jobInfo) { - qemuMonitorMigrationStats *stats = &jobInfo->stats.mig; + qemuDomainJobInfoPrivatePtr jobInfoPriv = jobInfo->privateData; + qemuMonitorMigrationStats *stats = &jobInfoPriv->stats.mig; virBufferAddLit(buf, "<statistics>\n"); virBufferAdjustIndent(buf, 2); @@ -1044,6 +1045,7 @@ static qemuDomainJobInfoPtr qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) { qemuDomainJobInfoPtr jobInfo = NULL; + qemuDomainJobInfoPrivatePtr jobInfoPriv = NULL; qemuMonitorMigrationStats *stats; VIR_XPATH_NODE_AUTORESTORE(ctxt); @@ -1051,8 +1053,9 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) return NULL; jobInfo = g_new0(qemuDomainJobInfo, 1); + jobInfoPriv = jobInfo->privateData; - stats = &jobInfo->stats.mig; + stats = &jobInfoPriv->stats.mig; jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; virXPathULongLong("string(./started[1])", ctxt, &jobInfo->started); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 6953badcfe..ba3eb14831 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -953,6 +953,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; virJSONValuePtr tlsProps = NULL; virJSONValuePtr secProps = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -965,7 +966,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, goto error; } - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("TLS migration is not supported with this " "QEMU binary")); @@ -1038,8 +1039,9 @@ qemuMigrationParamsDisableTLS(virDomainObjPtr vm, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) return 0; if (qemuMigrationParamsSetString(migParams, @@ -1168,6 +1170,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, virBitmapPtr remoteCaps) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; qemuMigrationCapability cap; qemuMigrationParty party; size_t i; @@ -1221,7 +1224,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, * to ask QEMU for their current settings. */ - return qemuMigrationParamsFetch(driver, vm, asyncJob, &priv->job.migParams); + return qemuMigrationParamsFetch(driver, vm, asyncJob, &jobPriv->migParams); } diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 9aea24725f..381eabbe4a 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -70,6 +70,34 @@ typedef enum { QEMU_MIGRATION_DESTINATION = (1 << 1), } qemuMigrationParty; +typedef struct _qemuDomainJobPrivate qemuDomainJobPrivate; +typedef qemuDomainJobPrivate *qemuDomainJobPrivatePtr; +struct _qemuDomainJobPrivate { + bool spiceMigration; /* we asked for spice migration and we + * should wait for it to finish */ + bool spiceMigrated; /* spice migration completed */ + bool dumpCompleted; /* dump completed */ + qemuMigrationParamsPtr migParams; +}; + + +typedef struct _qemuDomainBackupStats qemuDomainBackupStats; +struct _qemuDomainBackupStats { + unsigned long long transferred; + unsigned long long total; + unsigned long long tmp_used; + unsigned long long tmp_total; +}; + +typedef struct _qemuDomainJobInfoPrivate qemuDomainJobInfoPrivate; +typedef qemuDomainJobInfoPrivate *qemuDomainJobInfoPrivatePtr; +struct _qemuDomainJobInfoPrivate { + union { + qemuMonitorMigrationStats mig; + qemuMonitorDumpStats dump; + qemuDomainBackupStats backup; + } stats; +}; virBitmapPtr qemuMigrationParamsGetAlwaysOnCaps(qemuMigrationParty party); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d36088ba98..97c6b2ec27 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1608,6 +1608,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; virObjectLock(vm); @@ -1615,12 +1616,13 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name); priv = vm->privateData; + jobPriv = priv->job.privateData; if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { VIR_DEBUG("got SPICE_MIGRATE_COMPLETED event without a migration job"); goto cleanup; } - priv->job.spiceMigrated = true; + jobPriv->spiceMigrated = true; virDomainObjBroadcast(vm); cleanup: @@ -1636,6 +1638,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque) { qemuDomainObjPrivatePtr priv; + qemuDomainJobInfoPrivatePtr jobInfoPriv; virQEMUDriverPtr driver = opaque; virObjectEventPtr event = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -1648,12 +1651,13 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, qemuMonitorMigrationStatusTypeToString(status)); priv = vm->privateData; + jobInfoPriv = priv->job.current->privateData; if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) { VIR_DEBUG("got MIGRATION event without a migration job"); goto cleanup; } - priv->job.current->stats.mig.status = status; + jobInfoPriv->stats.mig.status = status; virDomainObjBroadcast(vm); if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY && @@ -1720,6 +1724,8 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; + qemuDomainJobInfoPrivatePtr jobInfoPriv; virObjectLock(vm); @@ -1727,18 +1733,20 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name, stats, NULLSTR(error)); priv = vm->privateData; + jobPriv = priv->job.privateData; + jobInfoPriv = priv->job.current->privateData; if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) { VIR_DEBUG("got DUMP_COMPLETED event without a dump_completed job"); goto cleanup; } - priv->job.dumpCompleted = true; - priv->job.current->stats.dump = *stats; + jobPriv->dumpCompleted = true; + jobInfoPriv->stats.dump = *stats; priv->job.error = g_strdup(error); /* Force error if extracting the DUMP_COMPLETED status failed */ if (!error && status < 0) { priv->job.error = g_strdup(virGetLastErrorMessage()); - priv->job.current->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; + jobInfoPriv->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; } virDomainObjBroadcast(vm); @@ -3411,6 +3419,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, virDomainState state, int reason) { + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = (state == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED) || (state == VIR_DOMAIN_RUNNING && @@ -3459,7 +3468,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } @@ -3471,6 +3480,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, int reason, unsigned int *stopFlags) { + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = state == VIR_DOMAIN_PAUSED && (reason == VIR_DOMAIN_PAUSED_POSTCOPY || reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED); @@ -3554,7 +3564,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } -- 2.17.1

1 0

[libvirt PATCH 0/1] Use the default capabilities cache lookup rather than an arch based lookup
by Erik Skultety 03 Jul '20

03 Jul '20

https://bugzilla.redhat.com/show_bug.cgi?id=1852311 Erik Skultety (1): qemu: Use virQEMUCapsCacheLookupDefault instead of lookup by arch src/qemu/qemu_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.26.2

2 2

[libvirt-python][PATCH 0/3] Improve streams a bit
by Michal Privoznik 03 Jul '20

03 Jul '20

Inspired by patches I've sent for libvirt: https://www.redhat.com/archives/libvir-list/2020-July/msg00145.html Michal Privoznik (3): MANIFEST: Distribute sparsestream.py example virStream: Use larger buffer for sendAll/recvAll methods examples: Update sparsestream.py so that it handles block devices MANIFEST.in | 1 + examples/sparsestream.py | 73 ++++++++++++++++++++++++++--------- libvirt-override-virStream.py | 8 ++-- 3 files changed, 59 insertions(+), 23 deletions(-) -- 2.26.2

2 5

[PATCH] maint: Post-release version bump to 6.6.0
by Michal Privoznik 03 Jul '20

03 Jul '20

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. NEWS.rst | 10 ++++++++++ configure.ac | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 1663d11af7..7baf742e03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -8,6 +8,16 @@ the changes introduced by each of them. For a more fine-grained view, use the `git log`_. +v6.6.0 (unreleased) +=================== + +* **New features** + +* **Improvements** + +* **Bug fixes** + + v6.5.0 (2020-07-03) =================== diff --git a/configure.ac b/configure.ac index 6c8ac2f04b..79055db9b1 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [6.5.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [6.6.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] if test $srcdir = "." then -- 2.26.2

1 0

[PATCH v5 00/20] audio: deprecate -soundhw
by Gerd Hoffmann 02 Jul '20

02 Jul '20

v2: - use g_assert_not_reached() for stubs. - add deprecation notice. v3: - rebase to latest master. - adapt to armbru's device initialization changes. v4: - reorder patches, drop temporary -global setup, go straight to -machine pcspk-audiodev= instead. - update error messages and documentation accordingly. v5: - spell fixes (Eric). - fix mips build error. Gerd Hoffmann (20): stubs: add isa_create_simple stubs: add pci_create_simple audio: add deprecated_register_soundhw audio: deprecate -soundhw ac97 audio: deprecate -soundhw es1370 audio: deprecate -soundhw adlib audio: deprecate -soundhw cs4231a audio: deprecate -soundhw gus audio: deprecate -soundhw sb16 audio: deprecate -soundhw hda pc_basic_device_init: pass PCMachineState pc_basic_device_init: drop has_pit arg pc_basic_device_init: drop no_vmport arg softmmu: initialize spice and audio earlier audio: rework pcspk_init() audio: create pcspk device early audio: deprecate -soundhw pcspk audio: add soundhw deprecation notice pcspk: update docs/system/target-i386-desc.rst.inc audio: set default value for pcspk.iobase property include/hw/audio/pcspk.h | 12 ++---------- include/hw/audio/soundhw.h | 2 ++ include/hw/i386/pc.h | 6 +++--- hw/audio/ac97.c | 9 ++------- hw/audio/adlib.c | 8 +------- hw/audio/cs4231a.c | 8 +------- hw/audio/es1370.c | 9 ++------- hw/audio/gus.c | 8 +------- hw/audio/intel-hda.c | 3 +++ hw/audio/pcspk.c | 26 ++++++++++++++++++++++---- hw/audio/sb16.c | 9 ++------- hw/audio/soundhw.c | 24 +++++++++++++++++++++++- hw/i386/pc.c | 14 ++++++++------ hw/i386/pc_piix.c | 3 +-- hw/i386/pc_q35.c | 3 +-- hw/isa/i82378.c | 2 +- hw/mips/jazz.c | 2 +- qdev-monitor.c | 2 ++ softmmu/vl.c | 12 ++++++------ stubs/isa-bus.c | 7 +++++++ stubs/pci-bus.c | 7 +++++++ docs/system/deprecated.rst | 9 +++++++++ docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- stubs/Makefile.objs | 2 ++ 24 files changed, 121 insertions(+), 79 deletions(-) create mode 100644 stubs/isa-bus.c create mode 100644 stubs/pci-bus.c -- 2.18.4

2 21

[libvirt PATCH] docs: Update CI documentation
by Andrea Bolognani 02 Jul '20

02 Jul '20

We're no longer using either Travis CI or the Jenkins-based CentOS CI, but we have started using Cirrus CI. Mention the libvirt-ci subproject as well, as a pointer for those who might want to learn more about our CI infrastructure. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/ci.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/ci.rst b/docs/ci.rst index 2e88e06b1b..b321a67bd9 100644 --- a/docs/ci.rst +++ b/docs/ci.rst @@ -4,10 +4,14 @@ Libvirt Continuous Integration .. contents:: -The libvirt project primarily uses GitLab CI for automated testing of Linux -builds, and cross-compiled Windows builds. `Travis <https://travis-ci.org/libvirt/libvirt>`_ -is used for validating macOS builds, and `Jenkins <https://ci.centos.org/view/libvirt>`_ -is temporarily used for validating FreeBSD builds. +The libvirt project uses GitLab CI for automated testing. + +Linux builds and cross-compiled Windows builds happen on GitLab CI's shared +runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI +<https://cirrus-ci.com/>`_ jobs behind the scenes. + +Most of the tooling used to build CI pipelines is maintained as part of the +`libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject. GitLab CI Dashboard =================== -- 2.25.4

2 1

[libvirt PATCH] NEWS: Update for libvirt 6.5.0
by Andrea Bolognani 02 Jul '20

02 Jul '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- NEWS.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 0e9822cd03..499711fb18 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -47,8 +47,30 @@ v6.5.0 (unreleased) alphabetical order. Hook script in old place will be executed as first for backward compatibility. + * qemu: Add support for migratable host-passthrough CPU + + QEMU 2.12 made it possible for guests to use a migration-friendly + version of the host-passthrough CPU. This feature is now exposed by + libvirt. + * **Improvements** + * network: Support NAT with IPv6 + + It's now possible to use ``<nat ipv6="yes"/>`` in a libvirt network. + + * qemu: Auto-fill NUMA information for incomplete topologies + + If the NUMA topology is not fully described in the guest XML, libvirt + will complete it by putting all unspecified CPUs in the first NUMA node. + This is only done in the QEMU binary itself supports disjointed CPU + ranges for NUMA nodes. + + * qemu: Assign hostdev-backed interfaces to PCIe slots + + All SR-IOV capable devices are PCIe, so when their VFs are assigned to + guests they should end up in PCIe slots rather than conventional PCI ones. + * **Bug fixes** * qemu: fixed crash in ``qemuDomainBlockCommit`` @@ -61,6 +83,11 @@ v6.5.0 (unreleased) Removes the correlation between the zPCI address attributes uid and fid. Fixes the validation and autogeneration of zPCI address attributes. + * qemu: Skip pre-creation of NVMe disks during migration + + libvirt has no way to create NVMe devices on the target host, so it now + just makes sure they exist and let the migration proceed in that case. + v6.4.0 (2020-06-02) =================== -- 2.25.4

2 1

[libvirt PATCH] util: add access check for hooks to fix running as non-root
by Daniel P. Berrangé 01 Jul '20

01 Jul '20

Since feb83c1e710b9ea8044a89346f4868d03b31b0f1 libvirtd will abort on startup if run as non-root 2020-07-01 16:30:30.738+0000: 1647444: error : virDirOpenInternal:2869 : cannot open directory '/etc/libvirt/hooks/daemon.d': Permission denied The root cause flaw is that non-root libvirtd is using /etc/libvirt for its hooks. Traditionally that has been harmless though since we checked whether we could access the hook file and degraded gracefully. We need the same access check for iterating over the hook directory. Long term we should make it possible to have an unprivileged hook dir under $HOME. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virhook.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virhook.c b/src/util/virhook.c index 3e025fd3a6..a7ab98560c 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -171,6 +171,12 @@ virHookCheck(int no, const char *driver) } dir_path = g_strdup_printf("%s.d", path); + + if (access(dir_path, X_OK | R_OK) < 0) { + VIR_DEBUG("Hook dir %s is not accessible", dir_path); + return 1; + } + if ((ret = virDirOpenIfExists(&dir, dir_path)) < 0) return -1; @@ -415,6 +421,10 @@ virHookCall(int driver, } dir_path = g_strdup_printf("%s.d", path); + + if (access(dir_path, X_OK | R_OK) < 0) + return script_ret; + if ((ret = virDirOpenIfExists(&dir, dir_path)) < 0) return -1; -- 2.26.2

2 1

Entering freeze for libvirt-6.5.0
by Daniel Veillard 01 Jul '20

01 Jul '20

With the end of the month coming next week, it is better to enter freeze today and try to release before the July 4th long week-end in the US. I have just pushed the signed tarball and source rpm to the usual place https://libvirt.org/sources/ Seems to work fine in my very minimal tests, I hope people can do a bit of testing especially on other OSes and distro. If all goes fine I will push rc2 on Tuesday with hopefully a release of 6.5.0 on Thursday. Please give it some testing, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[PATCH] virnettlshelpers: Update private key
by Michal Privoznik 01 Jul '20

01 Jul '20

With the recent update of Fedora rawhide I've noticed virnettlssessiontest and virnettlscontexttest failing with: Our own certificate servercertreq-ctx.pem failed validation against cacertreq-ctx.pem: The certificate uses an insecure algorithm This is result of Fedora changes to support strong crypto [1]. RSA with 1024 bit key is viewed as legacy and thus insecure. Generate a new private key then. Moreover, switch to EC which is not only shorter but also not deprecated that often as RSA. Generated using the following command: openssl genpkey --outform PEM --out privkey.pem \ --algorithm EC --pkeyopt ec_paramgen_curve:P-384 \ --pkeyopt ec_param_enc:named_curve 1: https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- According to our CI all systems support ecliptic curves: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/161932641 but maybe this should be merged only after the release? tests/virnettlshelpers.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index e2b8e8359a..979afed307 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -47,22 +47,10 @@ extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; gnutls_x509_privkey_t privkey; # define PRIVATE_KEY \ "-----BEGIN PRIVATE KEY-----\n" \ - "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALVcr\n" \ - "BL40Tm6yq88FBhJNw1aaoCjmtg0l4dWQZ/e9Fimx4ARxFpT+ji4FE\n" \ - "Cgl9s/SGqC+1nvlkm9ViSo0j7MKDbnDB+VRHDvMAzQhA2X7e8M0n9\n" \ - "rPolUY2lIVC83q0BBaOBkCj2RSmT2xTEbbC2xLukSrg2WP/ihVOxc\n" \ - "kXRuyFtzAgMBAAECgYB7slBexDwXrtItAMIH6m/U+LUpNe0Xx48OL\n" \ - "IOn4a4whNgO/o84uIwygUK27ZGFZT0kAGAk8CdF9hA6ArcbQ62s1H\n" \ - "myxrUbF9/mrLsQw1NEqpuUk9Ay2Tx5U/wPx35S3W/X2AvR/ZpTnCn\n" \ - "2q/7ym9fyiSoj86drD7BTvmKXlOnOwQJBAPOFMp4mMa9NGpGuEssO\n" \ - "m3Uwbp6lhcP0cA9MK+iOmeANpoKWfBdk5O34VbmeXnGYWEkrnX+9J\n" \ - "bM4wVhnnBWtgBMCQQC+qAEmvwcfhauERKYznMVUVksyeuhxhCe7EK\n" \ - "mPh+U2+g0WwdKvGDgO0PPt1gq0ILEjspMDeMHVdTwkaVBo/uMhAkA\n" \ - "Z5SsZyCP2aTOPFDypXRdI4eqRcjaEPOUBq27r3uYb/jeboVb2weLa\n" \ - "L1MmVuHiIHoa5clswPdWVI2y0em2IGoDAkBPSp/v9VKJEZabk9Frd\n" \ - "a+7u4fanrM9QrEjY3KhduslSilXZZSxrWjjAJPyPiqFb3M8XXA26W\n" \ - "nz1KYGnqYKhLcBAkB7dt57n9xfrhDpuyVEv+Uv1D3VVAhZlsaZ5Pp\n" \ - "dcrhrkJn2sa/+O8OKvdrPSeeu/N5WwYhJf61+CPoenMp7IFci\n" \ + "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD39t6GRLeEmsYjRGR6\n" \ + "iQiIN2S4zXsgLGS/2GloXdG7K+i/3vEJDt9celZ0DfCLcG6hZANiAAQTJIe13jy7\n" \ + "k4KTXMkHQHEJa/asH263JaPL5kTbfRa6tMq3DS3pzWlOj+NHY/9JzthrKD+Ece+g\n" \ + "2g/POHa0gfXRYXGiHTs8mY0AHFqNNmF38eIVGjOqobIi90MkyI3wx4g=\n" \ "-----END PRIVATE KEY-----\n" /* -- 2.26.2

2 2

[libvirt PATCH v3 0/1] cirrus: Add templates and refresh script
by Andrea Bolognani 01 Jul '20

01 Jul '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161289292 For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 Changes from [v2]: * 'lcitool dockerfile --variables' has been replaced with 'lcitool variables'. Changes from [v1]: * reduce duplication by only storing variables in the git repository and instantiating the template at runtime. [v2] https://www.redhat.com/archives/libvir-list/2020-June/msg01318.html [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg01305.html Andrea Bolognani (1): cirrus: Generate jobs dynamically .gitlab-ci.yml | 36 ++++++++++++++- ci/cirrus/build.yml | 26 +++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 ------------------------------- ci/cirrus/libvirt-freebsd-12.vars | 7 +++ ci/cirrus/libvirt-macos-1015.vars | 7 +++ ci/cirrus/macos-1015.yml.j2 | 38 ---------------- ci/cirrus/refresh | 22 ++++++++++ 7 files changed, 97 insertions(+), 112 deletions(-) create mode 100644 ci/cirrus/build.yml delete mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/libvirt-freebsd-12.vars create mode 100644 ci/cirrus/libvirt-macos-1015.vars delete mode 100644 ci/cirrus/macos-1015.yml.j2 create mode 100755 ci/cirrus/refresh -- 2.25.4

2 2

[PATCH 1/1] migration.html.in: fix 'Offline migration' description
by Daniel Henrique Barboza 01 Jul '20

01 Jul '20

'transfers inactive the definition of a domain' seems odd. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/migration.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 355f0e89af..e95ee9de6f 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -141,7 +141,7 @@ <h2><a id="offline">Offline migration</a></h2> <p> - Offline migration transfers inactive the definition of a domain + Offline migration transfers the inactive definition of a domain (which may or may not be active). After successful completion, the domain remains in its current state on the source host and is defined but inactive on the destination host. It's a bit more clever than -- 2.26.2

2 1

[PATCH 1/1] domain_conf.c: skip checking ZPCI address is incomplete if not present
by Daniel Henrique Barboza 01 Jul '20

01 Jul '20

Commit 076591009ad1 ("conf: fix zPCI address auto-generation on s390") is doing a check for virZPCIDeviceAddressIsIncomplete() prior to checking if the device has a ZPCI address at all. This results in errors like these when starting Libvirt: error : virDomainDeviceInfoFormat:7527 : internal error: Missing uid or fid attribute of zPCI address Fix it by moving virZPCIDeviceAddressIsIncomplete() after the check done by virZPCIDeviceAddressIsPresent(). Fixes: 076591009ad11ec108521b52a4945d0f895fa160 CC: Bjoern Walk <bwalk(a)linux.ibm.com> CC: Boris Fiuczynski <fiuczy(a)linux.ibm.com> CC: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> CC: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/conf/domain_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 31ba78b950..33f177b16f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7522,11 +7522,11 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virTristateSwitchTypeToString(info->addr.pci.multi)); } - if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing uid or fid attribute of zPCI address")); - } if (virZPCIDeviceAddressIsPresent(&info->addr.pci.zpci)) { + if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing uid or fid attribute of zPCI address")); + virBufferAsprintf(&childBuf, "<zpci uid='0x%.4x' fid='0x%.8x'/>\n", info->addr.pci.zpci.uid.value, -- 2.26.2

3 8

[libvirt PATCH v2 0/1] cirrus: Add templates and refresh script
by Andrea Bolognani 30 Jun '20

30 Jun '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161289292 For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 Changes from [v1]: * reduce duplication by only storing variables in the git repository and instantiating the template at runtime. [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg01305.html Andrea Bolognani (1): cirrus: Generate jobs dynamically .gitlab-ci.yml | 36 ++++++++++++++- ci/cirrus/build.yml | 26 +++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 ------------------------------- ci/cirrus/libvirt-freebsd-12.vars | 7 +++ ci/cirrus/libvirt-macos-1015.vars | 7 +++ ci/cirrus/macos-1015.yml.j2 | 38 ---------------- ci/cirrus/refresh | 22 ++++++++++ 7 files changed, 97 insertions(+), 112 deletions(-) create mode 100644 ci/cirrus/build.yml delete mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/libvirt-freebsd-12.vars create mode 100644 ci/cirrus/libvirt-macos-1015.vars delete mode 100644 ci/cirrus/macos-1015.yml.j2 create mode 100755 ci/cirrus/refresh -- 2.25.4

2 3

[libvirt PATCH] tools: fix misleading comments about command names
by Daniel P. Berrangé 30 Jun '20

30 Jun '20

The srv-XXX commands were renamed to server-XXX, with the old name being a undocumented back compat alias only. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/virt-admin.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 6ff9729f66..fef0332a0d 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -315,9 +315,9 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) } -/* --------------- - * Command srv-list - * --------------- +/* ------------------- + * Command server-list + * ------------------- */ static const vshCmdInfo info_srv_list[] = { @@ -380,9 +380,9 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) } -/* --------------------------- - * Command srv-threadpool-info - * --------------------------- +/* ------------------------------ + * Command server-threadpool-info + * ------------------------------ */ static const vshCmdInfo info_srv_threadpool_info[] = { @@ -441,9 +441,9 @@ cmdSrvThreadpoolInfo(vshControl *ctl, const vshCmd *cmd) return ret; } -/* -------------------------- - * Command srv-threadpool-set - * -------------------------- +/* ----------------------------- + * Command server-threadpool-set + * ----------------------------- */ static const vshCmdInfo info_srv_threadpool_set[] = { @@ -550,9 +550,9 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -/* ------------------------ - * Command srv-clients-list - * ------------------------ +/* --------------------------- + * Command server-clients-list + * --------------------------- */ static const vshCmdInfo info_srv_clients_list[] = { @@ -793,9 +793,9 @@ cmdClientDisconnect(vshControl *ctl, const vshCmd *cmd) return ret; } -/* ------------------------ - * Command srv-clients-info - * ------------------------ +/* --------------------------- + * Command server-clients-info + * --------------------------- */ static const vshCmdInfo info_srv_clients_info[] = { @@ -852,9 +852,9 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) return ret; } -/* ----------------------- - * Command srv-clients-set - * ----------------------- +/* -------------------------- + * Command server-clients-set + * -------------------------- */ static const vshCmdInfo info_srv_clients_set[] = { @@ -957,9 +957,9 @@ cmdSrvClientsSet(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -/* ------------------------ - * Command srv-update-tls - * ------------------------ +/* -------------------------- + * Command server-update-tls + * -------------------------- */ static const vshCmdInfo info_srv_update_tls_file[] = { {.name = "help", -- 2.26.2

2 1

[libvirt PATCH 0/3] cirrus: Add templates and refresh script
by Andrea Bolognani 29 Jun '20

29 Jun '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161179474 The important job is the macOS one. For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/31 Andrea Bolognani (3): cirrus: Tweak configurations cirrus: Add templates and refresh script cirrus: Refresh configurations ci/cirrus/freebsd-12.yml.j2 | 62 ++++-------------------------- ci/cirrus/macos-1015.yml.j2 | 29 +++++--------- ci/cirrus/refresh | 32 +++++++++++++++ ci/cirrus/templates/freebsd-12.yml | 25 ++++++++++++ ci/cirrus/templates/macos-1015.yml | 27 +++++++++++++ 5 files changed, 100 insertions(+), 75 deletions(-) create mode 100755 ci/cirrus/refresh create mode 100644 ci/cirrus/templates/freebsd-12.yml create mode 100644 ci/cirrus/templates/macos-1015.yml -- 2.25.4

3 9

[PATCH] virConnectGetAllDomainStats: Document two vcpu stats
by Michal Privoznik 29 Jun '20

29 Jun '20

When introducing vcpu.<num>.wait (v1.3.2-rc1~301) and vcpu.<num>.halted (v2.4.0-rc1~36) the documentation was not written. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 60b5e65fc3..52ce3ef798 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11493,6 +11493,11 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * from virVcpuState enum. * "vcpu.<num>.time" - virtual cpu time spent by virtual CPU <num> * as unsigned long long. + * "vcpu.<num>.wait" - time the vCPU <num> wants to run, but the host + * scheduler has something else running ahead of it. + * "vcpu.<num>.halted" - virtual CPU <num> is halted, may indicate the + * processor is idle or even disabled, depending + * on the architecture) * * VIR_DOMAIN_STATS_INTERFACE: * Return network interface statistics (from domain point of view). -- 2.26.2

2 1

[PATCH v2 for 6.5.0] domain_conf: Remove zPCI validation from formatter
by Michal Privoznik 29 Jun '20

29 Jun '20

In 076591009ad a validation code was added to virDomainDeviceInfoFormat() which reports an error if zPCI address entered in was incomplete. But, there are two problems with this approach. The first problem is the placement of the code - it doesn't belong into XML formatter rather than XML validator. The second one is that at the point of formatting XML the post parse callback has run and thus filled in required info. Therefore this check can never do something useful and instead of moving it into validator, it's removed completely. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is v2 of: https://www.redhat.com/archives/libvir-list/2020-June/msg01279.html diff to v1: - Instead of moving the check to validator remove it completely (per discussion in v1) src/conf/domain_conf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33f177b16f..0c883cd834 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7523,10 +7523,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if (virZPCIDeviceAddressIsPresent(&info->addr.pci.zpci)) { - if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing uid or fid attribute of zPCI address")); - virBufferAsprintf(&childBuf, "<zpci uid='0x%.4x' fid='0x%.8x'/>\n", info->addr.pci.zpci.uid.value, -- 2.26.2

2 1

[PATCH for 6.5.0 0/3] Move zPCI validation from formatter to validator
by Michal Privoznik 29 Jun '20

29 Jun '20

*** BLURB HERE *** Michal Prívozník (3): qemuhotplugtest: Free monitor iff successfully initialized domain_conf: Move zPCI validation from formatter to validator qemu_validate: Fix how qemuValidateDomainDeviceDefZPCIAddress() is called src/conf/domain_conf.c | 4 ---- src/qemu/qemu_validate.c | 9 ++++++++- tests/qemuhotplugtest.c | 8 +++++--- 3 files changed, 13 insertions(+), 8 deletions(-) -- 2.26.2

2 8

[libvirt PATCH] ci: Run all jobs, for all branches, all the time
by Andrea Bolognani 29 Jun '20

29 Jun '20

After recent changes (increasing the parallelism of the pipeline by reducing the number of stages, introducing FreeBSD builds that take longer than any other job), the difference between running the full pipeline or a reduced one has basically disappeared: in both cases, the completion time is around 25-35 minutes depending on whether containers need to be rebuilt and how many shared runners are available. Reduce the complexity of our .gitlab-ci.yml and make things simpler for contributors by simply always running all jobs. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 143 ++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 90 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cb910b0fa..e6eb2f9905 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,7 @@ stages: # Common templates -# Containers that are necessary for the default pipeline -.container_default_job_template: &container_default_job_definition +.container_job_template: &container_job_definition image: docker:stable stage: containers services: @@ -33,23 +32,15 @@ stages: after_script: - docker logout -# Containers that are only needed for the full pipeline -.container_extra_job_template: &container_extra_job_definition - <<: *container_default_job_definition - only: - - master - - /^ci-full-.*$/ - # We build many containers which can be useful to debug problems but are not # needed for the pipeline itself to complete: those sometimes fail, and when # that happens it's mostly because of temporary issues with Debian sid. We # don't want those failures to affect the overall pipeline status .container_optional_job_template: &container_optional_job_definition - <<: *container_extra_job_definition + <<: *container_job_definition allow_failure: true -# Default native build jobs that are always run -.native_build_default_job_template: &native_build_default_job_definition +.native_build_job_template: &native_build_job_definition stage: builds image: $CI_REGISTRY_IMAGE/ci-$NAME:latest cache: @@ -64,18 +55,10 @@ stages: - ../autogen.sh || (cat config.log && exit 1) - $MAKE distcheck -# Extra native build jobs that are only run post-merge, or -# when code is pushed to a branch with "ci-full-" name prefix -.native_build_extra_job_template: &native_build_extra_job_definition - <<: *native_build_default_job_definition - only: - - master - - /^ci-full-.*$/ - # Jobs that we delegate to Cirrus CI because they require an operating # system other than Linux. These jobs will only run if the required # setup has been performed on the GitLab account (see ci/README.rst). -.cirrus_build_default_job_template: &cirrus_build_default_job_definition +.cirrus_build_job_template: &cirrus_build_job_definition stage: builds image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master script: @@ -85,19 +68,7 @@ stages: - $CIRRUS_GITHUB_REPO - $CIRRUS_API_TOKEN -.cirrus_build_extra_job_template: &cirrus_build_extra_job_definition - <<: *cirrus_build_default_job_definition - only: - variables: - - $CIRRUS_GITHUB_REPO - - $CIRRUS_API_TOKEN - refs: - - master - - /^ci-full-.*$/ - - -# Default cross build jobs that are always run -.cross_build_default_job_template: &cross_build_default_job_definition +.cross_build_default_job_template: &cross_build_job_definition stage: builds image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest cache: @@ -112,74 +83,66 @@ stages: - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - $MAKE -# Extra cross build jobs that are only run post-merge, or -# when code is pushed to a branch with "ci-full-" name prefix -.cross_build_extra_job_template: &cross_build_extra_job_definition - <<: *cross_build_default_job_definition - only: - - master - - /^ci-full-.*$/ - # Native container build jobs x64-centos-7-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: centos-7 x64-centos-8-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: centos-8 x64-centos-stream-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: centos-stream x64-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9 x64-debian-10-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-10 x64-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid x64-fedora-31-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: fedora-31 x64-fedora-32-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-32 x64-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide x64-opensuse-151-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: opensuse-151 x64-ubuntu-1804-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: ubuntu-1804 x64-ubuntu-2004-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: ubuntu-2004 @@ -192,7 +155,7 @@ aarch64-debian-9-container: NAME: debian-9-cross-aarch64 armv6l-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-armv6l @@ -202,12 +165,12 @@ armv7l-debian-9-container: NAME: debian-9-cross-armv7l mips-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-mips mips64el-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-mips64el @@ -227,7 +190,7 @@ s390x-debian-9-container: NAME: debian-9-cross-s390x aarch64-debian-10-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-aarch64 @@ -257,7 +220,7 @@ mips64el-debian-10-container: NAME: debian-10-cross-mips64el mipsel-debian-10-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-mipsel @@ -267,7 +230,7 @@ ppc64le-debian-10-container: NAME: debian-10-cross-ppc64le s390x-debian-10-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-s390x @@ -282,12 +245,12 @@ armv6l-debian-sid-container: NAME: debian-sid-cross-armv6l armv7-ldebian-sid-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-armv7l i686-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-i686 @@ -302,7 +265,7 @@ mipsel-debian-sid-container: NAME: debian-sid-cross-mipsel ppc64le-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-ppc64le @@ -312,12 +275,12 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x mingw32-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide-cross-mingw32 mingw64-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide-cross-mingw64 @@ -325,72 +288,72 @@ mingw64-fedora-rawhide-container: # Native architecture build + test jobs x64-debian-9: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: debian-9 x64-debian-10: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: debian-10 x64-debian-sid: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: debian-sid x64-centos-7: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: centos-7 x64-centos-8: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: centos-8 x64-centos-stream: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: centos-stream x64-fedora-31: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: fedora-31 x64-fedora-32: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: fedora-32 x64-fedora-rawhide: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: fedora-rawhide x64-opensuse-151: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: opensuse-151 x64-ubuntu-1804: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: ubuntu-1804 x64-ubuntu-2004: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: ubuntu-2004 x64-freebsd-12-build: - <<: *cirrus_build_default_job_definition + <<: *cirrus_build_job_definition variables: NAME: freebsd-12 x64-macos-1015-build: - <<: *cirrus_build_default_job_definition + <<: *cirrus_build_job_definition variables: NAME: macos-1015 @@ -398,67 +361,67 @@ x64-macos-1015-build: # Cross compiled build jobs armv6l-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: armv6l mips64el-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: mips64el mips-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: mips aarch64-debian-10: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: aarch64 mipsel-debian-10: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: mipsel s390x-debian-10: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: s390x armv7l-debian-sid: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: armv7l i686-debian-sid: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: i686 ppc64le-debian-sid: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: ppc64le mingw32-fedora-rawhide: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: fedora-rawhide CROSS: mingw32 mingw64-fedora-rawhide: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: fedora-rawhide CROSS: mingw64 -- 2.25.4

2 2

[PATCH 00/25] Several g_auto* conversion and related small bugfixes
by Laine Stump 27 Jun '20

27 Jun '20

This started out with me noticing a memory leak in a patch that led to the realization that domain_conf.c hadn't been converted to use g_autofree yet, and each step of the way uncovered some other annoyance that I wanted to get rid of. Most of the changes are related to converting code to use g_auto*, g_new0, and g_free, but there is also a some of elimination of labels, fixing actual or theoretical memory leaks, modifications for style, etc. None of it should have any functional effect (except the fixing one or two memory leaks). Laine Stump (25): conf, vmx: check for OOM after calling xmlBufferCreate() use g_autoptr for all xmlBuffers conf: refactor virDomainBlkioDeviceParseXML to remove possible NULL dereference util: validate return from xmlNodeGetContent before use util: remove OOM error log from virGetHostnameImpl() conf: eliminate useless error label in virDomainFeaturesDefParse() util: eliminate error label in virDomainDefFormatInternalSetRootName() network: fix memory leak in networkBuildDhcpDaemonCommandLine() util: add g_autoptr cleanup function for virFirewall objects network: convert local pointers to g_auto* network: use g_free() in place of remaining VIR_FREE() network: make networkDnsmasqXmlNsDef private to bridge_driver.c define g_autoptr cleanup function for virNetworkDHCPLease network: replace VIR_ALLOC/REALLOC with g_new0/g_renew network: use proper arg type when calling virNetDevSetOnline() squash into 'network: convert local pointers to g_auto*' use g_autoptr() for all usages of virFirewallNew/Free nwfilter: define a typedef for struct ebtablesSubChainInst nwfilter replace VIR_ALLOC with g_new0 nwfilter: remove unnecessary code from ebtablesGetSubChainInsts() nwfilter: convert local pointers to use g_auto* nwfilter: convert remaining VIR_FREE() to g_free() nwfilter: transform logic in virNWFilterRuleInstSort to eliminate label nwfilter: use standard label names when reasonable replace g_new() with g_new0() for consistency src/conf/domain_conf.c | 254 +++++----- src/conf/network_conf.c | 10 +- src/datatypes.h | 2 + src/network/bridge_driver.c | 585 +++++++++------------- src/network/bridge_driver.h | 9 - src/network/bridge_driver_linux.c | 58 +-- src/network/leaseshelper.c | 16 +- src/nwfilter/nwfilter_dhcpsnoop.c | 150 +++--- src/nwfilter/nwfilter_driver.c | 13 +- src/nwfilter/nwfilter_ebiptables_driver.c | 277 ++++------ src/nwfilter/nwfilter_gentech_driver.c | 60 +-- src/nwfilter/nwfilter_learnipaddr.c | 45 +- src/qemu/qemu_backup.c | 2 +- src/util/virdnsmasq.h | 4 + src/util/virebtables.c | 24 +- src/util/virfirewall.h | 1 + src/util/viriptables.c | 14 +- src/util/virutil.c | 12 +- src/util/virxml.c | 12 +- src/vmx/vmx.c | 17 +- tests/qemuhotplugmock.c | 2 +- tests/virfirewalltest.c | 50 +- 22 files changed, 640 insertions(+), 977 deletions(-) -- 2.25.4

4 49

[PATCH libvirt v2 0/5] Fix zPCI address auto-generation on s390
by Shalini Chellathurai Saroja 26 Jun '20

26 Jun '20

The zPCI address validation or autogeneration does not work as expected in the following scenarios 1. uid = 0 and fid = 0 2. uid = 0 and fid > 0 3. uid = 0 and fid not specified 4. uid not specified and fid > 0 5. 2 zPCI devices with uid > 0 and fid not specified. This is because of the following reasons 1. If uid = 0 or fid = 0 the code assumes that user has not specified the corresponding address 2. If either uid or fid is provided, the code assumes that both uid and fid addresses are specified by the user. This patch fixes these issues. --- v2: - Call same function to reserve zPCI address when zPCI address is fully/partially/not specified by the user. - Redefine structure of zPCI address. - Add tests to verify the auto-generated xml(qemuxml2xmltest.c). - Separate/merge patches. - Minor changes based on review feedback. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg00479.html Shalini Chellathurai Saroja (5): conf: use g_autofree to ensure automatic cleanup conf: fix zPCI address auto-generation on s390 qemu: move ZPCI uid validation into device validation tests: qemu: add more tests for ZPCI on S390 tests: add test with PCI and CCW device src/conf/device_conf.c | 45 +++++------ src/conf/domain_addr.c | 77 ++++++------------- src/conf/domain_conf.c | 10 ++- src/libvirt_private.syms | 4 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 18 ++++- src/util/virpci.c | 23 ++---- src/util/virpci.h | 15 +++- .../hostdev-vfio-zpci-autogenerate-fids.args | 31 ++++++++ .../hostdev-vfio-zpci-autogenerate-fids.xml | 29 +++++++ .../hostdev-vfio-zpci-autogenerate-uids.args | 31 ++++++++ .../hostdev-vfio-zpci-autogenerate-uids.xml | 29 +++++++ .../hostdev-vfio-zpci-ccw-memballoon.args | 28 +++++++ .../hostdev-vfio-zpci-ccw-memballoon.xml | 17 ++++ .../hostdev-vfio-zpci-duplicate.xml | 30 ++++++++ ...ostdev-vfio-zpci-invalid-uid-valid-fid.xml | 21 +++++ .../hostdev-vfio-zpci-set-zero.xml | 21 +++++ .../hostdev-vfio-zpci-uid-set-zero.xml | 20 +++++ tests/qemuxml2argvtest.c | 25 ++++++ .../hostdev-vfio-zpci-autogenerate-fids.xml | 43 +++++++++++ .../hostdev-vfio-zpci-autogenerate-uids.xml | 43 +++++++++++ .../hostdev-vfio-zpci-ccw-memballoon.xml | 32 ++++++++ tests/qemuxml2xmltest.c | 10 +++ 24 files changed, 498 insertions(+), 112 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml -- 2.25.4

5 20

[libvirt PATCH v2] ci: Use openSUSE image for code style checking
by Jonathon Jongsma 26 Jun '20

26 Jun '20

CentOS does not have the cppi package, so some code style checks are skipped. Switch to a openSUSE image to do the code style checks. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..5fbc82b3dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -496,7 +496,7 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-centos-8:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest before_script: - *script_variables script: -- 2.21.3

3 3

[libvirt PATCH v3 0/2] Refuse PCI Address for ramfb device definition
by Jonathon Jongsma 26 Jun '20

26 Jun '20

Changes in this version: - Add the test case input file - modify the test itself to properly fail when an input file is missing. Jonathon Jongsma (2): qemu: ramfb video device doesn't support PCI address tests: ensure failure if input file doesn't exist src/qemu/qemu_validate.c | 8 +++++ ...video-ramfb-display-device-pci-address.xml | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 7 +++++ 3 files changed, 45 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.xml -- 2.21.3

2 3

[PATCH libvirt-dbus v3 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ ci/containers/refresh | 37 +++ src/domainsnapshot.c | 4 +- 18 files changed, 1072 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-8.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 4

[libvirt PATCH v2] qemu: ramfb video device doesn't support PCI address
by Jonathon Jongsma 25 Jun '20

25 Jun '20

Although a ramfb video device is not a PCI device, we don't currently report an error for ramfb device definitions containing a PCI address. However, a guest configured with such a device will fail to start: # virsh start test1 error: Failed to start domain test1 error: internal error: qemu unexpectedly closed the monitor: 2020-06-16T05:23:02.759221Z qemu-kvm: -device ramfb,id=video0,bus=pcie.0,addr=0x1: Device 'ramfb' can't go on PCIE bus A better approach is to reject any device definitions that contain PCI addresses. While this is a change in behavior, any existing configurations were non-functional. https://bugzilla.redhat.com/show_bug.cgi?id=1847259 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- changes in v2: - move validation to qemu-specific validation function as suggested by Laine src/qemu/qemu_validate.c | 8 ++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 9 insertions(+) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 5082a29dc7..b13c03759e 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1925,6 +1925,14 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0) return -1; + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB && + video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'address' is not supported for 'ramfb' video devices")); + return -1; + } + + return 0; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1195f9c982..f2522fa530 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2276,6 +2276,7 @@ mymain(void) QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); -- 2.21.3

2 3

[PATCH] qemuxml2xmltest: Set dummy non-hypervisor drivers
by Michal Privoznik 25 Jun '20

25 Jun '20

When parsing domain XML post parse callbacks are run and one of them might try and call API from a non-hypervisor driver (e.g. just like qemuDomainDeviceNetDefPostParse() is doing - it calls a network API). To avoid this in the test suite, set dummy drivers, which renders all non-hypervisor APIs return error. This mimics what qemuxml2argvtest does. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2xmltest.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5a124853b4..11ff17d83c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -135,6 +135,7 @@ mymain(void) char *fakerootdir; virQEMUDriverConfigPtr cfg = NULL; virHashTablePtr capslatest = NULL; + g_autoptr(virConnect) conn = NULL; capslatest = testQemuGetLatestCaps(); if (!capslatest) @@ -164,6 +165,16 @@ mymain(void) cfg = virQEMUDriverGetConfig(&driver); driver.privileged = true; + if (!(conn = virGetConnect())) + goto cleanup; + + virSetConnectInterface(conn); + virSetConnectNetwork(conn); + virSetConnectNWFilter(conn); + virSetConnectNodeDev(conn); + virSetConnectSecret(conn); + virSetConnectStorage(conn); + # define DO_TEST_INTERNAL(_name, suffix, when, ...) \ do { \ static struct testQemuInfo info = { \ @@ -1471,6 +1482,7 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); DO_TEST("downscript", NONE); + cleanup: if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.26.2

2 1

[PATCH libvirt-dbus v2 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ ci/containers/refresh | 32 +++ src/domainsnapshot.c | 4 +- 18 files changed, 1067 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-8.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 10

[libvirt PATCH] ci: Refresh Dockerfiles
by Andrea Bolognani 25 Jun '20

25 Jun '20

All targets get pip3, which is now part of the base system, and the number of native packages included in the MinGW containers is significantly reduced. The corresponding libvirt-ci commit is 4ff697ba0b5d. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. ci/containers/libvirt-centos-8.Dockerfile | 1 + .../libvirt-centos-stream.Dockerfile | 1 + ...libvirt-debian-10-cross-aarch64.Dockerfile | 1 + .../libvirt-debian-10-cross-armv6l.Dockerfile | 1 + .../libvirt-debian-10-cross-armv7l.Dockerfile | 1 + .../libvirt-debian-10-cross-i686.Dockerfile | 1 + .../libvirt-debian-10-cross-mips.Dockerfile | 1 + ...ibvirt-debian-10-cross-mips64el.Dockerfile | 1 + .../libvirt-debian-10-cross-mipsel.Dockerfile | 1 + ...libvirt-debian-10-cross-ppc64le.Dockerfile | 1 + .../libvirt-debian-10-cross-s390x.Dockerfile | 1 + ci/containers/libvirt-debian-10.Dockerfile | 1 + ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 1 + ...libvirt-debian-sid-cross-armv6l.Dockerfile | 1 + ...libvirt-debian-sid-cross-armv7l.Dockerfile | 1 + .../libvirt-debian-sid-cross-i686.Dockerfile | 1 + ...bvirt-debian-sid-cross-mips64el.Dockerfile | 1 + ...libvirt-debian-sid-cross-mipsel.Dockerfile | 1 + ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 1 + .../libvirt-debian-sid-cross-s390x.Dockerfile | 1 + ci/containers/libvirt-debian-sid.Dockerfile | 1 + ci/containers/libvirt-fedora-31.Dockerfile | 1 + ci/containers/libvirt-fedora-32.Dockerfile | 1 + ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 42 +------------------ ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 42 +------------------ .../libvirt-fedora-rawhide.Dockerfile | 1 + ci/containers/libvirt-ubuntu-2004.Dockerfile | 1 + 27 files changed, 29 insertions(+), 80 deletions(-) diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile index b6510834de..f376126d93 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -76,6 +76,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile index f65580b67d..bc75c95193 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -77,6 +77,7 @@ RUN dnf install -y centos-release-stream && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile index 3620bbdf7f..a03a7fd26a 100644 --- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile index 5d390d0160..4f673cb3e2 100644 --- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile index 2fdbe99bff..fa5fae4399 100644 --- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile index 6517a4cb2e..a3bc96ac7a 100644 --- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile index 48a45dbb7a..14844307c0 100644 --- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile index 1d997185e4..6f27e462b9 100644 --- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile index 332f2b13ed..4da9d1cb6e 100644 --- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile index ec116175fc..841706bab8 100644 --- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile index b8cd02ae69..01a5bb5a77 100644 --- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile index de795d386c..2b1c1b9855 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile index a5d9a1d655..f573b8475a 100644 --- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile index 9af186743f..2a9f81a15b 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile index 7e00d6c320..3e37184069 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile index d30468e8c6..e167a43b56 100644 --- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile index 23399cb0f5..57ef04771e 100644 --- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile index c4f70dbace..a174fb57fd 100644 --- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile index 6c093efea8..d1c412c452 100644 --- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile index e536587bc7..2dffc08895 100644 --- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile index 4e60303356..5b7b980419 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile index 40288a2d03..06bd1435d3 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-31.Dockerfile @@ -74,6 +74,7 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile index ddb6378350..7b8a3fff44 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -74,6 +74,7 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile index cdf61fe845..ac5ecc2958 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile @@ -3,97 +3,59 @@ FROM fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ - audit-libs-devel \ augeas \ autoconf \ automake \ - avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ chrony \ cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ dnsmasq \ dwarves \ ebtables \ - fuse-devel \ gcc \ gdb \ - gettext \ gettext-devel \ git \ - glib2-devel \ - glibc-devel \ glibc-langpack-en \ - glusterfs-api-devel \ - gnutls-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ libtool \ - libudev-devel \ libwsman-devel \ libxml2 \ - libxml2-devel \ libxslt \ lsof \ lvm2 \ make \ meson \ - ncurses-devel \ net-tools \ - netcf-devel \ nfs-utils \ ninja-build \ - numactl-devel \ numad \ parted \ - parted-devel \ patch \ perl \ - pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ radvd \ - readline-devel \ rpcgen \ rpm-build \ - sanlock-devel \ screen \ scrub \ sheepdog \ strace \ sudo \ - systemtap-sdt-devel \ vim \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ @@ -109,9 +71,9 @@ RUN dnf install -y \ mingw32-gettext \ mingw32-glib2 \ mingw32-gnutls \ + mingw32-headers \ mingw32-libssh2 \ mingw32-libxml2 \ - mingw32-openssl \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile index 2b7f9eeac1..e52e2fed04 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile @@ -3,97 +3,59 @@ FROM fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ - audit-libs-devel \ augeas \ autoconf \ automake \ - avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ chrony \ cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ dnsmasq \ dwarves \ ebtables \ - fuse-devel \ gcc \ gdb \ - gettext \ gettext-devel \ git \ - glib2-devel \ - glibc-devel \ glibc-langpack-en \ - glusterfs-api-devel \ - gnutls-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ libtool \ - libudev-devel \ libwsman-devel \ libxml2 \ - libxml2-devel \ libxslt \ lsof \ lvm2 \ make \ meson \ - ncurses-devel \ net-tools \ - netcf-devel \ nfs-utils \ ninja-build \ - numactl-devel \ numad \ parted \ - parted-devel \ patch \ perl \ - pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ radvd \ - readline-devel \ rpcgen \ rpm-build \ - sanlock-devel \ screen \ scrub \ sheepdog \ strace \ sudo \ - systemtap-sdt-devel \ vim \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ @@ -109,9 +71,9 @@ RUN dnf install -y \ mingw64-gettext \ mingw64-glib2 \ mingw64-gnutls \ + mingw64-headers \ mingw64-libssh2 \ mingw64-libxml2 \ - mingw64-openssl \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile index 28400a4e53..d3c97ddda0 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -75,6 +75,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile index 98178b1591..855b673f87 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -82,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ -- 2.25.4

2 2

[libvirt PATCH] qemu: ramfb video device doesn't support PCI address
by Jonathon Jongsma 25 Jun '20

25 Jun '20

Although a ramfb video device is not a PCI device, we don't currently report an error for ramfb device definitions containing a PCI address. However, a guest configured with such a device will fail to start: # virsh start test1 error: Failed to start domain test1 error: internal error: qemu unexpectedly closed the monitor: 2020-06-16T05:23:02.759221Z qemu-kvm: -device ramfb,id=video0,bus=pcie.0,addr=0x1: Device 'ramfb' can't go on PCIE bus A better approach is to reject any device definitions that contain PCI addresses. While this is a change in behavior, any existing configurations were non-functional. https://bugzilla.redhat.com/show_bug.cgi?id=1847259 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fc7fcfb0c6..1a06cb3f4b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6608,6 +6608,13 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, return -1; } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB && + video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'address' is not supported for 'ramfb' video devices")); + return -1; + } + /* it doesn't make sense to pair video device type 'none' with any other * types, there can be only a single video device in such case */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1195f9c982..f2522fa530 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2276,6 +2276,7 @@ mymain(void) QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); -- 2.21.3

3 3

[PATCH] qemuDomainDeviceNetDefPostParse: Switch order of conditions
by Michal Privoznik 25 Jun '20

25 Jun '20

A few commits back (in v6.4.0-131-gbdb8f2e418) the post parse function for domain interface was changed so that it doesn't fill in model for hostdev types of interfaces (including network type interfaces which would end up hostdevs). While the idea is sound, the execution can be a bit better: virDomainNetResolveActualType() which is used to determine runtime type of given interface is heavy gun - it connects to network driver, fetches network XML, parses it. This all is followed by check whether the interface doesn't already have model set (from domain XML). If we switch the order of these two checks then the short circuit evaluation will ensure the expensive check is done only if really needed. This commit in fact fixes qemuxml2xmltest which due to lacking fake network driver tries to connect to network:///session and start the virtnetworkd. Fortunately, because of v6.3.0-25-gf28fbb05d3 it fails to do so and virDomainNetResolveActualType() returns -1. The only reason we don't see the test failing is because our input XMLs have model and thus we are saved by the latter (now former) check. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- While this patch is technically correct (the best way to be correct), it can also be viewed as papering over the real issue. Question is, how to address that. Nor xml2xml test nor xml2argv test are creating fake network driver. Is mocking virDomainNetResolveActualType() the way to go then? Or should we create the fake network driver with networks and everything? src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2efbf1a4b3..c5b8d91f9a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5230,8 +5230,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps) { if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !virDomainNetGetModelString(net)) + !virDomainNetGetModelString(net) && + virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV) net->model = qemuDomainDefaultNetModel(def, qemuCaps); return 0; -- 2.26.2

3 4

[libvirt-cim PATCH v2 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 114 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/containers/README.rst | 14 +++ ci/containers/libvirt-centos-7.Dockerfile | 96 +++++++++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 56 +++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 56 +++++++++ .../libvirt-fedora-rawhide.Dockerfile | 57 +++++++++ ci/containers/refresh | 27 +++++ 9 files changed, 448 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 3

[RFC PATCH] docs: backup: Convert XML documentation to RST
by Peter Krempa 25 Jun '20

25 Jun '20

Switch to the new format for easier extension. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was a surprisingly easy conversion done using: pandoc --from html --to rst --toc --columns 80 --standalone formatbackup.html.in -o formatbackup.rst The file generated by pandoc required following manual tweaks: 1) table of contents command needed to be moved after the first heading 2) definition list entries were not separated by an empty line 3) XML examples had one extra line with spaces only (Faithfully ported from html) Here both versions can be compared: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/611434730/artifacts/website/form… https://libvirt.org/formatbackup.html docs/formatbackup.html.in | 191 -------------------------------------- docs/formatbackup.rst | 149 +++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 191 deletions(-) delete mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatbackup.rst diff --git a/docs/formatbackup.html.in b/docs/formatbackup.html.in deleted file mode 100644 index 9e69d8f7d3..0000000000 --- a/docs/formatbackup.html.in +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> - <body> - <h1>Backup XML format</h1> - - <ul id="toc"></ul> - - <h2><a id="BackupAttributes">Backup XML</a></h2> - - <p> - Creating a backup, whether full or incremental, is done - via <code>virDomainBackupBegin()</code>, which takes an XML - description of the actions to perform, as well as an optional - second XML document <a href="formatcheckpoint.html">describing a - checkpoint</a> to create at the same point in time. See - also <a href="kbase/domainstatecapture.html">a comparison</a> between - the various state capture APIs. - </p> - <p> - There are two general modes for backups: a push mode (where the - hypervisor writes out the data to the destination file, which - may be local or remote), and a pull mode (where the hypervisor - creates an NBD server that a third-party client can then read as - needed, and which requires the use of temporary storage, - typically local, until the backup is complete). - </p> - <p> - The instructions for beginning a backup job are provided as - attributes and elements of the - top-level <code>domainbackup</code> element. This element - includes an optional attribute <code>mode</code> which can be - either "push" or "pull" (default - push). <code>virDomainBackupGetXMLDesc()</code> can be used to - see the actual values selected for elements omitted during - creation (for example, learning which port the NBD server is - using in the pull model or what file names libvirt generated - when none were supplied). The following child elements and attributes - are supported: - </p> - <dl> - <dt><code>incremental</code></dt> - <dd>An optional element giving the name of an existing - checkpoint of the domain, which will be used to make this - backup an incremental one. In the push model, only changes - since the named checkpoint are written to the destination. In - the pull model, the NBD server uses the - NBD_OPT_SET_META_CONTEXT extension to advertise to the client - which portions of the export contain changes since the named - checkpoint. If omitted, a full backup is performed. - </dd> - <dt><code>server</code></dt> - <dd>Present only for a pull mode backup. Contains the same - attributes as - the <a href="formatdomain.html#elementsDisks"><code>protocol</code> - element of a disk</a> attached via NBD in the domain (such as - transport, socket, name, port, or tls), necessary to set up an - NBD server that exposes the content of each disk at the time - the backup is started. - </dd> - <dt><code>disks</code></dt> - <dd>An optional listing of instructions for disks participating - in the backup (if omitted, all disks participate and libvirt - attempts to generate filenames by appending the current - timestamp as a suffix). If the entire element was omitted on - input, then all disks participate in the backup, otherwise, - only the disks explicitly listed which do not also - use <code>backup='no'</code> will participate. On output, this - is the state of each of the domain's disk in relation to the - backup operation. - <dl> - <dt><code>disk</code></dt> - <dd>This sub-element describes the backup properties of a - specific disk, with the following attributes and child - elements: - <dl> - <dt><code>name</code></dt> - <dd>A mandatory attribute which must match - the <code><target dev='name'/></code> - of one of - the <a href="formatdomain.html#elementsDisks">disk - devices</a> specified for the domain at the time of - the checkpoint.</dd> - <dt><code>backup</code></dt> - <dd>Setting this attribute to <code>yes</code>(default) specifies - that the disk should take part in the backup and using - <code>no</code> excludes the disk from the backup.</dd> - <dt><code>exportname</code></dt> - <dd>Allows modification of the NBD export name for the given disk. - By default equal to disk target. - Valid only for pull mode backups.</dd> - <dt><code>exportbitmap</code></dt> - <dd>Allows modification of the name of the bitmap describing dirty - blocks for an incremental backup exported via NBD export name - for the given disk. - Valid only for pull mode backups.</dd> - <dt><code>type</code></dt> - <dd>A mandatory attribute to describe the type of the - disk, except when <code>backup='no'</code> is - used. Valid values include <code>file</code>, or - <code>block</code>. - Similar to a disk declaration for a domain, the choice of type - controls what additional sub-elements are needed to describe - the destination.</dd> - <dt><code>target</code></dt> - <dd>Valid only for push mode backups, this is the - primary sub-element that describes the file name of - the backup destination, similar to - the <code>source</code> sub-element of a domain - disk. An optional sub-element <code>driver</code> can - also be used, with an attribute <code>type</code> to - specify a destination format different from - qcow2. See documentation for <code>scratch</code> below for - additional configuration.</dd> - <dt><code>scratch</code></dt> - <dd>Valid only for pull mode backups, this is the - primary sub-element that describes the file name of - the local scratch file to be used in facilitating the - backup, and is similar to the <code>source</code> - sub-element of a domain disk. Currently only <code>file</code> - and <code>block</code> scratch storage is supported. The - <code>file</code> scratch file is created and deleted by - libvirt in the given location. A <code>block</code> scratch - device must exist prior to starting the backup and is formatted. - The block device must have enough space for the corresponding - disk data including format overhead. - - If <code>VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL</code> flag is - used the file for a scratch of <code>file</code> type must - exist with the correct format and size to hold the copy and is - used without modification. The file is not deleted after the - backup but the contents of the file don't make sense outside - of the backup. The same applies for the block device which - must be formatted appropriately. - - Similarly to the domain - <a href="formatdomain.html#elementsDisks"><code>disk</code></a> - definition <code>scratch</code> and <code>target</code> can - contain <code>seclabel</code> and/or <code>encryption</code> - subelements to configure the corresponding properties. - </dd> - </dl> - </dd> - </dl> - </dd> - </dl> - - <h2><a id="example">Examples</a></h2> - - <p>Use <code>virDomainBackupBegin()</code> to perform a full - backup using push mode. The example lets libvirt pick the - destination and format for 'vda', fully specifies that we want a - raw backup of 'vdb', and omits 'vdc' from the operation. - </p> - <pre> -<domainbackup> - <disks> - <disk name='vda' backup='yes'/> - <disk name='vdb' type='file'> - <target file='/path/to/vdb.backup'/> - <driver type='raw'/> - </disk> - <disk name='vdc' backup='no'/> - </disks> -</domainbackup> - </pre> - - <p>If the previous full backup also passed a parameter describing - <a href="formatcheckpoint.html">checkpoint XML</a> that resulted - in a checkpoint named <code>1525889631</code>, we can make - another call to <code>virDomainBackupBegin()</code> to perform - an incremental backup of just the data changed since that - checkpoint, this time using the following XML to start a pull - model export of the 'vda' and 'vdb' disks, where a third-party - NBD client connecting to '/path/to/server' completes the backup - (omitting 'vdc' from the explicit list has the same effect as - the backup='no' from the previous example): - </p> - <pre> -<domainbackup mode="pull"> - <incremental>1525889631</incremental> - <server transport="unix" socket="/path/to/server"/> - <disks> - <disk name='vda' backup='yes' type='file'> - <scratch file='/path/to/file1.scratch'/> - </disk> - </disks> -</domainbackup> - </pre> - </body> -</html> diff --git a/docs/formatbackup.rst b/docs/formatbackup.rst new file mode 100644 index 0000000000..66583f562b --- /dev/null +++ b/docs/formatbackup.rst @@ -0,0 +1,149 @@ +Backup XML format +================= + +.. contents:: + +Backup XML +---------- + +Creating a backup, whether full or incremental, is done via +``virDomainBackupBegin()``, which takes an XML description of the actions to +perform, as well as an optional second XML document `describing a +checkpoint <formatcheckpoint.html>`__ to create at the same point in time. See +also `a comparison <kbase/domainstatecapture.html>`__ between the various state +capture APIs. + +There are two general modes for backups: a push mode (where the hypervisor +writes out the data to the destination file, which may be local or remote), and +a pull mode (where the hypervisor creates an NBD server that a third-party +client can then read as needed, and which requires the use of temporary storage, +typically local, until the backup is complete). + +The instructions for beginning a backup job are provided as attributes and +elements of the top-level ``domainbackup`` element. This element includes an +optional attribute ``mode`` which can be either "push" or "pull" (default push). +``virDomainBackupGetXMLDesc()`` can be used to see the actual values selected +for elements omitted during creation (for example, learning which port the NBD +server is using in the pull model or what file names libvirt generated when none +were supplied). The following child elements and attributes are supported: + +``incremental`` + An optional element giving the name of an existing checkpoint of the domain, + which will be used to make this backup an incremental one. In the push model, + only changes since the named checkpoint are written to the destination. In + the pull model, the NBD server uses the NBD_OPT_SET_META_CONTEXT extension to + advertise to the client which portions of the export contain changes since + the named checkpoint. If omitted, a full backup is performed. + +``server`` + Present only for a pull mode backup. Contains the same attributes as the + ```protocol`` element of a disk <formatdomain.html#elementsDisks>`__ attached + via NBD in the domain (such as transport, socket, name, port, or tls), + necessary to set up an NBD server that exposes the content of each disk at + the time the backup is started. + +``disks`` + An optional listing of instructions for disks participating in the backup (if + omitted, all disks participate and libvirt attempts to generate filenames by + appending the current timestamp as a suffix). If the entire element was + omitted on input, then all disks participate in the backup, otherwise, only + the disks explicitly listed which do not also use ``backup='no'`` will + participate. On output, this is the state of each of the domain's disk in + relation to the backup operation. + + ``disk`` + This sub-element describes the backup properties of a specific disk, with + the following attributes and child elements: + + ``name`` + A mandatory attribute which must match the ``<target dev='name'/>`` of + one of the `disk devices <formatdomain.html#elementsDisks>`__ specified + for the domain at the time of the checkpoint. + + ``backup`` + Setting this attribute to ``yes``\ (default) specifies that the disk + should take part in the backup and using ``no`` excludes the disk from + the backup. + + ``exportname`` + Allows modification of the NBD export name for the given disk. By + default equal to disk target. Valid only for pull mode backups. + + ``exportbitmap`` + Allows modification of the name of the bitmap describing dirty blocks + for an incremental backup exported via NBD export name for the given + disk. Valid only for pull mode backups. + + ``type`` + A mandatory attribute to describe the type of the disk, except when + ``backup='no'`` is used. Valid values include ``file``, or ``block``. + Similar to a disk declaration for a domain, the choice of type controls + what additional sub-elements are needed to describe the destination. + + ``target`` + Valid only for push mode backups, this is the primary sub-element that + describes the file name of the backup destination, similar to the + ``source`` sub-element of a domain disk. An optional sub-element + ``driver`` can also be used, with an attribute ``type`` to specify a + destination format different from qcow2. See documentation for + ``scratch`` below for additional configuration. + + ``scratch`` + Valid only for pull mode backups, this is the primary sub-element that + describes the file name of the local scratch file to be used in + facilitating the backup, and is similar to the ``source`` sub-element + of a domain disk. Currently only ``file`` and ``block`` scratch storage + is supported. The ``file`` scratch file is created and deleted by + libvirt in the given location. A ``block`` scratch device must exist + prior to starting the backup and is formatted. The block device must + have enough space for the corresponding disk data including format + overhead. If ``VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL`` flag is used + the file for a scratch of ``file`` type must exist with the correct + format and size to hold the copy and is used without modification. The + file is not deleted after the backup but the contents of the file don't + make sense outside of the backup. The same applies for the block device + which must be formatted appropriately. Similarly to the domain + ```disk`` <formatdomain.html#elementsDisks>`__ definition ``scratch`` + and ``target`` can contain ``seclabel`` and/or ``encryption`` + subelements to configure the corresponding properties. + +Examples +-------- + +Use ``virDomainBackupBegin()`` to perform a full backup using push mode. The +example lets libvirt pick the destination and format for 'vda', fully specifies +that we want a raw backup of 'vdb', and omits 'vdc' from the operation. + +:: + + <domainbackup> + <disks> + <disk name='vda' backup='yes'/> + <disk name='vdb' type='file'> + <target file='/path/to/vdb.backup'/> + <driver type='raw'/> + </disk> + <disk name='vdc' backup='no'/> + </disks> + </domainbackup> + +If the previous full backup also passed a parameter describing `checkpoint +XML <formatcheckpoint.html>`__ that resulted in a checkpoint named +``1525889631``, we can make another call to ``virDomainBackupBegin()`` to +perform an incremental backup of just the data changed since that checkpoint, +this time using the following XML to start a pull model export of the 'vda' and +'vdb' disks, where a third-party NBD client connecting to '/path/to/server' +completes the backup (omitting 'vdc' from the explicit list has the same effect +as the backup='no' from the previous example): + +:: + + <domainbackup mode="pull"> + <incremental>1525889631</incremental> + <server transport="unix" socket="/path/to/server"/> + <disks> + <disk name='vda' backup='yes' type='file'> + <scratch file='/path/to/file1.scratch'/> + </disk> + </disks> + </domainbackup> -- 2.26.2

1 0

[PATCH libvirt-cim 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 130 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 ++++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 89 ++++++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 56 ++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 56 ++++++++ .../libvirt-fedora-rawhide.Dockerfile | 65 +++++++++ ci/containers/refresh | 27 ++++ 9 files changed, 465 insertions(+), 4 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 7

[PATCH 0/6] kbase: Improve incremental backup docs
by Peter Krempa 25 Jun '20

25 Jun '20

Refactor some sections, get rid of bash in favor of pseudo-code and describe block-commit. Peter Krempa (6): kbase: incrementalbackupinternals: Add snapshot terminology kbase: incrementalbackupinternals: Clarify language in snapshots section kbase: incrementalbackupinternals: Add secion on bitmap handling in shell kbase: incrementalbackupinternals: Add section on 'qemu-img bitmap' use kbase: incrementalbackupinternals: Replace bash with pseudocode kbase: incrementalbackupinternals: Describe 'block commit' docs/kbase/incrementalbackupinternals.rst | 175 +++++++++++++++------- 1 file changed, 121 insertions(+), 54 deletions(-) -- 2.26.2

2 14

[PATCH] NEWS: mention fix for crash in qemuDomainBlockCommit
by Peter Krempa 25 Jun '20

25 Jun '20

There were two upstream issues filed for the problem so it's worth mentioning. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2fc43c31b9..54b1e4a992 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -51,6 +51,11 @@ v6.5.0 (unreleased) * **Bug fixes** + * qemu: fixed crash in ``qemuDomainBlockCommit`` + + This release fixes a regression which was introduced in libvirt v6.4.0 + where libvirtd always crashes when a block commit of a disk is requested. + v6.4.0 (2020-06-02) =================== -- 2.26.2

2 1

[PATCH] network: Fix a race condition when shutdown & start vm at the same time
by Bingsong Si 25 Jun '20

25 Jun '20

when shutdown vm, the qemuProcessStop cleanup virtual interface in two steps: 1. qemuProcessKill kill qemu process, and vif disappeared 2. ovs-vsctl del-port from the brige if start a vm in the middle of the two steps, the new vm will reused the vif, but removed from bridge by step 2 Signed-off-by: Bingsong Si <owen.si(a)ucloud.cn> --- src/qemu/qemu_process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d36088ba98..706248815a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7483,9 +7483,11 @@ void qemuProcessStop(virQEMUDriverPtr driver, if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_MIDONET) { ignore_value(virNetDevMidonetUnbindPort(vport)); } else if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); + virMacAddr mac; + if (virNetDevGetMAC(net->ifname, &mac) < 0 || !virMacAddrCmp(&mac, &net->mac)) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); } } -- 2.18.2

6 10

[libvirt-publican PATCH 0/3] introduce GitLab CI and merge requests
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

The publican theme is used by the libvirt-appdev-guide-python, so we should test it. Daniel P. Berrangé (3): cfg: remove obsolete "release" config entry gitlab: introduce CI jobs for building content gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 118 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/containers/README.rst | 14 +++ ci/containers/libvirt-centos-7.Dockerfile | 83 ++++++++++++ .../libvirt-centos-stream.Dockerfile | 52 ++++++++ ci/containers/libvirt-debian-10.Dockerfile | 53 ++++++++ ci/containers/libvirt-debian-9.Dockerfile | 56 +++++++++ ci/containers/libvirt-debian-sid.Dockerfile | 53 ++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 50 ++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 50 ++++++++ .../libvirt-fedora-rawhide.Dockerfile | 51 ++++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 56 +++++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 53 ++++++++ ci/containers/refresh | 22 ++++ publican.cfg | 1 - 16 files changed, 739 insertions(+), 5 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 6

[PATCH libvirt-dbus 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ src/domainsnapshot.c | 4 +- 16 files changed, 1021 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-8.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile -- 2.26.2

2 6

[GSoC][PATCH 0/2] Extracting qemu domain jobs into a separate file
by Prathamesh Chavan 24 Jun '20

24 Jun '20

These patches aim towards extracting out the domain jobs into a separate file. Curretnly, we have named it as `qemu_domainjob`, keeping it similar to the already exisiting `qemu_blockjob` files. Prathamesh Chavan (2): qemu_domain: Avoid using qemuDomainObjPrivatePtr as parameter qemu_domainjob: moved domain job APIs to a separate file po/POTFILES.in | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_domain.c | 1172 +----------------------------------- src/qemu/qemu_domain.h | 247 +------- src/qemu/qemu_domainjob.c | 1192 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domainjob.h | 269 +++++++++ 6 files changed, 1472 insertions(+), 1411 deletions(-) create mode 100644 src/qemu/qemu_domainjob.c create mode 100644 src/qemu/qemu_domainjob.h -- 2.17.1

2 3

[PATCH] spec: Add the build dependency of make
by Han Han 24 Jun '20

24 Jun '20

For some minimal OS like fedora cloud image, the make is not installed by default. Signed-off-by: Han Han <hhan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index cd7c33ab1a..9f24e06aa4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -269,6 +269,7 @@ BuildRequires: python36-docutils BuildRequires: python3-docutils %endif BuildRequires: gcc +BuildRequires: make BuildRequires: git %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter -- 2.24.0.rc1

2 1

[PATCH 0/3] leaseshelper: Wait to acquire PID file
by Michal Privoznik 24 Jun '20

24 Jun '20

Patch 1/3 is for demonstration purposes only. The rest patches actual problem.I was also thinking of making the PID file per bridge, i.e. include bridge name in the name (e.g. /var/run/virbr0_leaseshelper.pid) to decrease pressure on the single PID file. However, DHCP transactions are not that frequent IMO so it's not really a bottle neck nor performance issue. Michal Prívozník (3): *** DO NOT APPLY UPSTREAM *** leaseshelper: Wait to acquire PID file leaseshelper: Report more errors src/network/leaseshelper.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) -- 2.26.2

3 9

[libvirt-sandbox PATCH v2] gitlab: introduce CI jobs testing git master & distro libvirt
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

The sandbox build needs to validate one axis - A variety of libvirt versions We test a variety of libvirt versions by running a build against the distro provided libvirt packages. All that is then missing is a build against the latest libvirt git master, which only needs to be run on a single distro, for which Ubuntu 20.04 is picked as a stable long life base. Several distros are not included because they don't provide the package pre-requisites. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 178 ++++++++++++++++++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-debian-10.Dockerfile | 64 +++++++ ci/containers/libvirt-debian-9.Dockerfile | 67 +++++++ ci/containers/libvirt-debian-sid.Dockerfile | 64 +++++++ ci/containers/libvirt-fedora-31.Dockerfile | 64 +++++++ ci/containers/libvirt-fedora-32.Dockerfile | 64 +++++++ .../libvirt-fedora-rawhide.Dockerfile | 65 +++++++ ci/containers/libvirt-opensuse-151.Dockerfile | 66 +++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 67 +++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 69 +++++++ ci/containers/refresh | 27 +++ 12 files changed, 809 insertions(+) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..3de5392 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,91 @@ stages: - prebuild + - containers + - builds + +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-sandbox/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.script_variables: &script_variables | + export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" + export SCRATCH_DIR="/tmp/scratch" + export VROOT="$SCRATCH_DIR/vroot" + export CCACHE_DIR="$PWD/ccache" + export CCACHE_MAXSIZE="500M" + export PATH="$CCACHE_WRAPPERSDIR:$VROOT/bin:$PATH" + export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig" + export XDG_DATA_DIRS="$VROOT/share:/usr/share" + export GI_TYPELIB_PATH="$VROOT/lib/girepository-1.0" + export LD_LIBRARY_PATH="$VROOT/lib" + +.git_native_build_job_template: &git_native_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + cache: + paths: + - ccache/ + key: "$CI_JOB_NAME" + before_script: + - *script_variables + script: + - pushd "$PWD" + - mkdir -p "$SCRATCH_DIR" + - cd "$SCRATCH_DIR" + - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git + - git clone --depth 1 https://gitlab.com/libvirt/libvirt-glib.git + - mkdir libvirt/build + - cd libvirt/build + - ../autogen.sh --prefix="$VROOT" --without-libvirtd + - $MAKE install + - cd ../.. + - mkdir libvirt-glib/build + - cd libvirt-glib/build + - ../autogen.sh --prefix="$VROOT" + - $MAKE install + - popd + - mkdir build + - cd build + - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc + - $MAKE + - $MAKE check + - $MAKE install + - $MAKE dist + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta libvirt-sandbox*.tar.gz ; fi + +.dist_native_build_job_template: &dist_native_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + cache: + paths: + - ccache/ + key: "$CI_JOB_NAME" + before_script: + - *script_variables + script: + - mkdir build + - cd build + - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc + - $MAKE + - $MAKE check + - $MAKE install + - $MAKE dist + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild -ta libvirt-sandbox*.tar.gz ; fi + # Check that all commits are signed-off for the DCO. # Skip on "libvirt" namespace, since we only need to run @@ -14,3 +99,96 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE == 'libvirt' + +x64-debian-9-container: + <<: *container_job_definition + variables: + NAME: debian-9 + +x64-debian-10-container: + <<: *container_job_definition + variables: + NAME: debian-10 + +x64-debian-sid-container: + <<: *container_job_definition + variables: + NAME: debian-sid + +x64-fedora-31-container: + <<: *container_job_definition + variables: + NAME: fedora-31 + +x64-fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +x64-fedora-rawhide-container: + <<: *container_job_definition + variables: + NAME: fedora-rawhide + +x64-opensuse-151-container: + <<: *container_job_definition + variables: + NAME: opensuse-151 + +x64-ubuntu-1804-container: + <<: *container_job_definition + variables: + NAME: ubuntu-1804 + +x64-ubuntu-2004-container: + <<: *container_job_definition + variables: + NAME: ubuntu-2004 + + + +x64-debian-9-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-9 + +x64-debian-10-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-10 + +x64-debian-sid-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-sid + +x64-fedora-31-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-31 + +x64-fedora-32-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-32 + +x64-fedora-rawhide-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-rawhide + +x64-opensuse-151-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: opensuse-151 + RPM: skip + +x64-ubuntu-1804-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: ubuntu-1804 + +x64-ubuntu-2004-git-build: + <<: *git_native_build_job_definition + variables: + NAME: ubuntu-2004 diff --git a/ci/containers/README.rst b/ci/containers/README.rst new file mode 100644 index 0000000..530897e --- /dev/null +++ b/ci/containers/README.rst @@ -0,0 +1,14 @@ +CI job assets +============= + +This directory contains assets used in the automated CI jobs, most +notably the Dockerfiles used to build container images in which the +CI jobs then run. + +The ``refresh`` script is used to re-create the Dockerfiles using the +``lcitool`` command that is provided by repo +https://gitlab.com/libvirt/libvirt-ci + +The containers are built during the CI process and cached in the GitLab +container registry of the project doing the build. The cached containers +can be deleted at any time and will be correctly rebuilt. diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile new file mode 100644 index 0000000..51f79e2 --- /dev/null +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -0,0 +1,64 @@ +FROM debian:10 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-debian-9.Dockerfile b/ci/containers/libvirt-debian-9.Dockerfile new file mode 100644 index 0000000..cf94a67 --- /dev/null +++ b/ci/containers/libvirt-debian-9.Dockerfile @@ -0,0 +1,67 @@ +FROM debian:9 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +RUN pip3 install \ + meson==0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile new file mode 100644 index 0000000..6a34306 --- /dev/null +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -0,0 +1,64 @@ +FROM debian:sid + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile new file mode 100644 index 0000000..6e0da18 --- /dev/null +++ b/ci/containers/libvirt-fedora-31.Dockerfile @@ -0,0 +1,64 @@ +FROM fedora:31 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile new file mode 100644 index 0000000..5d86af2 --- /dev/null +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -0,0 +1,64 @@ +FROM fedora:32 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile new file mode 100644 index 0000000..8a299fd --- /dev/null +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -0,0 +1,65 @@ +FROM fedora:rawhide + +RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ + dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile new file mode 100644 index 0000000..8028a21 --- /dev/null +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -0,0 +1,66 @@ +FROM opensuse/leap:15.1 + +RUN zypper update -y && \ + zypper install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-locale \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-glib-devel \ + libxml2-devel \ + lsof \ + make \ + net-tools \ + ninja \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static-devel \ + zlib-devel \ + zlib-devel-static && \ + zypper clean --all && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +RUN pip3 install \ + meson==0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile new file mode 100644 index 0000000..bea1fb4 --- /dev/null +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:18.04 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +RUN pip3 install \ + meson==0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile new file mode 100644 index 0000000..0c2c4d6 --- /dev/null +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -0,0 +1,69 @@ +FROM ubuntu:20.04 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + liblzma-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + valac \ + vim \ + xsltproc \ + zlib1g-dev && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/refresh b/ci/containers/refresh new file mode 100755 index 0000000..26febb0 --- /dev/null +++ b/ci/containers/refresh @@ -0,0 +1,27 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|centos)') + +for host in $HOSTS +do + if test "$host" = "libvirt-ubuntu-2004" + then + $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,libvirt-sandbox > $host.Dockerfile + else + $LCITOOL dockerfile $host libvirt+dist,libvirt-glib+dist,libvirt-sandbox > $host.Dockerfile + fi +done -- 2.26.2

2 1

[PATCH v4 00/20] audio: deprecate -soundhw
by Gerd Hoffmann 24 Jun '20

24 Jun '20

v2: - use g_assert_not_reached() for stubs. - add deprecation notice. v3: - rebase to latest master. - adapt to armbru's device initialization changes. v4: - reorder patches, drop temporary -global setup, go straight to -machine pcspk-audiodev= instead. - update error messages and documentation accordingly. Gerd Hoffmann (20): stubs: add isa_create_simple stubs: add pci_create_simple audio: add deprecated_register_soundhw audio: deprecate -soundhw ac97 audio: deprecate -soundhw es1370 audio: deprecate -soundhw adlib audio: deprecate -soundhw cs4231a audio: deprecate -soundhw gus audio: deprecate -soundhw sb16 audio: deprecate -soundhw hda pc_basic_device_init: pass PCMachineState pc_basic_device_init: drop has_pit arg pc_basic_device_init: drop no_vmport arg softmmu: initialize spice and audio earlier audio: rework pcspk_init() audio: create pcspk device early audio: deprecate -soundhw pcspk audio: add soundhw deprecation notice pcspk: update docs/system/target-i386-desc.rst.inc audio: set default value for pcspk.iobase property include/hw/audio/pcspk.h | 12 ++---------- include/hw/audio/soundhw.h | 2 ++ include/hw/i386/pc.h | 6 +++--- hw/audio/ac97.c | 9 ++------- hw/audio/adlib.c | 8 +------- hw/audio/cs4231a.c | 8 +------- hw/audio/es1370.c | 9 ++------- hw/audio/gus.c | 8 +------- hw/audio/intel-hda.c | 3 +++ hw/audio/pcspk.c | 26 ++++++++++++++++++++++---- hw/audio/sb16.c | 9 ++------- hw/audio/soundhw.c | 24 +++++++++++++++++++++++- hw/i386/pc.c | 14 ++++++++------ hw/i386/pc_piix.c | 3 +-- hw/i386/pc_q35.c | 3 +-- hw/isa/i82378.c | 2 +- qdev-monitor.c | 2 ++ softmmu/vl.c | 12 ++++++------ stubs/isa-bus.c | 7 +++++++ stubs/pci-bus.c | 7 +++++++ docs/system/deprecated.rst | 9 +++++++++ docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- stubs/Makefile.objs | 2 ++ 23 files changed, 120 insertions(+), 78 deletions(-) create mode 100644 stubs/isa-bus.c create mode 100644 stubs/pci-bus.c -- 2.18.4

2 22

[libvirt PATCH] gitlab: test RPM build in CI jobs
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

We need to test the native and mingw RPM builds, but since the mingw RPM does both arches at once, we only need to test it on one of the two mingw jobs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..e5babfeba2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,7 @@ stages: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE distcheck + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta libvirt*.tar.xz ; fi # Extra native build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -111,6 +112,8 @@ stages: - cd build - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - $MAKE + - if test -x /usr/bin/rpmbuild && "$RPM" != "skip"; then $MAKE dist ; fi + - if test -x /usr/bin/rpmbuild && "$RPM" != "skip"; then rpmbuild --nodeps -ta --define "_sourcedir `pwd`" mingw-libvirt.spec ; fi # Extra cross build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -378,6 +381,7 @@ x64-opensuse-151: <<: *native_build_default_job_definition variables: NAME: opensuse-151 + RPM: skip x64-ubuntu-1804: <<: *native_build_extra_job_definition @@ -461,6 +465,7 @@ mingw32-fedora-rawhide: variables: NAME: fedora-rawhide CROSS: mingw32 + RPM: skip mingw64-fedora-rawhide: <<: *cross_build_default_job_definition -- 2.26.2

2 1

[libvirt PATCH 0/2] AUTHORS: update maintainer list
by Ján Tomko 24 Jun '20

24 Jun '20

During the switch to gitlab, not all people listed as maintainers asked to be added to the libvirt group: https://gitlab.com/libvirt/libvirt/-/project_members Remove those who haven't and add Pino, who was missing from the list. I omitted Chris Lalancette and Lily Nie, since they have not committed anything to the main libvirt repo in the past ~10 years. Ján Tomko (2): AUTHORS: clean up maintainer list AUTHORS: add Pino Toscano as a maintainer AUTHORS.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.25.4

2 3

[libvirt PATCH v2] qemu: format 'ramfb' attribute for mediated devices
by Jonathon Jongsma 23 Jun '20

23 Jun '20

It's possible to use ramfb as the boot display of an assigned vgpu device. This was introduced in 4b95738c, but unfortunately the attribute was not formatted into the xml output for such a device. This patch fixes that oversight and adds a xml2xml test to verify proper behavior. https://bugzilla.redhat.com/show_bug.cgi?id=1847791 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v2: - drop unnecessary input xml file for test src/conf/domain_conf.c | 3 ++ ...stdev-mdev-display-ramfb.x86_64-latest.xml | 44 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 3 files changed, 48 insertions(+) create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0855a2476..da02255142 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28343,6 +28343,9 @@ virDomainHostdevDefFormat(virBufferPtr buf, if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT) virBufferAsprintf(buf, " display='%s'", virTristateSwitchTypeToString(mdevsrc->display)); + if (mdevsrc->ramfb != VIR_TRISTATE_SWITCH_ABSENT) + virBufferAsprintf(buf, " ramfb='%s'", + virTristateSwitchTypeToString(mdevsrc->display)); } } diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml new file mode 100644 index 0000000000..c134400486 --- /dev/null +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci' display='on' ramfb='on'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a52768e9ce..5a124853b4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -529,6 +529,7 @@ mymain(void) QEMU_CAPS_VFIO_PCI_DISPLAY, QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_VNC); + DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST("pci-rom", NONE); DO_TEST("pci-rom-disabled", NONE); DO_TEST("pci-rom-disabled-invalid", NONE); -- 2.21.3

3 2

[PATCH v2 0/3] Support hooks placed in several files
by Dmitry Nesterenko 23 Jun '20

23 Jun '20

Libvirt hook calls only one script (/etc/libvirt/hooks/<driver>) now. This is not convenient if scripts for hook are provided by many vendors. Script one vendor can replace previously installed script other vendor. These patches are changing behaviour of hooks to usual linux scheme - running all scripts from the directories /etc/libvirt/hooks/<driver>.d/ in alphabetical order. If we find script in old place we will execute it as first for backward compatibility. Dmitry Nesterenko (3): virhook: refactoring for support hooks placed in several files virhook: support hooks placed in several files virhook: changes in docs about support hooks placed in several files NEWS.rst | 6 ++ docs/hooks.html.in | 27 ++++++++ src/util/virhook.c | 164 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 175 insertions(+), 22 deletions(-) -- 2.18.4

2 6

[PATCH v7 00/10] TPM Proxy (H_TPM_COMM) support for PPC64
by Daniel Henrique Barboza 23 Jun '20

23 Jun '20

This is a rebase to fix conflicts with master (at 2072c395419b) and to adapt to the new NEWS.rst format. Changes were simple, so I didn't remove any reviewed-by/tested-by tags from the previous version. changes in v7: - fixed conflicts in patch 02 after "cpu.migratable" and "fw_cfg" caps went upstream - fixed a conflict in patch 05 after virSysinfoDefPtr was added to the domain - changed to the new NEWS.rst format instead of docs/news.xml in patch 10 Gitlab tree: https://gitlab.com/danielhb/libvirt/tree/spapr_tpm_proxy_v7 v6 link: https://www.redhat.com/archives/libvir-list/2020-June/msg00051.html v5 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00997.html v4 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00814.html v3 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00642.html v2 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00604.html v1 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00351.html Daniel Henrique Barboza (10): docs: documentation and schema for the new TPM Proxy model qemu: Extend QEMU capabilities with 'spapr-tpm-proxy' qemu_extdevice.c: remove unneeded 'ret' variable qemu_tpm, security, tests: change 'switch' clauses for 'if' conf, qemu, security, tests: introducing 'def->tpms' array qemu: add validations after TPM Proxy model introduction tests: add XML schema tests for the TPM Proxy device qemu: build command line for the TPM Proxy device tests/qemuxml2argvtest.c: add TPM Proxy command line tests NEWS.rst: update for the new TPM Proxy device NEWS.rst | 13 ++++ docs/formatdomain.html.in | 19 ++++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 50 +++++++----- src/conf/domain_conf.h | 6 +- src/qemu/qemu_alias.c | 9 ++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 10 ++- src/qemu/qemu_command.c | 59 +++++++++++--- src/qemu/qemu_domain.c | 68 ++++++++++++++--- src/qemu/qemu_domain_address.c | 11 ++- src/qemu/qemu_extdevice.c | 24 +++--- src/qemu/qemu_tpm.c | 76 +++++++++---------- src/qemu/qemu_validate.c | 19 +++++ src/security/security_dac.c | 8 +- src/security/security_selinux.c | 44 +++++------ src/security/virt-aa-helper.c | 14 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/ppc64-tpm-double.xml | 34 +++++++++ .../ppc64-tpmproxy-double.xml | 38 ++++++++++ .../ppc64-tpmproxy-single.ppc64-latest.args | 34 +++++++++ .../ppc64-tpmproxy-single.xml | 33 ++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 37 +++++++++ .../ppc64-tpmproxy-with-tpm.xml | 36 +++++++++ tests/qemuxml2argvtest.c | 33 +++++--- .../ppc64-tpmproxy-single.ppc64-latest.xml | 42 ++++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.xml | 46 +++++++++++ tests/qemuxml2xmltest.c | 2 + 31 files changed, 623 insertions(+), 152 deletions(-) create mode 100644 tests/qemuxml2argvdata/ppc64-tpm-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml -- 2.26.2

2 21

[PATCH] qemu_command: Fix IOMMU validator name in two comments
by Michal Privoznik 23 Jun '20

23 Jun '20

When building command line for IOMMU or machine, there are two comments which mention function that validate IOMMU. But they both refer to old name which was changed in v6.3.0-rc1~246. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 73a655a0bc..e2cbdf0925 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6180,7 +6180,7 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, case VIR_DOMAIN_IOMMU_MODEL_INTEL: { g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; - /* qemuDomainDeviceDefValidateIOMMU() already made sure we have + /* qemuValidateDomainDeviceDefIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: * here we handle the former case, while the latter is taken care * of in qemuBuildMachineCommandLine() */ @@ -6833,7 +6833,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, if (def->iommu) { switch (def->iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: - /* qemuDomainDeviceDefValidateIOMMU() already made sure we have + /* qemuValidateDomainDeviceDefIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: * here we handle the latter case, while the former is taken care * of in qemuBuildIOMMUCommandLine() */ -- 2.26.2

1 0

[PATCH 0/2] Add support for IOMMU address width
by Menno Lageman 23 Jun '20

23 Jun '20

Since commit 37f51384ae05 ('intel-iommu: Extend address width to 48 bits') QEMU supports setting the address width of the IOMMU. This patch adds a new 'aw_bits' attribute to the iommu in libvirtd to configure this. Menno Lageman (2): conf: add address width attribute to iommu qemu: format address wdith on intel-iommu command line docs/formatdomain.html.in | 9 +++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 21 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 ++++ src/qemu/qemu_capabilities.h | 4 +++ src/qemu/qemu_command.c | 6 ++++ src/qemu/qemu_validate.c | 9 ++++- .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../intel-iommu-aw-bits.x86_64-latest.args | 33 +++++++++++++++++ .../qemuxml2argvdata/intel-iommu-aw-bits.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../intel-iommu-aw-bits.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 21 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/intel-iommu-aw-bits.xml create mode 120000 tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml -- 2.26.2

3 11

[PATCH 1/1] qemu_capabilities.c: modernize virQEMUCapsCacheLookupDefault
by Daniel Henrique Barboza 23 Jun '20

23 Jun '20

Use g_autoptr() in qemuCaps to get rid of a virObjectUnref call, a 'cleanup' label and the 'ret' pointer. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Found this while reviewing a patch last week. src/qemu/qemu_capabilities.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 484fff99e5..b46f3d8c2c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5735,8 +5735,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virArch hostarch = virArchFromHost(); virArch arch = hostarch; virDomainVirtType capsType; - virQEMUCapsPtr qemuCaps = NULL; - virQEMUCapsPtr ret = NULL; + g_autoptr(virQEMUCaps) qemuCaps = NULL; virArch arch_from_caps; g_autofree char *probedbinary = NULL; @@ -5744,14 +5743,14 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("unknown virttype: %s"), virttypeStr); - goto cleanup; + return NULL; } if (archStr && (arch = virArchFromString(archStr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INVALID_ARG, _("unknown architecture: %s"), archStr); - goto cleanup; + return NULL; } if (!binary) { @@ -5760,7 +5759,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, } if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) - goto cleanup; + return NULL; arch_from_caps = virQEMUCapsGetArch(qemuCaps); @@ -5774,7 +5773,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, "match given architecture '%s'"), virArchToString(arch_from_caps), virArchToString(arch)); - goto cleanup; + return NULL; } capsType = virQEMUCapsGetVirtType(qemuCaps); @@ -5786,7 +5785,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virReportError(VIR_ERR_INVALID_ARG, _("KVM is not supported by '%s' on this host"), binary); - goto cleanup; + return NULL; } if (machine) { @@ -5797,7 +5796,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virReportError(VIR_ERR_INVALID_ARG, _("the machine '%s' is not supported by emulator '%s'"), machine, binary); - goto cleanup; + return NULL; } } else { machine = virQEMUCapsGetPreferredMachine(qemuCaps, virttype); @@ -5810,11 +5809,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, if (retMachine) *retMachine = machine; - ret = g_steal_pointer(&qemuCaps); - - cleanup: - virObjectUnref(qemuCaps); - return ret; + return g_steal_pointer(&qemuCaps); } bool -- 2.26.2

2 1