February 2022 - Devel - libvirt List Archives

[libvirt PATCH] syntax-check: Suggest correct replacement for str(n)dup()
by Andrea Bolognani 03 Feb '22

03 Feb '22

As of 610963cd0411 VIR_STRDUP() no longer exists. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d5cdb3c70e..b96d126bdc 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -244,7 +244,7 @@ sc_prohobit_vsnprintf: sc_prohibit_strdup: @prohibit='\<strn?dup\> *\(' \ - halt='use VIR_STRDUP, not strdup' \ + halt='use g_str(n)dup, not str(n)dup' \ $(_sc_search_regexp) # Prefer virSetUIDGID. -- 2.34.1

2 1

[libvirt PATCH] util: Reorder virStringParseVersion() arguments
by Andrea Bolognani 03 Feb '22

03 Feb '22

In order to match the existing virStringParse*() and virStrTo*() functions, input arguments should come before output arguments. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/ch/ch_conf.c | 2 +- src/esx/esx_vi.c | 8 ++++---- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ++-- src/openvz/openvz_conf.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virfirewalld.c | 2 +- src/util/virstring.c | 10 +++++----- src/util/virstring.h | 6 +++--- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_utils.c | 2 +- tests/testutilsqemu.c | 2 +- tests/utiltest.c | 4 ++-- tools/virt-host-validate-common.c | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 578fcfe1d2..1cf0b2abce 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -267,7 +267,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned long *version) uname(&ver); - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 88a23a59cd..41d753fd21 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -204,7 +204,7 @@ chExtractVersion(virCHDriver *driver) return -1; } - if (virStringParseVersion(&version, tmp, true) < 0) { + if (virStringParseVersion(tmp, true, &version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %s"), tmp); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 36e9dc1d2c..1ea81a649c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -868,8 +868,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->apiVersion, - ctx->service->about->apiVersion, true) < 0) { + if (virStringParseVersion(ctx->service->about->apiVersion, true, + &ctx->apiVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); @@ -883,8 +883,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->productVersion, - ctx->service->about->version, true) < 0) { + if (virStringParseVersion(ctx->service->about->version, true, + &ctx->productVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3d17b87e8c..51596a820c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1656,7 +1656,7 @@ static int lxcConnectGetVersion(virConnectPtr conn, unsigned long *version) if (virConnectGetVersionEnsureACL(conn) < 0) return -1; - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 54065a0f75..7798dc47b0 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3655,7 +3655,7 @@ ebiptablesDriverProbeCtdir(void) } /* following Linux lxr, the logic was inverted in 2.6.39 */ - if (virStringParseVersion(&thisversion, utsname.release, true) < 0) { + if (virStringParseVersion(utsname.release, true, &thisversion) < 0) { VIR_ERROR(_("Could not determine kernel version from string %s"), utsname.release); return; @@ -3688,7 +3688,7 @@ ebiptablesDriverProbeStateMatchQuery(virFirewall *fw G_GNUC_UNUSED, * 'iptables v1.4.16' */ if (!(tmp = strchr(lines[0], 'v')) || - virStringParseVersion(version, tmp + 1, true) < 0) { + virStringParseVersion(tmp + 1, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse version string '%s'"), lines[0]); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 191c79e1e2..c85829be86 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -85,7 +85,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion) if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL) return -1; - if (virStringParseVersion(&version, tmp, true) < 0) + if (virStringParseVersion(tmp, true, &version) < 0) return -1; if (retversion) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..3467d8e4e0 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -614,7 +614,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf) virSkipToDigit(&p); - if (virStringParseVersion(&version, p, true) < 0) + if (virStringParseVersion(p, true, &version) < 0) goto error; if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) { diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index c909901833..05a8f4e714 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -107,7 +107,7 @@ virFirewallDGetVersion(unsigned long *version) g_variant_get(reply, "(v)", &gvar); g_variant_get(gvar, "&s", &versionStr); - if (virStringParseVersion(version, versionStr, false) < 0) { + if (virStringParseVersion(versionStr, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse firewalld version '%s'"), versionStr); diff --git a/src/util/virstring.c b/src/util/virstring.c index ad0b158ad4..ee0fe7fc9e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1023,10 +1023,10 @@ int virStringParseYesNo(const char *str, bool *result) /** * virStringParseVersion: - * @version: unsigned long pointer to output the version number * @str: const char pointer to the version string * @allowMissing: true to treat 3 like 3.0.0, false to error out on - * missing minor or micro + * missing minor or micro + * @version: unsigned long pointer to output the version number * * Parse an unsigned version number from a version string. Expecting * 'major.minor.micro' format, ignoring an optional suffix. @@ -1038,9 +1038,9 @@ int virStringParseYesNo(const char *str, bool *result) * Returns the 0 for success, -1 for error. */ int -virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing) +virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version) { unsigned int major, minor = 0, micro = 0; char *tmp; diff --git a/src/util/virstring.h b/src/util/virstring.h index ec8ceb0022..6334c4f177 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -136,6 +136,6 @@ int virStringParseYesNo(const char *str, bool *result) G_GNUC_WARN_UNUSED_RESULT; -int virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing); +int virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index eec47a02fc..ccb719c69d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -170,7 +170,7 @@ vboxExtractVersion(void) gVBoxAPI.UPFN.Utf16ToUtf8(vbox_driver->pFuncs, versionUtf16, &vboxVersion); - if (virStringParseVersion(&vbox_driver->version, vboxVersion, false) >= 0) + if (virStringParseVersion(vboxVersion, false, &vbox_driver->version) >= 0) ret = 0; gVBoxAPI.UPFN.Utf8Free(vbox_driver->pFuncs, vboxVersion); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..e449d7dcc7 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -229,7 +229,7 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) return -1; } - if (virStringParseVersion(version, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("version parsing error")); return -1; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fcf6d363a9..c4edf9f673 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -182,7 +182,7 @@ vzInitVersion(struct _vzDriver *driver) } tmp[0] = '\0'; - if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) { + if (virStringParseVersion(sVer, true, &(driver->vzVersion)) < 0) { vzParseError(); goto cleanup; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 646ef415d1..59044bd915 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -695,7 +695,7 @@ testQemuGetLatestCapsForArch(const char *arch, if (!virStringStripSuffix(tmp, fullsuffix)) continue; - if (virStringParseVersion(&ver, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, &ver) < 0) { VIR_TEST_DEBUG("skipping caps file '%s'", ent->d_name); continue; } diff --git a/tests/utiltest.c b/tests/utiltest.c index 419dfea913..59f87f7cf2 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -151,8 +151,8 @@ testParseVersionString(const void *data G_GNUC_UNUSED) unsigned long version; for (i = 0; i < G_N_ELEMENTS(versions); ++i) { - result = virStringParseVersion(&version, versions[i].string, - versions[i].allowMissing); + result = virStringParseVersion(versions[i].string, + versions[i].allowMissing, &version); if (result != versions[i].result) { VIR_TEST_DEBUG("\nVersion string [%s]", versions[i].string); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 2ac96d1e19..7c2cb8b908 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -267,7 +267,7 @@ int virHostValidateLinuxKernel(const char *hvname, return VIR_HOST_VALIDATE_FAILURE(level); } - if (virStringParseVersion(&thisversion, uts.release, true) < 0) { + if (virStringParseVersion(uts.release, true, &thisversion) < 0) { virHostMsgFail(level, "%s", hint); return VIR_HOST_VALIDATE_FAILURE(level); } -- 2.34.1

3 3

[libvirt PATCH v3] NEWS: add note about the ISA debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 666a593b58..d00bda5d50 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -22,6 +22,12 @@ v8.1.0 (unreleased) It works on Intel machines as well as recent machines powered by Apple Silicon. QEMU 6.2.0 is needed for Apple Silicon support. + * qemu: the isa-debugcon device is now supported + + The <serial> element accepts a ``isa-debug`` as a target type + to configure the QEMU ISA debug console, for receiving messages + from the firmware. + * **Improvements** * packaging: sysconfig files no longer installed -- 2.34.1

2 1

[PATCH 0/3] network: Generate TFTP config regardless of DHCP
by Michal Privoznik 03 Feb '22

03 Feb '22

See 3/3 for explanation. Michal Prívozník (3): network: Initialize variables in networkDnsmasqConfContents() network: Separate DHCP config generator into a function network: Generate TFTP config regardless of DHCP src/network/bridge_driver.c | 262 ++++++++++-------- .../networkxml2confdata/netboot-network.conf | 4 +- tests/networkxml2confdata/netboot-tftp.conf | 13 + tests/networkxml2confdata/netboot-tftp.xml | 9 + tests/networkxml2conftest.c | 1 + tests/networkxml2xmlin/netboot-tftp.xml | 1 + tests/networkxml2xmlout/netboot-tftp.xml | 1 + tests/networkxml2xmltest.c | 1 + 8 files changed, 172 insertions(+), 120 deletions(-) create mode 100644 tests/networkxml2confdata/netboot-tftp.conf create mode 100644 tests/networkxml2confdata/netboot-tftp.xml create mode 120000 tests/networkxml2xmlin/netboot-tftp.xml create mode 120000 tests/networkxml2xmlout/netboot-tftp.xml -- 2.32.0

2 4

[libvirt PATCH] meson: Don't overwrite includedir
by Andrea Bolognani 03 Feb '22

03 Feb '22

The current implementation of the workaround for yajl's broken pkg-config file accidentally overwrites the value of includedir that is later used by the installation process. Rename the local variable to avoid this issue. Fixes: c97075e1e46e9305d62620d8b05046aae0139438 Closes: https://gitlab.com/libvirt/libvirt/-/issues/271 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0e6f0f22fc..9016c0458a 100644 --- a/meson.build +++ b/meson.build @@ -1325,18 +1325,18 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() != 'linux' - includedir = yajl_dep.get_pkgconfig_variable('includedir') - if includedir.contains('include/yajl') + yajl_includedir = yajl_dep.get_pkgconfig_variable('includedir') + if yajl_includedir.contains('include/yajl') rc = run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( - includedir, 'include/yajl', 'include', + yajl_includedir, 'include/yajl', 'include', ), check: true, ) - includedir = rc.stdout().strip() + yajl_includedir = rc.stdout().strip() yajl_dep = declare_dependency( - compile_args: [ '-I' + includedir ], + compile_args: [ '-I' + yajl_includedir ], dependencies: [ yajl_dep ], ) endif -- 2.34.1

2 1

[libvirt PATCH v2 0/3] qemu: support the SeaBIOS/EDK2 debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

# virsh dumpxml fedora34x86_64 | xmllint -xpath '/domain/devices/console[2]' - <serial type="pty"> <target type="isa-debug"> <model type="isa-debugcon"/> </target> <address type="isa" iobase="0x402"/> </serial> # virsh console --devname console1 fedora34x86_64 Of course you really want to start the guest paused initially to allow time to connect to the console before resuming CPUs, and thus be able to catch early firmware output. In v2: - Use <serial> instead of <console> Daniel P. Berrangé (3): conf: validate serial port model in ABI checks conf: support firmware ISA debug console qemu: add tests for the ISA debug console command line docs/formatdomain.rst | 14 +++--- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 26 +++++++++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 4 ++ src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_validate.c | 5 +++ .../serial-debugcon.x86_64-latest.args | 39 +++++++++++++++++ tests/qemuxml2argvdata/serial-debugcon.xml | 29 +++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/serial-debugcon.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-debugcon.xml create mode 100644 tests/qemuxml2xmloutdata/serial-debugcon.xml -- 2.34.1

3 12

[libvirt PATCH v5 0/9] Automatic mutex management
by Tim Wiederhake 02 Feb '22

02 Feb '22

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html V2: https://listman.redhat.com/archives/libvir-list/2021-September/msg00249.html V3: https://listman.redhat.com/archives/libvir-list/2021-September/msg00964.html V4: https://listman.redhat.com/archives/libvir-list/2022-January/msg01262.html Changes since V4: * Replaced usage of "__LINE__" with "__COUNTER__" Regards, Tim Tim Wiederhake (9): internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardLock virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virchrdev.c | 12 +++++------- src/internal.h | 3 +++ src/libvirt_private.syms | 3 +++ src/lxc/lxc_driver.c | 6 +++--- src/util/virobject.c | 16 ++++++++++++++++ src/util/virobject.h | 26 ++++++++++++++++++++++++++ src/util/virthread.c | 15 +++++++++++++++ src/util/virthread.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 104 insertions(+), 12 deletions(-) -- 2.31.1

4 25

[PATCH v2] virnodedeviceobj: Don't unlock virNodeDeviceObj in virNodeDeviceObjListRemove()
by Michal Privoznik 02 Feb '22

02 Feb '22

When virNodeDeviceObjListRemove() is called, the passed virNodeDeviceObj is removed from internal list of node devices and then unrefed and unlocked. While the former is warranted (the object was refed at the beginning of the function) the unlock is not. In fact, it's wrong from conceptual POV. We still want threads working on the object tu mutually exclude each other. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-February/msg00036.html diff to v1: - Fixed test driver which worked around broken logic Note, there is similar problem with virNodeDeviceObjListForEachRemove() which removes objects from the list, even without lock, but that happens only with mdevs and I have none to test with. src/conf/virnodedeviceobj.c | 2 +- src/test/test_driver.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2e4ef2df3c..7a560349d4 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,7 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virNodeDeviceObjEndAPI(&obj); + virObjectUnref(obj); virObjectRWUnlock(devs); } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9e1fc65972..f900123941 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6810,7 +6810,7 @@ testDestroyVport(testDriver *privconn, 0); virNodeDeviceObjListRemove(privconn->devs, obj); - virObjectUnref(obj); + virNodeDeviceObjEndAPI(&obj); virObjectEventStateQueue(privconn->eventState, event); return 0; @@ -7797,8 +7797,6 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virObjectLock(obj); virNodeDeviceObjListRemove(driver->devs, obj); - virObjectUnref(obj); - obj = NULL; cleanup: virNodeDeviceObjEndAPI(&obj); -- 2.34.1

2 1

[libvirt PATCH 0/2] ch: fix some issues pointed out by Coverity
by Ján Tomko 02 Feb '22

02 Feb '22

Ján Tomko (2): ch: virCHMonitorGetIOThreads: fix g_steal_pointer usage ch: virCHProcessSetupIOThreads: use correct type for return value src/ch/ch_monitor.c | 2 +- src/ch/ch_process.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] tests: Cover virtio-mem being plugged into a bridge
by Andrea Bolognani 02 Feb '22

02 Feb '22

This is a perfectly valid configuration that we need to keep working, so add test coverage for it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../memory-hotplug-virtio-mem.x86_64-latest.args | 3 ++- tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index dba2452ccf..5aa8110aeb 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -28,11 +28,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index ea9f5e8765..73036d8602 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -35,6 +35,11 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='1' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> @@ -61,7 +66,7 @@ <block unit='KiB'>2048</block> <requested unit='KiB'>1048576</requested> </target> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </memory> </devices> </domain> -- 2.34.1

2 1