- Devel - libvirt List Archives

[PATCH] qemu_monitor_json: remove unnecessary variable 'rc'
by Kristina Hanicova 26 Sep '22

26 Sep '22

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 70fba50e6c..5f7c1a8db9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8611,11 +8611,8 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, qemuMonitorQueryStatsProvider *provider = providers->pdata[i]; const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->type); virBitmap *names = provider->names; - int rc; - rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str); - - if (rc < 0) + if (virJSONValueObjectAppendString(provider_obj, "provider", type_str) < 0) return NULL; if (!virBitmapIsAllClear(names)) { @@ -8629,9 +8626,7 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, return NULL; } - rc = virJSONValueObjectAppend(provider_obj, "names", &provider_names); - - if (rc < 0) + if (virJSONValueObjectAppend(provider_obj, "names", &provider_names) < 0) return NULL; } -- 2.37.2

3 2

[PATCH 0/2] RFC: Allow using custom XML validator
by Peter Krempa 26 Sep '22

26 Sep '22

Benefits described in patch 2/2 with an example of using 'jing' as validator. Peter Krempa (2): util: xml: Introduce infrastructure to support custom XML validators daemon: Introduce the possibility for users to register custom XML validator src/libvirt_private.syms | 1 + src/remote/libvirtd.aug.in | 1 + src/remote/libvirtd.conf.in | 21 +++++++ src/remote/remote_daemon.c | 3 + src/remote/remote_daemon_config.c | 4 ++ src/remote/remote_daemon_config.h | 2 + src/remote/test_libvirtd.aug.in | 1 + src/util/virxml.c | 93 ++++++++++++++++++++++++++++++- src/util/virxml.h | 3 + 9 files changed, 127 insertions(+), 2 deletions(-) -- 2.37.1

4 8

[PATCH 0/7] Fix two bugs in XML schema
by Peter Krempa 26 Sep '22

26 Sep '22

Patches 1/7 and 6/7 outline the individual bugs. Peter Krempa (7): schema: nodedev: Fix schema attribute value for the 'vport_ops' capability nodedevschematest: Add example file for a HBA with 'vport_ops' capability qemudomainsnapshotxml2xmltest: Allow regenerating into non-existing output file schemas: Extract overrides for the domain element from 'domain.rng' schemas: domaincommon: Extract contents of the 'domain' element definition schema: Add schema for '<inactiveDomain>' element used in the snapshot definition qemudomainsnapshotxml2xmltest: Add test case for a snapshot with 'inactiveDomain' element docs/formatnode.rst | 2 +- src/conf/schemas/domain.rng | 12 +- src/conf/schemas/domaincommon.rng | 150 ++++++++++-------- src/conf/schemas/domainoverrides.rng | 16 ++ src/conf/schemas/domainsnapshot.rng | 5 + src/conf/schemas/inactiveDomain.rng | 10 ++ src/conf/schemas/nodedev.rng | 2 +- tests/nodedevschemadata/hba_vport_ops.xml | 18 +++ tests/nodedevxml2xmlout/hba_vport_ops.xml | 18 +++ tests/nodedevxml2xmltest.c | 1 + .../memory-snapshot-inactivedomain.xml | 148 +++++++++++++++++ tests/qemudomainsnapshotxml2xmltest.c | 10 +- 12 files changed, 303 insertions(+), 89 deletions(-) create mode 100644 src/conf/schemas/domainoverrides.rng create mode 100644 src/conf/schemas/inactiveDomain.rng create mode 100644 tests/nodedevschemadata/hba_vport_ops.xml create mode 100644 tests/nodedevxml2xmlout/hba_vport_ops.xml create mode 100644 tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inactivedomain.xml -- 2.37.1

4 13

[PATCH] libvirt-guests: Fix dependency ordering in service file
by Martin Kletzander 26 Sep '22

26 Sep '22

After some debugging and discussion with systemd team it turns out we are misusing the ordering in libvirt-guests.service. That happened because we want to support both monolithic and modular daemon setups and on top of that we also want to support socket activation and services without socket activation. Unfortunately this is impossible to express in the unit file because of how transactions are handled in systemd when dependencies are resolved and multiple actions (jobs) are queued. For explanation from Michal Sekletar see comment #7 in the BZ this patch is fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1964855#c7 In order to support all the scenarios this patch also amends the manpages so that users that are changing the default can also read how to correct the dependency ordering in libvirt-guests unit file. Ideally we would also keep the existing configuration during upgrade, but due to our huge support matrix this seems hardly feasible as it could introduce even more problems. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/manpages/libvirtd.rst | 14 ++++++++++++++ docs/manpages/virtlxcd.rst | 14 ++++++++++++++ docs/manpages/virtqemud.rst | 14 ++++++++++++++ docs/manpages/virtvboxd.rst | 14 ++++++++++++++ docs/manpages/virtvzd.rst | 14 ++++++++++++++ docs/manpages/virtxend.rst | 14 ++++++++++++++ tools/libvirt-guests.service.in | 6 ------ 7 files changed, 84 insertions(+), 6 deletions(-) diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index ee72f0838221..1347b9b21042 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -79,6 +79,20 @@ unit files must be masked: $ systemctl mask libvirtd.socket libvirtd-ro.socket \ libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``libvirtd.service`` and +not ``libvirtd.socket``: + +:: + + [Unit] + After=libvirtd.service + OPTIONS ======= diff --git a/docs/manpages/virtlxcd.rst b/docs/manpages/virtlxcd.rst index 2e9d8fd14bbb..aebc8adb5822 100644 --- a/docs/manpages/virtlxcd.rst +++ b/docs/manpages/virtlxcd.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtlxcd.socket virtlxcd-ro.socket \ virtlxcd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtlxcd.service`` and +not ``virtlxcd.socket``: + +:: + + [Unit] + After=virtlxcd.service + OPTIONS ======= diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index ea8d6e3105db..fa9a6ce3755c 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtqemud.socket virtqemud-ro.socket \ virtqemud-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtqemud.service`` and +not ``virtqemud.socket``: + +:: + + [Unit] + After=virtqemud.service + OPTIONS ======= diff --git a/docs/manpages/virtvboxd.rst b/docs/manpages/virtvboxd.rst index d7339d99f22b..f90de3451d8d 100644 --- a/docs/manpages/virtvboxd.rst +++ b/docs/manpages/virtvboxd.rst @@ -58,6 +58,20 @@ unit files must be masked: $ systemctl mask virtvboxd.socket virtvboxd-ro.socket \ virtvboxd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtvboxd.service`` and +not ``virtvboxd.socket``: + +:: + + [Unit] + After=virtvboxd.service + OPTIONS ======= diff --git a/docs/manpages/virtvzd.rst b/docs/manpages/virtvzd.rst index 42dfa263e450..970719aac1d5 100644 --- a/docs/manpages/virtvzd.rst +++ b/docs/manpages/virtvzd.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtvzd.socket virtvzd-ro.socket \ virtvzd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtvzd.service`` and +not ``virtvzd.socket``: + +:: + + [Unit] + After=virtvzd.service + OPTIONS ======= diff --git a/docs/manpages/virtxend.rst b/docs/manpages/virtxend.rst index b08346b489d2..cf7685ecc0e6 100644 --- a/docs/manpages/virtxend.rst +++ b/docs/manpages/virtxend.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtxend.socket virtxend-ro.socket \ virtxend-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtxend.service`` and +not ``virtxend.socket``: + +:: + + [Unit] + After=virtxend.service + OPTIONS ======= diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 3cf647619612..1c569c320dfd 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -9,12 +9,6 @@ After=virtlxcd.socket After=virtvboxd.socket After=virtvzd.socket After=virtxend.socket -After=libvirtd.service -After=virtqemud.service -After=virtlxcd.service -After=virtvboxd.service -After=virtvzd.service -After=virtxend.service After=virt-guest-shutdown.target Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org -- 2.37.2

2 2

[PATCH v2 RESEND] qemu: fix memory leak about virDomainEventTunableNew
by luzhipeng 26 Sep '22

26 Sep '22

From: lu zhipeng <luzhipeng(a)cestc.cn> For prevent memory leak and easier to use, So change virDomainEventTunableNew to get virTypedParameterPtr *params and set it = NULL. Signed-off-by: lu zhipeng <luzhipeng(a)cestc.cn> --- v1: https://patchew.org/Libvirt/20220922130038.1616-1-luzhipeng@cestc.cn/ src/conf/domain_event.c | 12 ++++++------ src/conf/domain_event.h | 4 ++-- src/qemu/qemu_driver.c | 22 ++++++++++------------ src/remote/remote_driver.c | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index ff8ea2c389..97d58c2521 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1495,7 +1495,7 @@ static virObjectEvent * virDomainEventTunableNew(int id, const char *name, unsigned char *uuid, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { virDomainEventTunable *ev; @@ -1508,19 +1508,19 @@ virDomainEventTunableNew(int id, id, name, uuid))) goto error; - ev->params = params; + ev->params = *params; ev->nparams = nparams; - + *params = NULL; return (virObjectEvent *)ev; error: - virTypedParamsFree(params, nparams); + virTypedParamsFree(*params, nparams); return NULL; } virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(obj->def->id, @@ -1532,7 +1532,7 @@ virDomainEventTunableNewFromObj(virDomainObj *obj, virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(dom->id, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 4a9f6b988b..f4016dc1e9 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -195,11 +195,11 @@ virDomainEventDeviceRemovalFailedNewFromDom(virDomainPtr dom, virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94b70872d4..3db4592945 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4472,12 +4472,12 @@ qemuDomainPinVcpuLive(virDomainObj *vm, &eventMaxparams, paramField, str) < 0) goto cleanup; - event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); + event = virDomainEventTunableNewFromObj(vm, &eventParams, eventNparams); ret = 0; cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -4681,7 +4681,7 @@ qemuDomainPinEmulator(virDomainPtr dom, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -4700,6 +4700,7 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5078,7 +5079,7 @@ qemuDomainPinIOThread(virDomainPtr dom, &eventMaxparams, paramField, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -5106,6 +5107,7 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -9633,8 +9635,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } @@ -9654,8 +9655,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } #undef SCHED_RANGE_CHECK @@ -16159,8 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -16202,8 +16201,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, VIR_FREE(info.group_name); VIR_FREE(conf_info.group_name); virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a4efe101a3..b0dba9057b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5078,7 +5078,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientProgram *prog G_GNUC_UNUSED, return; } - event = virDomainEventTunableNewFromDom(dom, params, nparams); + event = virDomainEventTunableNewFromDom(dom, &params, nparams); virObjectUnref(dom); -- 2.31.1

2 1

[PATCH v2] Log alarms should be generated even if the QEMU process is not stopped
by 丁丽敏 26 Sep '22

26 Sep '22

If the qemu process is shutdown and flag is set to VIR_QEMU_PROCESS_KILL_NOWAIT, a log alarm is generated even if the qemu process is not stopped. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- v1:https://www.mail-archive.com/libvir-list@redhat.com/msg232232.html diff to v1: - Add the patch 's description. - Change the code format. --- 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 cbfdd3bda5..d876e345a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8006,9 +8006,11 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) } if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { - virProcessKill(vm->pid, - (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? - SIGKILL : SIGTERM); + if (virProcessKill(vm->pid, + (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? + SIGKILL : SIGTERM);) { + VIR_DEBUG("Failed to terminate qemu process"); + } return 0; } -- 2.18.4

1 0

[PATCH v2] Two branches in a conditional structure should not have exactly the same implementation
by 丁丽敏 26 Sep '22

26 Sep '22

Having two branches in the same if structure with the same implementation is at best duplicate code, and at worst a coding error.If the same logic is truly needed for both instances, then they should be combined. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- v1 of: https://www.mail-archive.com/libvir-list@redhat.com/msg232231.html diff to v1: - Add the patch 's description. - Change the code format. --- scripts/apibuild.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index c232b4e2c8..140916ec4c 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -1248,10 +1248,8 @@ class CParser: token[1] == "," or token[1] == "="): self.index_add_ref(oldtok[1], self.filename, 0, "type") - elif oldtok[0] == "name" and oldtok[1][0:4] == "XEN_": - self.index_add_ref(oldtok[1], self.filename, - 0, "typedef") - elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXEN_": + elif oldtok[0] == "name" and (oldtok[1][0:4] == "XEN_" or + oldtok[1][0:7] == "LIBXEN_"): self.index_add_ref(oldtok[1], self.filename, 0, "typedef") -- 2.18.4 丁丽敏 IaaS产品部中国移动云能力中心电话:188-9672-5914 邮箱:dinglimin@cmss.chinamobile.com 江苏省苏州市高新区科技城昆仑山路58号中移软件园 215153

1 0

[PATCH v2] Log alarms should be generated even if the QEMU process is not stopped
by 丁丽敏 26 Sep '22

26 Sep '22

If the qemu process is shutdown and flag is set to VIR_QEMU_PROCESS_KILL_NOWAIT, a log alarm is generated even if the qemu process is not stopped. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- v1:https://www.mail-archive.com/libvir-list@redhat.com/msg232232.html diff to v1: - Add the patch 's description. - Change the code format. --- 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 cbfdd3bda5..d876e345a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8006,9 +8006,11 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) } if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { - virProcessKill(vm->pid, - (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? - SIGKILL : SIGTERM); + if (virProcessKill(vm->pid, + (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? + SIGKILL : SIGTERM);) { + VIR_DEBUG("Failed to terminate qemu process"); + } return 0; } -- 2.18.4

1 0

[PATCH v2] cpu_map: Introduce Neoverse N1/N2/V1
by Zhenyu Zhang 26 Sep '22

26 Sep '22

Add Neoverse N1/N2/V1 as a supported cpu model. Signed-off-by: Zhenyu Zhang <zhenyzha(a)redhat.com> v1: https://listman.redhat.com/archives/libvir-list/2022-September/234294.html Changelog ========= v2: * Introduce Neoverse N1/N2/V1 (Martin) * Corrected ampere vendor value (Martin) --- src/cpu_map/arm_Neoverse-N1.xml | 6 ++++++ src/cpu_map/arm_Neoverse-N2.xml | 0 src/cpu_map/arm_Neoverse-V1.xml | 0 src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 6 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_Neoverse-N1.xml create mode 100644 src/cpu_map/arm_Neoverse-N2.xml create mode 100644 src/cpu_map/arm_Neoverse-V1.xml diff --git a/src/cpu_map/arm_Neoverse-N1.xml b/src/cpu_map/arm_Neoverse-N1.xml new file mode 100644 index 0000000000..14c7f7c300 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='Ampere'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Neoverse-N2.xml b/src/cpu_map/arm_Neoverse-N2.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cpu_map/arm_Neoverse-V1.xml b/src/cpu_map/arm_Neoverse-V1.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 92d10565f4..a9a945584b 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -13,4 +13,5 @@ <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> <vendor name='Phytium' value='0x70'/> + <vendor name='Ampere' value='0x71'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..2419fa0a64 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -98,6 +98,9 @@ <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> +  + <include filename='arm_neoverse-n1.xml'/> +  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..122bd138d2 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,7 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_Neoverse-N1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

1 0

[PATCH] cpu_map: Introduce Neoverse-N1
by Zhenyu Zhang 25 Sep '22

25 Sep '22

Add Neoverse-N1 as a supported cpu model. Signed-off-by: Zhang Zhenyu <zhenyzha(a)redhat.com> --- src/cpu_map/arm_neoverse-n1.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 4 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_neoverse-n1.xml diff --git a/src/cpu_map/arm_neoverse-n1.xml b/src/cpu_map/arm_neoverse-n1.xml new file mode 100644 index 0000000000..14c7f7c300 --- /dev/null +++ b/src/cpu_map/arm_neoverse-n1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='Ampere'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 92d10565f4..a9a945584b 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -13,4 +13,5 @@ <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> <vendor name='Phytium' value='0x70'/> + <vendor name='Ampere' value='0x71'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..2419fa0a64 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -98,6 +98,9 @@ <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> +  + <include filename='arm_neoverse-n1.xml'/> +  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..c8f2e36eea 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,7 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_neoverse-n1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

2 4

[libvirt PATCH] nodedev: switch to udev 'bind' events
by Jonathon Jongsma 23 Sep '22

23 Sep '22

Rather than listening to 'add' udev events, listen for 'bind' events instead. When we get an 'add' event, the sysfs tree for the device is often not ready yet. In that case we sleep in a loop until the sysfs tree appears, or give up after a timeout. udev added the 'bind' event to give userspace a signal that indicated when driver-specific attributes were available to be used. In other words, the sysfs tree *should* be ready and usable at this point. But just to be safe, we'll leave the wait loop in the code to handle corner cases, with the hope that it'll never be used. The udev 'bind' event was added in kernel 4.14 and the oldest platform we support has kernel 4.18, so it should be safe to make this change. Previous discussion on the mailing list: https://listman.redhat.com/archives/libvir-list/2022-August/233933.html Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 07c10f0d88..781a8b32a6 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1759,7 +1759,7 @@ udevHandleOneDevice(struct udev_device *device) VIR_DEBUG("udev action: '%s': %s", action, udev_device_get_syspath(device)); - if (STREQ(action, "add") || STREQ(action, "change")) + if (STREQ(action, "bind") || STREQ(action, "change")) return udevAddOneDevice(device); if (STREQ(action, "remove")) -- 2.37.2

3 4

[PATCH 0/4] qemu_process.c: Propagate hugetlbfs mounts on reconnect
by Michal Privoznik 23 Sep '22

23 Sep '22

See 4/4 for full explanation. Michal Prívozník (4): qemu_namespace: Tolerate missing ACLs when creating a path in namespace qemu_namespace: Fix a corner case in qemuDomainGetPreservedMounts() qemu_namespace: Introduce qemuDomainNamespaceSetupPath() qemu_process.c: Propagate hugetlbfs mounts on reconnect docs/kbase/qemu-passthrough-security.rst | 6 ----- src/qemu/qemu_namespace.c | 32 +++++++++++++++++++++--- src/qemu/qemu_namespace.h | 4 +++ src/qemu/qemu_process.c | 3 +++ 4 files changed, 36 insertions(+), 9 deletions(-) -- 2.35.1

3 9

[PATCH] qemu_domain: Ignore all but SCSI hostdevs in qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias()
by Michal Privoznik 23 Sep '22

23 Sep '22

When retiring QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI capability the commit removed a bit too much. Previously, all other devices than VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI were ignored in qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(). But the commit in question removed not only the capability check but also this return early statement. Restore it back. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2129239 Fixes: dc8dbb27d40968c9d9bfad2c6181bccc20c0e44e Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d7ef23f493..ee024d17cd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5596,6 +5596,10 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *host if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) return 0; + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + return 0; + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: if (!scsisrc->u.host.src) -- 2.35.1

3 2

[PATCH v2] qemu: fix memory leak about virDomainEventTunableNew
by luzhipeng 23 Sep '22

23 Sep '22

From: lu zhipeng <luzhipeng(a)cestc.cn> For prevent memory leak and easier to use, So change virDomainEventTunableNew to get virTypedParameterPtr *params and set it = NULL. Signed-off-by: lu zhipeng <luzhipeng(a)cestc.cn> --- v1: https://patchew.org/Libvirt/20220922130038.1616-1-luzhipeng@cestc.cn/ src/conf/domain_event.c | 12 ++++++------ src/conf/domain_event.h | 4 ++-- src/qemu/qemu_driver.c | 22 ++++++++++------------ src/remote/remote_driver.c | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index ff8ea2c389..97d58c2521 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1495,7 +1495,7 @@ static virObjectEvent * virDomainEventTunableNew(int id, const char *name, unsigned char *uuid, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { virDomainEventTunable *ev; @@ -1508,19 +1508,19 @@ virDomainEventTunableNew(int id, id, name, uuid))) goto error; - ev->params = params; + ev->params = *params; ev->nparams = nparams; - + *params = NULL; return (virObjectEvent *)ev; error: - virTypedParamsFree(params, nparams); + virTypedParamsFree(*params, nparams); return NULL; } virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, A int nparams) { return virDomainEventTunableNew(obj->def->id, @@ -1532,7 +1532,7 @@ virDomainEventTunableNewFromObj(virDomainObj *obj, virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(dom->id, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 4a9f6b988b..f4016dc1e9 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -195,11 +195,11 @@ virDomainEventDeviceRemovalFailedNewFromDom(virDomainPtr dom, virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94b70872d4..3db4592945 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4472,12 +4472,12 @@ qemuDomainPinVcpuLive(virDomainObj *vm, &eventMaxparams, paramField, str) < 0) goto cleanup; - event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); A - + event = virDomainEventTunableNewFromObj(vm, &eventParams, eventNparams); ret = 0; cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -4681,7 +4681,7 @@ qemuDomainPinEmulator(virDomainPtr dom, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { B A @@ -4700,6 +4700,7 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5078,7 +5079,7 @@ qemuDomainPinIOThread(virDomainPtr dom, &eventMaxparams, paramField, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -5106,6 +5107,7 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -9633,8 +9635,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } @@ -9654,8 +9655,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } #undef SCHED_RANGE_CHECK @@ -16159,8 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -16202,8 +16201,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, VIR_FREE(info.group_name); VIR_FREE(conf_info.group_name); virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a4efe101a3..b0dba9057b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5078,7 +5078,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientProgram *prog G_GNUC_UNUSED, return; } - event = virDomainEventTunableNewFromDom(dom, params, nparams); + event = virDomainEventTunableNewFromDom(dom, &params, nparams); virObjectUnref(dom); -- 2.31.1

2 1

[PATCH] qemu: fix memory leak on some paths
by luzhipeng 22 Sep '22

22 Sep '22

From: lu zhipeng <luzhipeng(a)cestc.cn> virTypedParamsAddString may return -1 but alloc params, so free it. Signed-off-by: lu zhipeng <luzhipeng(a)cestc.cn> --- src/qemu/qemu_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94b70872d4..c4501cd705 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4473,11 +4473,13 @@ qemuDomainPinVcpuLive(virDomainObj *vm, goto cleanup; event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); - + eventNparams = 0; ret = 0; cleanup: virObjectEventStateQueue(driver->domainEventState, event); + if (eventNparams) + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -4682,6 +4684,7 @@ qemuDomainPinEmulator(virDomainPtr dom, goto endjob; event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + eventNparams = 0; } if (persistentDef) { @@ -4700,6 +4703,8 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + if (eventNparams) + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5079,6 +5084,7 @@ qemuDomainPinIOThread(virDomainPtr dom, goto endjob; event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + eventNparams = 0; } if (persistentDef) { @@ -5106,6 +5112,8 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + if (eventNparams) + virTypedParamsFree(eventParams, eventNparams); return ret; } -- 2.31.1

3 2

[PATCH 0/2] security_selinux: Don't ignore NVMe disks when setting image label
by Michal Privoznik 22 Sep '22

22 Sep '22

The first patch is the important one. But since I could not decide which code looks better I've posted 2/2 too which moves a check. Michal Prívozník (2): security_selinux: Don't ignore NVMe disks when setting image label security_selinux: Move shortcut in virSecuritySELinuxSetImageLabelInternal() later src/security/security_selinux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.35.1

3 5

Re: [PATCH] watchdog: remove -watchdog option
by Thomas Huth 22 Sep '22

22 Sep '22

On 22/09/2022 11.29, Paolo Bonzini wrote: > This was deprecated in 6.2 and is ready to go. It removes quite a bit > of code that handled the registration of watchdog models. > > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > --- > docs/about/deprecated.rst | 5 ---- > docs/about/removed-features.rst | 5 ++++ > hw/watchdog/sbsa_gwdt.c | 6 ----- > hw/watchdog/watchdog.c | 45 --------------------------------- > hw/watchdog/wdt_aspeed.c | 6 ----- > hw/watchdog/wdt_diag288.c | 6 ----- > hw/watchdog/wdt_i6300esb.c | 6 ----- > hw/watchdog/wdt_ib700.c | 6 ----- > hw/watchdog/wdt_imx2.c | 6 ----- > include/sysemu/watchdog.h | 12 --------- > qemu-options.hx | 33 ++---------------------- > softmmu/vl.c | 16 ------------ > 12 files changed, 7 insertions(+), 145 deletions(-) Nice clean-up! Reviewed-by: Thomas Huth <thuth(a)redhat.com> > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index a72fedba5f..93affe3669 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -81,11 +81,6 @@ the process listing. This is replaced by the new ``password-secret`` > option which lets the password be securely provided on the command > line using a ``secret`` object instance. > > -``-watchdog`` (since 6.2) > -''''''''''''''''''''''''' > - > -Use ``-device`` instead. > - > ``-smp`` ("parameter=0" SMP configurations) (since 6.2) > ''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index a4aa3dca69..63df9848fd 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -403,6 +403,11 @@ Sound card devices should be created using ``-device`` or ``-audio``. > The exception is ``pcspk`` which can be activated using ``-machine > pcspk-audiodev=<name>``. > > +``-watchdog`` (since 7.2) > +''''''''''''''''''''''''' > + > +Use ``-device`` instead. > + > > QEMU Machine Protocol (QMP) commands > ------------------------------------ > diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c > index e49cacd0e2..7aa57a8c51 100644 > --- a/hw/watchdog/sbsa_gwdt.c > +++ b/hw/watchdog/sbsa_gwdt.c > @@ -24,11 +24,6 @@ > #include "qemu/log.h" > #include "qemu/module.h" > > -static WatchdogTimerModel model = { > - .wdt_name = TYPE_WDT_SBSA, > - .wdt_description = "SBSA-compliant generic watchdog device", > -}; > - > static const VMStateDescription vmstate_sbsa_gwdt = { > .name = "sbsa-gwdt", > .version_id = 1, > @@ -287,7 +282,6 @@ static const TypeInfo wdt_sbsa_gwdt_info = { > > static void wdt_sbsa_gwdt_register_types(void) > { > - watchdog_add_model(&model); > type_register_static(&wdt_sbsa_gwdt_info); > } > > diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c > index 1437e6c5b6..b132546516 100644 > --- a/hw/watchdog/watchdog.c > +++ b/hw/watchdog/watchdog.c > @@ -31,51 +31,6 @@ > #include "hw/nmi.h" > #include "qemu/help_option.h" > > -static WatchdogAction watchdog_action = WATCHDOG_ACTION_RESET; > -static QLIST_HEAD(, WatchdogTimerModel) watchdog_list; > - > -void watchdog_add_model(WatchdogTimerModel *model) > -{ > - QLIST_INSERT_HEAD(&watchdog_list, model, entry); > -} > - > -/* Returns: > - * 0 = continue > - * 1 = exit program with error > - * 2 = exit program without error > - */ > -int select_watchdog(const char *p) > -{ > - WatchdogTimerModel *model; > - QemuOpts *opts; > - > - /* -watchdog ? lists available devices and exits cleanly. */ > - if (is_help_option(p)) { > - QLIST_FOREACH(model, &watchdog_list, entry) { > - fprintf(stderr, "\t%s\t%s\n", > - model->wdt_name, model->wdt_description); > - } > - return 2; > - } > - > - QLIST_FOREACH(model, &watchdog_list, entry) { > - if (strcasecmp(model->wdt_name, p) == 0) { > - /* add the device */ > - opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, > - &error_abort); > - qemu_opt_set(opts, "driver", p, &error_abort); > - return 0; > - } > - } > - > - fprintf(stderr, "Unknown -watchdog device. Supported devices are:\n"); > - QLIST_FOREACH(model, &watchdog_list, entry) { > - fprintf(stderr, "\t%s\t%s\n", > - model->wdt_name, model->wdt_description); > - } > - return 1; > -} > - > WatchdogAction get_watchdog_action(void) > { > return watchdog_action; > diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c > index 31855afdf4..d753693a2e 100644 > --- a/hw/watchdog/wdt_aspeed.c > +++ b/hw/watchdog/wdt_aspeed.c > @@ -202,11 +202,6 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data, > return; > } > > -static WatchdogTimerModel model = { > - .wdt_name = TYPE_ASPEED_WDT, > - .wdt_description = "Aspeed watchdog device", > -}; > - > static const VMStateDescription vmstate_aspeed_wdt = { > .name = "vmstate_aspeed_wdt", > .version_id = 0, > @@ -416,7 +411,6 @@ static const TypeInfo aspeed_1030_wdt_info = { > > static void wdt_aspeed_register_types(void) > { > - watchdog_add_model(&model); > type_register_static(&aspeed_wdt_info); > type_register_static(&aspeed_2400_wdt_info); > type_register_static(&aspeed_2500_wdt_info); > diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c > index 9e8882a11c..76d89fbf78 100644 > --- a/hw/watchdog/wdt_diag288.c > +++ b/hw/watchdog/wdt_diag288.c > @@ -19,11 +19,6 @@ > #include "migration/vmstate.h" > #include "qemu/log.h" > > -static WatchdogTimerModel model = { > - .wdt_name = TYPE_WDT_DIAG288, > - .wdt_description = "diag288 device for s390x platform", > -}; > - > static const VMStateDescription vmstate_diag288 = { > .name = "vmstate_diag288", > .version_id = 0, > @@ -138,7 +133,6 @@ static const TypeInfo wdt_diag288_info = { > > static void wdt_diag288_register_types(void) > { > - watchdog_add_model(&model); > type_register_static(&wdt_diag288_info); > } > > diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c > index f99a1c9d29..5693ec6a09 100644 > --- a/hw/watchdog/wdt_i6300esb.c > +++ b/hw/watchdog/wdt_i6300esb.c > @@ -457,11 +457,6 @@ static void i6300esb_exit(PCIDevice *dev) > timer_free(d->timer); > } > > -static WatchdogTimerModel model = { > - .wdt_name = "i6300esb", > - .wdt_description = "Intel 6300ESB", > -}; > - > static void i6300esb_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -493,7 +488,6 @@ static const TypeInfo i6300esb_info = { > > static void i6300esb_register_types(void) > { > - watchdog_add_model(&model); > type_register_static(&i6300esb_info); > } > > diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c > index 91d1bdc0da..b116c3a3aa 100644 > --- a/hw/watchdog/wdt_ib700.c > +++ b/hw/watchdog/wdt_ib700.c > @@ -128,11 +128,6 @@ static void wdt_ib700_reset(DeviceState *dev) > timer_del(s->timer); > } > > -static WatchdogTimerModel model = { > - .wdt_name = "ib700", > - .wdt_description = "iBASE 700", > -}; > - > static void wdt_ib700_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -153,7 +148,6 @@ static const TypeInfo wdt_ib700_info = { > > static void wdt_ib700_register_types(void) > { > - watchdog_add_model(&model); > type_register_static(&wdt_ib700_info); > } > > diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c > index c3128370b5..e776a2fbd4 100644 > --- a/hw/watchdog/wdt_imx2.c > +++ b/hw/watchdog/wdt_imx2.c > @@ -291,14 +291,8 @@ static const TypeInfo imx2_wdt_info = { > .class_init = imx2_wdt_class_init, > }; > > -static WatchdogTimerModel model = { > - .wdt_name = "imx2-watchdog", > - .wdt_description = "i.MX2 Watchdog", > -}; > - > static void imx2_wdt_register_type(void) > { > - watchdog_add_model(&model); > type_register_static(&imx2_wdt_info); > } > type_init(imx2_wdt_register_type) > diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h > index d2d4901dbb..745c89b02b 100644 > --- a/include/sysemu/watchdog.h > +++ b/include/sysemu/watchdog.h > @@ -25,20 +25,8 @@ > #include "qemu/queue.h" > #include "qapi/qapi-types-run-state.h" > > -struct WatchdogTimerModel { > - QLIST_ENTRY(WatchdogTimerModel) entry; > - > - /* Short name of the device - used to select it on the command line. */ > - const char *wdt_name; > - /* Longer description (eg. manufacturer and full model number). */ > - const char *wdt_description; > -}; > -typedef struct WatchdogTimerModel WatchdogTimerModel; > - > /* in hw/watchdog.c */ > -int select_watchdog(const char *p); > WatchdogAction get_watchdog_action(void); > -void watchdog_add_model(WatchdogTimerModel *model); > void watchdog_perform_action(void); > > #endif /* QEMU_WATCHDOG_H */ > diff --git a/qemu-options.hx b/qemu-options.hx > index d8b5ce5b43..df4b8c8f1a 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -4330,7 +4330,7 @@ SRST > > ``-action panic=none`` > ``-action reboot=shutdown,shutdown=pause`` > - ``-watchdog i6300esb -action watchdog=pause`` > + ``-device i6300esb -action watchdog=pause`` > > ERST > > @@ -4448,35 +4448,6 @@ SRST > specifies the snapshot name used to load the initial VM state. > ERST > > -DEF("watchdog", HAS_ARG, QEMU_OPTION_watchdog, \ > - "-watchdog model\n" \ > - " enable virtual hardware watchdog [default=none]\n", > - QEMU_ARCH_ALL) > -SRST > -``-watchdog model`` > - Create a virtual hardware watchdog device. Once enabled (by a guest > - action), the watchdog must be periodically polled by an agent inside > - the guest or else the guest will be restarted. Choose a model for > - which your guest has drivers. > - > - The model is the model of hardware watchdog to emulate. Use > - ``-watchdog help`` to list available hardware models. Only one > - watchdog can be enabled for a guest. > - > - The following models may be available: > - > - ``ib700`` > - iBASE 700 is a very simple ISA watchdog with a single timer. > - > - ``i6300esb`` > - Intel 6300ESB I/O controller hub is a much more featureful > - PCI-based dual-timer watchdog. > - > - ``diag288`` > - A virtual watchdog for s390x backed by the diagnose 288 > - hypercall (currently KVM only). > -ERST > - > DEF("watchdog-action", HAS_ARG, QEMU_OPTION_watchdog_action, \ > "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none\n" \ > " action when watchdog fires [default=reset]\n", > @@ -4498,7 +4469,7 @@ SRST > > Examples: > > - ``-watchdog i6300esb -watchdog-action pause``; \ ``-watchdog ib700`` > + ``-device i6300esb -watchdog-action pause`` > > ERST > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index e62b9cc35d..b8788e765a 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -53,7 +53,6 @@ > #include "hw/isa/isa.h" > #include "hw/scsi/scsi.h" > #include "hw/display/vga.h" > -#include "sysemu/watchdog.h" > #include "hw/firmware/smbios.h" > #include "hw/acpi/acpi.h" > #include "hw/xen/xen.h" > @@ -181,7 +180,6 @@ static Chardev **serial_hds; > static const char *log_mask; > static const char *log_file; > static bool list_data_dirs; > -static const char *watchdog; > static const char *qtest_chrdev; > static const char *qtest_log; > > @@ -2329,12 +2327,6 @@ static void qemu_process_sugar_options(void) > } > object_register_sugar_prop("memory-backend", "prealloc", "on", false); > } > - > - if (watchdog) { > - int i = select_watchdog(watchdog); > - if (i > 0) > - exit (i == 1 ? 1 : 0); > - } > } > > /* -action processing */ > @@ -3107,14 +3099,6 @@ void qemu_init(int argc, char **argv, char **envp) > default_monitor = 0; > } > break; > - case QEMU_OPTION_watchdog: > - if (watchdog) { > - error_report("only one watchdog option may be given"); > - exit(1); > - } > - warn_report("-watchdog is deprecated; use -device instead."); > - watchdog = optarg; > - break; > case QEMU_OPTION_action: > olist = qemu_find_opts("action"); > if (!qemu_opts_parse_noisily(olist, optarg, false)) {

1 0

[RFC PATCH 0/5] add support for histograms as a virTypedParameterType
by Amneesh Singh 22 Sep '22

22 Sep '22

This series extends https://listman.redhat.com/archives/libvir-list/2022-September/234197.html to support histogram statistics. This requires adding it as a virTypedParameterType. [1/5]: - add virHistogram as a virTypedParameterType - add utility functions for virHistogram [2/5] - add a global feature for histograms similar to strings [3/5] - add a flag for histograms similar to the one for strings to check compatibility for older clients. [4/5] - add histogram statistics which were previously ignored in the series linked above [5/5] - add RPC support for virHistogram Amneesh Singh (5): virtypedparam: add virHistogram as a virTypedParameterType add a global feature for supporting virHistogram virtypedparams: add VIR_TYPED_PARAM_HISTOGRAM_OKAY qemu_driver: add histograms to the stats remote: add virHistogram support for RPC as a virTypedParameterType include/libvirt/libvirt-common.h.in | 59 +++++++++-- src/admin/admin_server_dispatch.c | 6 +- src/ch/ch_driver.c | 1 + src/driver.c | 1 + src/esx/esx_driver.c | 1 + src/libvirt.c | 46 ++++++--- src/libvirt_internal.h | 5 + src/libvirt_private.syms | 7 ++ src/libvirt_public.syms | 6 ++ src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/network/bridge_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/qemu/qemu_driver.c | 42 +++++++- src/remote/remote_daemon_dispatch.c | 15 ++- src/remote/remote_driver.c | 16 +-- src/remote/remote_protocol.x | 16 +++ src/remote_protocol-structs | 13 +++ src/rpc/gendispatch.pl | 4 +- src/test/test_driver.c | 1 + src/util/virtypedparam-public.c | 101 +++++++++++++++++++ src/util/virtypedparam.c | 145 ++++++++++++++++++++++++++++ src/util/virtypedparam.h | 22 +++++ src/vz/vz_driver.c | 1 + tools/vsh.c | 5 + 25 files changed, 479 insertions(+), 38 deletions(-) -- 2.37.1

1 5

[libvirt PATCH] src: warn if client hits the max requests limit
by Daniel P. Berrangé 21 Sep '22

21 Sep '22

Since they are simply normal RPC messages, the keep alive packets are subject to the "max_client_requests" limit just like any API calls. Thus, if a client hits the 'max_client_requests' limit and all the pending API calls take a long time to complete, it may result in keep-alives firing and dropping the client connection. This has been seen by a number of users with the default value of max_client_requests=5, by issuing 5 concurrent live migration operations. By printing a warning message when this happens, admins will be alerted to the fact that their active clients are exceeding the default client requests limit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- I'm a little wary of this change. If we use anything less than VIR_WARN it is not going to be useful, as we need it visible by default. At the same time though I'm concerned that this might expose very many deployments using an unreasonably low max_client_requests value for their workload. For example OpenStack deployment tools have often left this on the default setting and have been known to exceed it with live migration running concurrently. One possible optimization would be to only issue this warning once per connected client, so we don't spam repeatedly ? src/rpc/virnetserverclient.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index d57ca07167..0d82726194 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1259,6 +1259,10 @@ static virNetMessage *virNetServerClientDispatchRead(virNetServerClient *client) client->rx->buffer = g_new0(char, client->rx->bufferLength); client->nrequests++; } + } else { + VIR_WARN("Client hit max requests limit %zd. This may result " + "in keep-alive timeouts. Consider tuning the " + "max_client_requests server parameter", client->nrequests); } virNetServerClientUpdateEvent(client); -- 2.37.2

2 2

[PULL 21/30] Deprecate 32 bit big-endian MIPS
by Alex Bennée 20 Sep '22

20 Sep '22

It's becoming harder to maintain a cross-compiler to test this host architecture as the old stable Debian 10 ("Buster") moved into LTS which supports fewer architectures. For now: - mark it's deprecation in the docs - downgrade the containers to build TCG tests only - drop the cross builds from our CI Users with an appropriate toolchain and user-space can still take their chances building it. Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Reviewed-by: Huacai Chen <chenhuacai(a)kernel.org> Reviewed-by: Richard Henderson <richard.henderson(a)linaro.org> Message-Id: <20220914155950.804707-22-alex.bennee(a)linaro.org> diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index a2fee53248..1c1e7b9e11 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -41,7 +41,7 @@ Those hosts are officially supported, with various accelerators: - Accelerators * - Arm - kvm (64 bit only), tcg, xen - * - MIPS + * - MIPS (little endian only) - kvm, tcg * - PPC - kvm, tcg diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c75a25daad..0d1fd4469b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -213,6 +213,19 @@ MIPS ``Trap-and-Emul`` KVM support (since 6.0) The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed from Linux upstream kernel, declare it deprecated. +Host Architectures +------------------ + +BE MIPS (since 7.2) +''''''''''''''''''' + +As Debian 10 ("Buster") moved into LTS the big endian 32 bit version of +MIPS moved out of support making it hard to maintain our +cross-compilation CI tests of the architecture. As we no longer have +CI coverage support may bitrot away before the deprecation process +completes. The little endian variants of MIPS (both 32 and 64 bit) are +still a supported host architecture. + QEMU API (QAPI) events ---------------------- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 611c6c0b39..95d57e1c5d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -89,7 +89,6 @@ mips64el-debian-cross-container: mips-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 4a5fb6ea2a..c4cd96433d 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -70,20 +70,6 @@ cross-i386-tci: EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user MAKE_CHECK_ARGS: check check-tcg -cross-mips-system: - extends: .cross_system_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - -cross-mips-user: - extends: .cross_user_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - cross-mipsel-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c3375f89c5..b1bf56434f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -81,14 +81,12 @@ endif # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross +DOCKER_PARTIAL_IMAGES += debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-mips-cross: docker-image-debian10 - # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= @@ -144,6 +142,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross +DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 26c154014d..7b55f0f3b2 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -1,32 +1,14 @@ # # Docker mips cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 - -MAINTAINER Philippe Mathieu-Daudé <f4bug(a)amsat.org> - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mips -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mips-linux-gnu - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips --arch-only qemu - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu- -ENV DEF_TARGET_LIST mips-softmmu,mipsel-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mips \ - liblzo2-dev:mips \ - librdmacm-dev:mips \ - libsnappy-dev:mips +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross -- 2.34.1

1 0

[PATCH v2] virdomainjob: virDomainObjInitJob: Avoid borrowing memory from 'virDomainXMLOption'
by Peter Krempa 20 Sep '22

20 Sep '22

The 'cb' and 'jobDataPrivateCb' pointers are stored in the job object but made point to the memory owned by the virDomainXMLOption struct in the callers. Since the 'virdomainjob' module isn't in control the lifetime of the virDomainXMLOption, which in some cases is freed before the domain job data, freed memory would be dereferenced in some cases. Copy the structs from virDomainXMLOption to ensure the lifetime. This is possible since the callback functions are immutable. Fixes: 84e9fd068ccad6e19e037cd6680df437617e2de5 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - copy both pointers - don't bother with creating copy functions, use g_memdup src/conf/virdomainjob.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index 7915faa125..aca801af38 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -128,8 +128,8 @@ virDomainObjInitJob(virDomainJobObj *job, virDomainJobDataPrivateDataCallbacks *jobDataPrivateCb) { memset(job, 0, sizeof(*job)); - job->cb = cb; - job->jobDataPrivateCb = jobDataPrivateCb; + job->cb = g_memdup(cb, sizeof(*cb)); + job->jobDataPrivateCb = g_memdup(jobDataPrivateCb, sizeof(*jobDataPrivateCb)); if (virCondInit(&job->cond) < 0) return -1; @@ -229,6 +229,9 @@ virDomainObjClearJob(virDomainJobObj *job) if (job->cb && job->cb->freeJobPrivate) g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); + + g_clear_pointer(&job->cb, g_free); + g_clear_pointer(&job->jobDataPrivateCb, g_free); } void -- 2.37.1

3 4

[PATCH] virdomainjob: virDomainObjInitJob: Store a copy of virDomainObjPrivateJobCallbacks
by Peter Krempa 19 Sep '22

19 Sep '22

'virDomainObjPrivateJobCallbacks' is passed into the job object by copying a pointer from the 'virDomainXMLOption' struct passed in from the caller. Unfortunately the 'virdomainjob' module can't control the lifetime of the virDomainXMLOption, which in some cases is freed before the domain job data. To avoid dereferencing freed memory create a copy of the struct holding the private job callbacks. Fixes: 84e9fd068ccad6e19e037cd6680df437617e2de5 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This is a naive attempt to fix a crash reported on the upstream mailing list https://listman.redhat.com/archives/libvir-list/2022-September/234310.html Note that I didn't analyze the code in that series in detail, I just debugged the visible misbehaviour. CI pipeline now passes even on OpenSUSE: https://gitlab.com/pipo.sk/libvirt/-/pipelines/643828256 src/conf/virdomainjob.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index 7915faa125..16fb0c2177 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -122,13 +122,25 @@ virDomainJobStatusToType(virDomainJobStatus status) return VIR_DOMAIN_JOB_NONE; } + +static virDomainObjPrivateJobCallbacks * +virDomainObjPrivateJobCallbacksCopy(virDomainObjPrivateJobCallbacks *cb) +{ + virDomainObjPrivateJobCallbacks *ret = g_new0(virDomainObjPrivateJobCallbacks, 1); + + memcpy(ret, cb, sizeof(virDomainObjPrivateJobCallbacks)); + + return ret; +} + + int virDomainObjInitJob(virDomainJobObj *job, virDomainObjPrivateJobCallbacks *cb, virDomainJobDataPrivateDataCallbacks *jobDataPrivateCb) { memset(job, 0, sizeof(*job)); - job->cb = cb; + job->cb = virDomainObjPrivateJobCallbacksCopy(cb); job->jobDataPrivateCb = jobDataPrivateCb; if (virCondInit(&job->cond) < 0) @@ -229,6 +241,8 @@ virDomainObjClearJob(virDomainJobObj *job) if (job->cb && job->cb->freeJobPrivate) g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); + + g_clear_pointer(&job->cb, g_free); } void -- 2.37.1

2 1

[PATCH v2] meson: Require libssh-0.8.1 or newer
by Michal Privoznik 19 Sep '22

19 Sep '22

According to repology.org: RHEL-8: 0.9.4 RHEL-9: 0.9.6 Debian 11: 0.9.5 openSUSE Leap 15.3: 0.8.7 Ubuntu 20.04: 0.9.3 And the rest of distros has something newer anyways. Requiring 0.8.1 or newer allows us to drop the terrible hack where we rename functions at meson level using #define. Note, 0.8.0 is the version of libssh where the rename happened. It also allows us to stick with SHA-256 hash algorithm for public keys. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-September/234296.html diff to v1: - Require even newer version so that more code can be dropped. libvirt.spec.in | 2 +- meson.build | 15 +-------------- src/rpc/virnetlibsshsession.c | 8 +------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b199c624b8..654057bf57 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -378,7 +378,7 @@ BuildRequires: wireshark-devel %endif %if %{with_libssh} -BuildRequires: libssh-devel >= 0.7.0 +BuildRequires: libssh-devel >= 0.8.1 %endif BuildRequires: rpcgen diff --git a/meson.build b/meson.build index ed9f4b3f70..24b12515c2 100644 --- a/meson.build +++ b/meson.build @@ -1025,24 +1025,11 @@ else libpcap_dep = dependency('', required: false) endif -libssh_version = '0.7' +libssh_version = '0.8.1' if conf.has('WITH_REMOTE') libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) - - # Check if new functions exists, if not redefine them with old deprecated ones. - # List of [ new_function, deprecated_function ]. - functions = [ - [ 'ssh_get_server_publickey', 'ssh_get_publickey' ], - [ 'ssh_session_is_known_server', 'ssh_is_server_known' ], - [ 'ssh_session_update_known_hosts', 'ssh_write_knownhost' ], - ] - foreach name : functions - if not cc.has_function(name[0], dependencies: libssh_dep) - conf.set(name[0], name[1]) - endif - endforeach endif else libssh_dep = dependency('', required: false) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index a3adc85728..b1420bea2c 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -39,12 +39,6 @@ VIR_LOG_INIT("rpc.netlibsshsession"); #define VIR_NET_LIBSSH_BUFFER_SIZE 1024 -#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 1) -# define VIR_SSH_HOSTKEY_HASH SSH_PUBLICKEY_HASH_SHA1 -#else -# define VIR_SSH_HOSTKEY_HASH SSH_PUBLICKEY_HASH_SHA256 -#endif - /* TRACE_LIBSSH=<level> enables tracing in libssh itself. * The meaning of <level> is described here: * https://api.libssh.org/master/group__libssh__log.html @@ -212,7 +206,7 @@ virLibsshServerKeyAsString(virNetLibsshSession *sess) /* calculate remote key hash, using SHA256 algorithm that is * the default in modern OpenSSH, fallback to SHA1 for older * libssh. The returned value must be freed */ - ret = ssh_get_publickey_hash(key, VIR_SSH_HOSTKEY_HASH, + ret = ssh_get_publickey_hash(key, SSH_PUBLICKEY_HASH_SHA256, &keyhash, &keyhashlen); ssh_key_free(key); if (ret < 0) { -- 2.35.1

2 1

Plans for the next release
by Jiri Denemark 19 Sep '22

19 Sep '22

We are getting close to the next release of libvirt. To aim for the release on Oct 03 I suggest entering the freeze on Tuesday Sep 27 and tagging RC2 on Friday Sep 30. I hope this works for everyone. Jirka

1 0

Re: [PATCH v2 08/11] vfio/migration: Remove VFIO migration protocol v1
by Philippe Mathieu-Daudé 19 Sep '22

19 Sep '22

On Mon, May 30, 2022 at 7:56 PM Avihai Horon <avihaih(a)nvidia.com> wrote: > > Now that v2 protocol implementation has been added, remove the > deprecated v1 implementation. Worth a note in docs/about/deprecated.rst? > Signed-off-by: Avihai Horon <avihaih(a)nvidia.com> > --- > hw/vfio/common.c | 19 +- > hw/vfio/migration.c | 698 +--------------------------------- > hw/vfio/trace-events | 5 - > include/hw/vfio/vfio-common.h | 5 - > 4 files changed, 24 insertions(+), 703 deletions(-) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 5541133ec9..00c6cb0ffe 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -355,14 +355,7 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container) > return false; > } > > - if (!migration->v2 && > - (vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF) && > - (migration->device_state_v1 & VFIO_DEVICE_STATE_V1_RUNNING)) { > - return false; > - } > - > - if (migration->v2 && > - (vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF) && > + if ((vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF) && > (migration->device_state == VFIO_DEVICE_STATE_RUNNING || > migration->device_state == VFIO_DEVICE_STATE_RUNNING_P2P)) { > return false; > @@ -393,14 +386,8 @@ static bool vfio_devices_all_running_and_mig_active(VFIOContainer *container) > return false; > } > > - if (!migration->v2 && > - migration->device_state_v1 & VFIO_DEVICE_STATE_V1_RUNNING) { > - continue; > - } > - > - if (migration->v2 && > - (migration->device_state == VFIO_DEVICE_STATE_RUNNING || > - migration->device_state == VFIO_DEVICE_STATE_RUNNING_P2P)) { > + if (migration->device_state == VFIO_DEVICE_STATE_RUNNING || > + migration->device_state == VFIO_DEVICE_STATE_RUNNING_P2P) { > continue; > } else { > return false; > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index de68eadb09..852759e6ca 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -121,220 +121,6 @@ static int vfio_migration_set_state(VFIODevice *vbasedev, > return 0; > } > > -static inline int vfio_mig_access(VFIODevice *vbasedev, void *val, int count, > - off_t off, bool iswrite) > -{ > - int ret; > - > - ret = iswrite ? pwrite(vbasedev->fd, val, count, off) : > - pread(vbasedev->fd, val, count, off); > - if (ret < count) { > - error_report("vfio_mig_%s %d byte %s: failed at offset 0x%" > - HWADDR_PRIx", err: %s", iswrite ? "write" : "read", count, > - vbasedev->name, off, strerror(errno)); > - return (ret < 0) ? ret : -EINVAL; > - } > - return 0; > -} > - > -static int vfio_mig_rw(VFIODevice *vbasedev, __u8 *buf, size_t count, > - off_t off, bool iswrite) > -{ > - int ret, done = 0; > - __u8 *tbuf = buf; > - > - while (count) { > - int bytes = 0; > - > - if (count >= 8 && !(off % 8)) { > - bytes = 8; > - } else if (count >= 4 && !(off % 4)) { > - bytes = 4; > - } else if (count >= 2 && !(off % 2)) { > - bytes = 2; > - } else { > - bytes = 1; > - } > - > - ret = vfio_mig_access(vbasedev, tbuf, bytes, off, iswrite); > - if (ret) { > - return ret; > - } > - > - count -= bytes; > - done += bytes; > - off += bytes; > - tbuf += bytes; > - } > - return done; > -} > - > -#define vfio_mig_read(f, v, c, o) vfio_mig_rw(f, (__u8 *)v, c, o, false) > -#define vfio_mig_write(f, v, c, o) vfio_mig_rw(f, (__u8 *)v, c, o, true) > - > -#define VFIO_MIG_STRUCT_OFFSET(f) \ > - offsetof(struct vfio_device_migration_info, f) > -/* > - * Change the device_state register for device @vbasedev. Bits set in @mask > - * are preserved, bits set in @value are set, and bits not set in either @mask > - * or @value are cleared in device_state. If the register cannot be accessed, > - * the resulting state would be invalid, or the device enters an error state, > - * an error is returned. > - */ > - > -static int vfio_migration_v1_set_state(VFIODevice *vbasedev, uint32_t mask, > - uint32_t value) > -{ > - VFIOMigration *migration = vbasedev->migration; > - VFIORegion *region = &migration->region; > - off_t dev_state_off = region->fd_offset + > - VFIO_MIG_STRUCT_OFFSET(device_state); > - uint32_t device_state; > - int ret; > - > - ret = vfio_mig_read(vbasedev, &device_state, sizeof(device_state), > - dev_state_off); > - if (ret < 0) { > - return ret; > - } > - > - device_state = (device_state & mask) | value; > - > - if (!VFIO_DEVICE_STATE_VALID(device_state)) { > - return -EINVAL; > - } > - > - ret = vfio_mig_write(vbasedev, &device_state, sizeof(device_state), > - dev_state_off); > - if (ret < 0) { > - int rret; > - > - rret = vfio_mig_read(vbasedev, &device_state, sizeof(device_state), > - dev_state_off); > - > - if ((rret < 0) || (VFIO_DEVICE_STATE_IS_ERROR(device_state))) { > - hw_error("%s: Device in error state 0x%x", vbasedev->name, > - device_state); > - return rret ? rret : -EIO; > - } > - return ret; > - } > - > - migration->device_state_v1 = device_state; > - trace_vfio_migration_set_state(vbasedev->name, device_state); > - return 0; > -} > - > -static void *get_data_section_size(VFIORegion *region, uint64_t data_offset, > - uint64_t data_size, uint64_t *size) > -{ > - void *ptr = NULL; > - uint64_t limit = 0; > - int i; > - > - if (!region->mmaps) { > - if (size) { > - *size = MIN(data_size, region->size - data_offset); > - } > - return ptr; > - } > - > - for (i = 0; i < region->nr_mmaps; i++) { > - VFIOMmap *map = region->mmaps + i; > - > - if ((data_offset >= map->offset) && > - (data_offset < map->offset + map->size)) { > - > - /* check if data_offset is within sparse mmap areas */ > - ptr = map->mmap + data_offset - map->offset; > - if (size) { > - *size = MIN(data_size, map->offset + map->size - data_offset); > - } > - break; > - } else if ((data_offset < map->offset) && > - (!limit || limit > map->offset)) { > - /* > - * data_offset is not within sparse mmap areas, find size of > - * non-mapped area. Check through all list since region->mmaps list > - * is not sorted. > - */ > - limit = map->offset; > - } > - } > - > - if (!ptr && size) { > - *size = limit ? MIN(data_size, limit - data_offset) : data_size; > - } > - return ptr; > -} > - > -static int vfio_save_buffer(QEMUFile *f, VFIODevice *vbasedev, uint64_t *size) > -{ > - VFIOMigration *migration = vbasedev->migration; > - VFIORegion *region = &migration->region; > - uint64_t data_offset = 0, data_size = 0, sz; > - int ret; > - > - ret = vfio_mig_read(vbasedev, &data_offset, sizeof(data_offset), > - region->fd_offset + VFIO_MIG_STRUCT_OFFSET(data_offset)); > - if (ret < 0) { > - return ret; > - } > - > - ret = vfio_mig_read(vbasedev, &data_size, sizeof(data_size), > - region->fd_offset + VFIO_MIG_STRUCT_OFFSET(data_size)); > - if (ret < 0) { > - return ret; > - } > - > - trace_vfio_save_buffer(vbasedev->name, data_offset, data_size, > - migration->pending_bytes); > - > - qemu_put_be64(f, data_size); > - sz = data_size; > - > - while (sz) { > - void *buf; > - uint64_t sec_size; > - bool buf_allocated = false; > - > - buf = get_data_section_size(region, data_offset, sz, &sec_size); > - > - if (!buf) { > - buf = g_try_malloc(sec_size); > - if (!buf) { > - error_report("%s: Error allocating buffer ", __func__); > - return -ENOMEM; > - } > - buf_allocated = true; > - > - ret = vfio_mig_read(vbasedev, buf, sec_size, > - region->fd_offset + data_offset); > - if (ret < 0) { > - g_free(buf); > - return ret; > - } > - } > - > - qemu_put_buffer(f, buf, sec_size); > - > - if (buf_allocated) { > - g_free(buf); > - } > - sz -= sec_size; > - data_offset += sec_size; > - } > - > - ret = qemu_file_get_error(f); > - > - if (!ret && size) { > - *size = data_size; > - } > - > - bytes_transferred += data_size; > - return ret; > -} > - > static int vfio_load_buffer(QEMUFile *f, VFIODevice *vbasedev, > uint64_t data_size) > { > @@ -351,96 +137,6 @@ static int vfio_load_buffer(QEMUFile *f, VFIODevice *vbasedev, > return 0; > } > > -static int vfio_v1_load_buffer(QEMUFile *f, VFIODevice *vbasedev, > - uint64_t data_size) > -{ > - VFIORegion *region = &vbasedev->migration->region; > - uint64_t data_offset = 0, size, report_size; > - int ret; > - > - do { > - ret = vfio_mig_read(vbasedev, &data_offset, sizeof(data_offset), > - region->fd_offset + VFIO_MIG_STRUCT_OFFSET(data_offset)); > - if (ret < 0) { > - return ret; > - } > - > - if (data_offset + data_size > region->size) { > - /* > - * If data_size is greater than the data section of migration region > - * then iterate the write buffer operation. This case can occur if > - * size of migration region at destination is smaller than size of > - * migration region at source. > - */ > - report_size = size = region->size - data_offset; > - data_size -= size; > - } else { > - report_size = size = data_size; > - data_size = 0; > - } > - > - trace_vfio_v1_load_state_device_data(vbasedev->name, data_offset, size); > - > - while (size) { > - void *buf; > - uint64_t sec_size; > - bool buf_alloc = false; > - > - buf = get_data_section_size(region, data_offset, size, &sec_size); > - > - if (!buf) { > - buf = g_try_malloc(sec_size); > - if (!buf) { > - error_report("%s: Error allocating buffer ", __func__); > - return -ENOMEM; > - } > - buf_alloc = true; > - } > - > - qemu_get_buffer(f, buf, sec_size); > - > - if (buf_alloc) { > - ret = vfio_mig_write(vbasedev, buf, sec_size, > - region->fd_offset + data_offset); > - g_free(buf); > - > - if (ret < 0) { > - return ret; > - } > - } > - size -= sec_size; > - data_offset += sec_size; > - } > - > - ret = vfio_mig_write(vbasedev, &report_size, sizeof(report_size), > - region->fd_offset + VFIO_MIG_STRUCT_OFFSET(data_size)); > - if (ret < 0) { > - return ret; > - } > - } while (data_size); > - > - return 0; > -} > - > -static int vfio_update_pending(VFIODevice *vbasedev) > -{ > - VFIOMigration *migration = vbasedev->migration; > - VFIORegion *region = &migration->region; > - uint64_t pending_bytes = 0; > - int ret; > - > - ret = vfio_mig_read(vbasedev, &pending_bytes, sizeof(pending_bytes), > - region->fd_offset + VFIO_MIG_STRUCT_OFFSET(pending_bytes)); > - if (ret < 0) { > - migration->pending_bytes = 0; > - return ret; > - } > - > - migration->pending_bytes = pending_bytes; > - trace_vfio_update_pending(vbasedev->name, pending_bytes); > - return 0; > -} > - > static int vfio_save_device_config_state(QEMUFile *f, void *opaque) > { > VFIODevice *vbasedev = opaque; > @@ -493,15 +189,6 @@ static void vfio_migration_cleanup(VFIODevice *vbasedev) > migration->data_fd = -1; > } > > -static void vfio_migration_v1_cleanup(VFIODevice *vbasedev) > -{ > - VFIOMigration *migration = vbasedev->migration; > - > - if (migration->region.mmaps) { > - vfio_region_unmap(&migration->region); > - } > -} > - > /* ---------------------------------------------------------------------- */ > > static int vfio_save_setup(QEMUFile *f, void *opaque) > @@ -516,49 +203,6 @@ static int vfio_save_setup(QEMUFile *f, void *opaque) > return qemu_file_get_error(f); > } > > -static int vfio_v1_save_setup(QEMUFile *f, void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - int ret; > - > - trace_vfio_save_setup(vbasedev->name); > - > - qemu_put_be64(f, VFIO_MIG_FLAG_DEV_SETUP_STATE); > - > - if (migration->region.mmaps) { > - /* > - * Calling vfio_region_mmap() from migration thread. Memory API called > - * from this function require locking the iothread when called from > - * outside the main loop thread. > - */ > - qemu_mutex_lock_iothread(); > - ret = vfio_region_mmap(&migration->region); > - qemu_mutex_unlock_iothread(); > - if (ret) { > - error_report("%s: Failed to mmap VFIO migration region: %s", > - vbasedev->name, strerror(-ret)); > - error_report("%s: Falling back to slow path", vbasedev->name); > - } > - } > - > - ret = vfio_migration_v1_set_state(vbasedev, VFIO_DEVICE_STATE_MASK, > - VFIO_DEVICE_STATE_V1_SAVING); > - if (ret) { > - error_report("%s: Failed to set state SAVING", vbasedev->name); > - return ret; > - } > - > - qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); > - > - ret = qemu_file_get_error(f); > - if (ret) { > - return ret; > - } > - > - return 0; > -} > - > static void vfio_save_cleanup(void *opaque) > { > VFIODevice *vbasedev = opaque; > @@ -567,82 +211,6 @@ static void vfio_save_cleanup(void *opaque) > trace_vfio_save_cleanup(vbasedev->name); > } > > -static void vfio_v1_save_cleanup(void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - > - vfio_migration_v1_cleanup(vbasedev); > - trace_vfio_save_cleanup(vbasedev->name); > -} > - > -static void vfio_save_pending(QEMUFile *f, void *opaque, > - uint64_t threshold_size, > - uint64_t *res_precopy_only, > - uint64_t *res_compatible, > - uint64_t *res_postcopy_only) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - int ret; > - > - ret = vfio_update_pending(vbasedev); > - if (ret) { > - return; > - } > - > - *res_precopy_only += migration->pending_bytes; > - > - trace_vfio_save_pending(vbasedev->name, *res_precopy_only, > - *res_postcopy_only, *res_compatible); > -} > - > -static int vfio_save_iterate(QEMUFile *f, void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - uint64_t data_size; > - int ret; > - > - qemu_put_be64(f, VFIO_MIG_FLAG_DEV_DATA_STATE); > - > - if (migration->pending_bytes == 0) { > - ret = vfio_update_pending(vbasedev); > - if (ret) { > - return ret; > - } > - > - if (migration->pending_bytes == 0) { > - qemu_put_be64(f, 0); > - qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); > - /* indicates data finished, goto complete phase */ > - return 1; > - } > - } > - > - ret = vfio_save_buffer(f, vbasedev, &data_size); > - if (ret) { > - error_report("%s: vfio_save_buffer failed %s", vbasedev->name, > - strerror(errno)); > - return ret; > - } > - > - qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); > - > - ret = qemu_file_get_error(f); > - if (ret) { > - return ret; > - } > - > - /* > - * Reset pending_bytes as .save_live_pending is not called during savevm or > - * snapshot case, in such case vfio_update_pending() at the start of this > - * function updates pending_bytes. > - */ > - migration->pending_bytes = 0; > - trace_vfio_save_iterate(vbasedev->name, data_size); > - return 0; > -} > - > /* Returns 1 if end-of-stream is reached, 0 if more data and -1 if error */ > static int vfio_save_block(QEMUFile *f, VFIOMigration *migration) > { > @@ -706,62 +274,6 @@ static int vfio_save_complete_precopy(QEMUFile *f, void *opaque) > return 0; > } > > -static int vfio_v1_save_complete_precopy(QEMUFile *f, void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - uint64_t data_size; > - int ret; > - > - ret = vfio_migration_v1_set_state(vbasedev, ~VFIO_DEVICE_STATE_V1_RUNNING, > - VFIO_DEVICE_STATE_V1_SAVING); > - if (ret) { > - error_report("%s: Failed to set state STOP and SAVING", > - vbasedev->name); > - return ret; > - } > - > - ret = vfio_update_pending(vbasedev); > - if (ret) { > - return ret; > - } > - > - while (migration->pending_bytes > 0) { > - qemu_put_be64(f, VFIO_MIG_FLAG_DEV_DATA_STATE); > - ret = vfio_save_buffer(f, vbasedev, &data_size); > - if (ret < 0) { > - error_report("%s: Failed to save buffer", vbasedev->name); > - return ret; > - } > - > - if (data_size == 0) { > - break; > - } > - > - ret = vfio_update_pending(vbasedev); > - if (ret) { > - return ret; > - } > - } > - > - qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); > - > - ret = qemu_file_get_error(f); > - if (ret) { > - return ret; > - } > - > - ret = vfio_migration_v1_set_state(vbasedev, ~VFIO_DEVICE_STATE_V1_SAVING, > - 0); > - if (ret) { > - error_report("%s: Failed to set state STOPPED", vbasedev->name); > - return ret; > - } > - > - trace_vfio_save_complete_precopy(vbasedev->name); > - return ret; > -} > - > static void vfio_save_state(QEMUFile *f, void *opaque) > { > VFIODevice *vbasedev = opaque; > @@ -783,33 +295,6 @@ static int vfio_load_setup(QEMUFile *f, void *opaque) > vbasedev->migration->device_state); > } > > -static int vfio_v1_load_setup(QEMUFile *f, void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - int ret = 0; > - > - if (migration->region.mmaps) { > - ret = vfio_region_mmap(&migration->region); > - if (ret) { > - error_report("%s: Failed to mmap VFIO migration region %d: %s", > - vbasedev->name, migration->region.nr, > - strerror(-ret)); > - error_report("%s: Falling back to slow path", vbasedev->name); > - } > - } > - > - ret = vfio_migration_v1_set_state(vbasedev, ~VFIO_DEVICE_STATE_MASK, > - VFIO_DEVICE_STATE_V1_RESUMING); > - if (ret) { > - error_report("%s: Failed to set state RESUMING", vbasedev->name); > - if (migration->region.mmaps) { > - vfio_region_unmap(&migration->region); > - } > - } > - return ret; > -} > - > static int vfio_load_cleanup(void *opaque) > { > VFIODevice *vbasedev = opaque; > @@ -819,15 +304,6 @@ static int vfio_load_cleanup(void *opaque) > return 0; > } > > -static int vfio_v1_load_cleanup(void *opaque) > -{ > - VFIODevice *vbasedev = opaque; > - > - vfio_migration_v1_cleanup(vbasedev); > - trace_vfio_load_cleanup(vbasedev->name); > - return 0; > -} > - > static int vfio_load_state(QEMUFile *f, void *opaque, int version_id) > { > VFIODevice *vbasedev = opaque; > @@ -861,11 +337,7 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id) > uint64_t data_size = qemu_get_be64(f); > > if (data_size) { > - if (vbasedev->migration->v2) { > - ret = vfio_load_buffer(f, vbasedev, data_size); > - } else { > - ret = vfio_v1_load_buffer(f, vbasedev, data_size); > - } > + ret = vfio_load_buffer(f, vbasedev, data_size); > if (ret < 0) { > return ret; > } > @@ -896,18 +368,6 @@ static SaveVMHandlers savevm_vfio_handlers = { > .load_state = vfio_load_state, > }; > > -static SaveVMHandlers savevm_vfio_v1_handlers = { > - .save_setup = vfio_v1_save_setup, > - .save_cleanup = vfio_v1_save_cleanup, > - .save_live_pending = vfio_save_pending, > - .save_live_iterate = vfio_save_iterate, > - .save_live_complete_precopy = vfio_v1_save_complete_precopy, > - .save_state = vfio_save_state, > - .load_setup = vfio_v1_load_setup, > - .load_cleanup = vfio_v1_load_cleanup, > - .load_state = vfio_load_state, > -}; > - > /* ---------------------------------------------------------------------- */ > > static void vfio_vmstate_change(void *opaque, bool running, RunState state) > @@ -938,70 +398,12 @@ static void vfio_vmstate_change(void *opaque, bool running, RunState state) > new_state); > } > > -static void vfio_v1_vmstate_change(void *opaque, bool running, RunState state) > -{ > - VFIODevice *vbasedev = opaque; > - VFIOMigration *migration = vbasedev->migration; > - uint32_t value, mask; > - int ret; > - > - if (vbasedev->migration->vm_running == running) { > - return; > - } > - > - if (running) { > - /* > - * Here device state can have one of _SAVING, _RESUMING or _STOP bit. > - * Transition from _SAVING to _RUNNING can happen if there is migration > - * failure, in that case clear _SAVING bit. > - * Transition from _RESUMING to _RUNNING occurs during resuming > - * phase, in that case clear _RESUMING bit. > - * In both the above cases, set _RUNNING bit. > - */ > - mask = ~VFIO_DEVICE_STATE_MASK; > - value = VFIO_DEVICE_STATE_V1_RUNNING; > - } else { > - /* > - * Here device state could be either _RUNNING or _SAVING|_RUNNING. Reset > - * _RUNNING bit > - */ > - mask = ~VFIO_DEVICE_STATE_V1_RUNNING; > - > - /* > - * When VM state transition to stop for savevm command, device should > - * start saving data. > - */ > - if (state == RUN_STATE_SAVE_VM) { > - value = VFIO_DEVICE_STATE_V1_SAVING; > - } else { > - value = 0; > - } > - } > - > - ret = vfio_migration_v1_set_state(vbasedev, mask, value); > - if (ret) { > - /* > - * Migration should be aborted in this case, but vm_state_notify() > - * currently does not support reporting failures. > - */ > - error_report("%s: Failed to set device state 0x%x", vbasedev->name, > - (migration->device_state_v1 & mask) | value); > - if (migrate_get_current()->to_dst_file) { > - qemu_file_set_error(migrate_get_current()->to_dst_file, ret); > - } > - } > - vbasedev->migration->vm_running = running; > - trace_vfio_vmstate_change(vbasedev->name, running, RunState_str(state), > - (migration->device_state_v1 & mask) | value); > -} > - > static void vfio_migration_state_notifier(Notifier *notifier, void *data) > { > MigrationState *s = data; > VFIOMigration *migration = container_of(notifier, VFIOMigration, > migration_state); > VFIODevice *vbasedev = migration->vbasedev; > - int ret; > > trace_vfio_migration_state_notifier(vbasedev->name, > MigrationStatus_str(s->state)); > @@ -1011,31 +413,14 @@ static void vfio_migration_state_notifier(Notifier *notifier, void *data) > case MIGRATION_STATUS_CANCELLED: > case MIGRATION_STATUS_FAILED: > bytes_transferred = 0; > - if (migration->v2) { > - vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RUNNING, > - VFIO_DEVICE_STATE_ERROR); > - } else { > - ret = vfio_migration_v1_set_state(vbasedev, > - ~(VFIO_DEVICE_STATE_V1_SAVING | > - VFIO_DEVICE_STATE_V1_RESUMING), > - VFIO_DEVICE_STATE_V1_RUNNING); > - if (ret) { > - error_report("%s: Failed to set state RUNNING", vbasedev->name); > - } > - } > + vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RUNNING, > + VFIO_DEVICE_STATE_ERROR); > } > } > > static void vfio_migration_exit(VFIODevice *vbasedev) > { > - VFIOMigration *migration = vbasedev->migration; > - > - if (migration->v2) { > - g_free(migration->data_buffer); > - } else { > - vfio_region_exit(&migration->region); > - vfio_region_finalize(&migration->region); > - } > + g_free(vbasedev->migration->data_buffer); > g_free(vbasedev->migration); > vbasedev->migration = NULL; > } > @@ -1066,7 +451,6 @@ static int vfio_migration_init(VFIODevice *vbasedev) > VFIOMigration *migration; > char id[256] = ""; > g_autofree char *path = NULL, *oid = NULL; > - struct vfio_region_info *info = NULL; > uint64_t mig_flags; > > if (!vbasedev->ops->vfio_get_object) { > @@ -1079,48 +463,20 @@ static int vfio_migration_init(VFIODevice *vbasedev) > } > > ret = vfio_migration_query_flags(vbasedev, &mig_flags); > - if (!ret) { > - /* Migration v2 */ > - /* Basic migration functionality must be supported */ > - if (!(mig_flags & VFIO_MIGRATION_STOP_COPY)) { > - return -EOPNOTSUPP; > - } > - vbasedev->migration = g_new0(VFIOMigration, 1); > - vbasedev->migration->data_buffer_size = VFIO_MIG_DATA_BUFFER_SIZE; > - vbasedev->migration->data_buffer = > - g_malloc0(vbasedev->migration->data_buffer_size); > - vbasedev->migration->data_fd = -1; > - vbasedev->migration->v2 = true; > - } else { > - /* Migration v1 */ > - ret = vfio_get_dev_region_info(vbasedev, > - VFIO_REGION_TYPE_MIGRATION_DEPRECATED, > - VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED, > - &info); > - if (ret) { > - return ret; > - } > - > - vbasedev->migration = g_new0(VFIOMigration, 1); > - > - ret = vfio_region_setup(obj, vbasedev, &vbasedev->migration->region, > - info->index, "migration"); > - if (ret) { > - error_report("%s: Failed to setup VFIO migration region %d: %s", > - vbasedev->name, info->index, strerror(-ret)); > - goto err; > - } > - > - if (!vbasedev->migration->region.size) { > - error_report("%s: Invalid zero-sized VFIO migration region %d", > - vbasedev->name, info->index); > - ret = -EINVAL; > - goto err; > - } > + if (ret) { > + return ret; > + } > > - g_free(info); > + /* Basic migration functionality must be supported */ > + if (!(mig_flags & VFIO_MIGRATION_STOP_COPY)) { > + return -EOPNOTSUPP; > } > > + vbasedev->migration = g_new0(VFIOMigration, 1); > + vbasedev->migration->data_buffer_size = VFIO_MIG_DATA_BUFFER_SIZE; > + vbasedev->migration->data_buffer = > + g_malloc0(vbasedev->migration->data_buffer_size); > + vbasedev->migration->data_fd = -1; > migration = vbasedev->migration; > migration->vbasedev = vbasedev; > > @@ -1132,28 +488,16 @@ static int vfio_migration_init(VFIODevice *vbasedev) > } > strpadcpy(id, sizeof(id), path, '\0'); > > - if (migration->v2) { > - register_savevm_live(id, VMSTATE_INSTANCE_ID_ANY, 1, > - &savevm_vfio_handlers, vbasedev); > - > - migration->vm_state = qdev_add_vm_change_state_handler( > - vbasedev->dev, vfio_vmstate_change, vbasedev); > - } else { > - register_savevm_live(id, VMSTATE_INSTANCE_ID_ANY, 1, > - &savevm_vfio_v1_handlers, vbasedev); > - > - migration->vm_state = qdev_add_vm_change_state_handler( > - vbasedev->dev, vfio_v1_vmstate_change, vbasedev); > - } > + register_savevm_live(id, VMSTATE_INSTANCE_ID_ANY, 1, &savevm_vfio_handlers, > + vbasedev); > > + migration->vm_state = qdev_add_vm_change_state_handler(vbasedev->dev, > + vfio_vmstate_change, > + vbasedev); > migration->migration_state.notify = vfio_migration_state_notifier; > add_migration_state_change_notifier(&migration->migration_state); > - return 0; > > -err: > - g_free(info); > - vfio_migration_exit(vbasedev); > - return ret; > + return 0; > } > > /* ---------------------------------------------------------------------- */ > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index 6e8c5958b9..a24ea7d8b0 100644 > --- a/hw/vfio/trace-events > +++ b/hw/vfio/trace-events > @@ -154,15 +154,10 @@ vfio_vmstate_change(const char *name, int running, const char *reason, uint32_t > vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s" > vfio_save_setup(const char *name) " (%s)" > vfio_save_cleanup(const char *name) " (%s)" > -vfio_save_buffer(const char *name, uint64_t data_offset, uint64_t data_size, uint64_t pending) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64" pending 0x%"PRIx64 > -vfio_update_pending(const char *name, uint64_t pending) " (%s) pending 0x%"PRIx64 > vfio_save_device_config_state(const char *name) " (%s)" > -vfio_save_pending(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t compatible) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" compatible 0x%"PRIx64 > -vfio_save_iterate(const char *name, int data_size) " (%s) data_size %d" > vfio_save_complete_precopy(const char *name) " (%s)" > vfio_load_device_config_state(const char *name) " (%s)" > vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64 > -vfio_v1_load_state_device_data(const char *name, uint64_t data_offset, uint64_t data_size) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64 > vfio_load_state_device_data(const char *name, uint64_t data_size) " (%s) size 0x%"PRIx64 > vfio_load_cleanup(const char *name) " (%s)" > vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start) "container fd=%d, iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64 > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 2ec3346fea..76d470178f 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -61,16 +61,11 @@ typedef struct VFIORegion { > typedef struct VFIOMigration { > struct VFIODevice *vbasedev; > VMChangeStateEntry *vm_state; > - VFIORegion region; > - uint32_t device_state_v1; > - int vm_running; > Notifier migration_state; > - uint64_t pending_bytes; > enum vfio_device_mig_state device_state; > int data_fd; > void *data_buffer; > size_t data_buffer_size; > - bool v2; > } VFIOMigration; > > typedef struct VFIOAddressSpace { > -- > 2.21.3 > >

1 0

[PATCH v2 00/17] jobs: finish generalization
by Kristina Hanicova 19 Sep '22

19 Sep '22

v1 here: https://listman.redhat.com/archives/libvir-list/2022-August/233908.html diff to v1: * changes in the first commit: typo, currentAPI in warning I forgot to move and renamed VIR_FROM_HYPERV to VIR_FROM_NONE as Jano suggested Kristina Hanicova (17): qemu & hypervisor: move qemuDomainObjBeginJobInternal() into hypervisor libxl: remove usage of virDomainJobData move files: hypervisor/domain_job -> conf/virdomainjob virdomainjob: add check for callbacks conf: extend xmlopt with job config & add job object into domain object virdomainjob: make drivers use job object in the domain object qemu: use virDomainObjBeginJob() libxl: use virDomainObjBeginJob() LXC: use virDomainObjBeginJob() CH: use virDomainObjBeginJob() qemu: use virDomainObjEndJob() libxl: use virDomainObjEndJob() LXC: use virDomainObjEndJob() CH: use virDomainObjEndJob() qemu & conf: move BeginAgentJob & EndAgentJob into src/conf/virdomainjob qemu & conf: move BeginAsyncJob & EndAsyncJob into src/conf qemu & conf: move BeginNestedJob & BeginJobNowait into src/conf docs/kbase/internals/qemu-threads.rst | 34 +- po/POTFILES | 1 + src/bhyve/bhyve_domain.c | 2 +- src/ch/ch_conf.c | 2 +- src/ch/ch_domain.c | 76 -- src/ch/ch_domain.h | 11 +- src/ch/ch_driver.c | 40 +- src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 16 +- src/conf/meson.build | 1 + src/conf/virconftypes.h | 2 + src/conf/virdomainjob.c | 665 ++++++++++++++++++ .../domain_job.h => conf/virdomainjob.h} | 37 +- src/hyperv/hyperv_driver.c | 2 +- src/hypervisor/domain_job.c | 249 ------- src/hypervisor/meson.build | 1 - src/libvirt_private.syms | 52 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 113 +-- src/libxl/libxl_domain.h | 18 +- src/libxl/libxl_driver.c | 123 ++-- src/libxl/libxl_migration.c | 20 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_domain.c | 86 --- src/lxc/lxc_domain.h | 14 +- src/lxc/lxc_driver.c | 103 ++- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_backup.c | 24 +- src/qemu/qemu_checkpoint.c | 12 +- src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_domain.c | 83 ++- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_domainjob.c | 560 ++------------- src/qemu/qemu_domainjob.h | 25 +- src/qemu/qemu_driver.c | 482 +++++++------ src/qemu/qemu_migration.c | 201 +++--- src/qemu/qemu_migration_cookie.c | 17 +- src/qemu/qemu_migration_cookie.h | 3 +- src/qemu/qemu_migration_params.c | 8 +- src/qemu/qemu_process.c | 95 ++- src/qemu/qemu_snapshot.c | 20 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/qemumigrationcookiexmltest.c | 3 +- tests/testutils.c | 2 +- 50 files changed, 1476 insertions(+), 1771 deletions(-) create mode 100644 src/conf/virdomainjob.c rename src/{hypervisor/domain_job.h => conf/virdomainjob.h} (86%) delete mode 100644 src/hypervisor/domain_job.c -- 2.37.2

4 25

[PATCH] Log alarms should be generated even if the QEMU process is not stopped
by dinglimin 16 Sep '22

16 Sep '22

Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- src/qemu/qemu_process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cbfdd3bda5..e025e10873 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8006,9 +8006,11 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) } if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { - virProcessKill(vm->pid, + if (virProcessKill(vm->pid, (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? - SIGKILL : SIGTERM); + SIGKILL : SIGTERM) != 0) { + VIR_DEBUG("Failed to terminate qemu process"); + } return 0; } -- 2.30.0.windows.2

2 1

[PATCH] Two branches in a conditional structure should not have exactly the same implementation
by dinglimin 16 Sep '22

16 Sep '22

Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- scripts/apibuild.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index c232b4e2c8..5993318490 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -1248,10 +1248,8 @@ class CParser: token[1] == "," or token[1] == "="): self.index_add_ref(oldtok[1], self.filename, 0, "type") - elif oldtok[0] == "name" and oldtok[1][0:4] == "XEN_": - self.index_add_ref(oldtok[1], self.filename, - 0, "typedef") - elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXEN_": + elif oldtok[0] == "name" and (oldtok[1][0:4] == "XEN_" or + oldtok[1][0:7] == "LIBXEN_"): self.index_add_ref(oldtok[1], self.filename, 0, "typedef") -- 2.30.0.windows.2

2 1

smack patch with meson support
by Vishal Gupta 16 Sep '22

16 Sep '22

We are working on the Kirstone project (yocto) .It only supports the meson build system because of which we are not able to use below smack patch. https://listman.redhat.com/archives/libvir-list/2016-June/132187.html Please give advice on how to use this patch. regards, vishal

2 1

[PATCH 0/3] domain capabilites improvements
by Jim Fehlig 15 Sep '22

15 Sep '22

The first two patches add USB redirect and channel devices to domcapabilities. Patch3 fixes reporting of spice support. Patch1 was sent previously, before I noticed the others were needed https://listman.redhat.com/archives/libvir-list/2022-August/234045.html Jim Fehlig (3): conf: Add USB redirect devices to domain capabilities conf: Add channel devices to domain capabilities qemu: Use command line to properly check for spice support docs/formatdomaincaps.rst | 46 +++++++++++++++++++ src/conf/domain_capabilities.c | 26 +++++++++++ src/conf/domain_capabilities.h | 16 +++++++ src/conf/schemas/domaincaps.rng | 20 ++++++++ src/qemu/qemu_capabilities.c | 35 +++++++++++++- src/qemu/qemu_capabilities.h | 6 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_4.2.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_5.0.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 12 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_5.2.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_6.0.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_6.2.0-virt.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_7.0.0-virt.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 11 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 12 +++++ .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + 68 files changed, 674 insertions(+), 1 deletion(-) -- 2.37.1

2 8

Adding support for multiple PCI domains (multiple root controllers)
by Richard Hansen 15 Sep '22

15 Sep '22

I would like to add support for multiple PCI domains to libvirt. My main motivation is bug #360 [1], though it would also make pSeries machine configurations more intuitive (they can have multiple pci-root controllers). Currently, every PCI controller is in PCI domain 0, and the controller's index number equals its bus ID. To support multiple domains, my plan is to map domain:bus ID pairs to/from controller index numbers as follows: * A root controller with index N establishes domain N, and provides bus 0 in that domain. * A non-root controller with index N, and plugged in to a PCI controller in domain D, provides bus N in domain D. Furthermore, each non-root controller must have a higher index number than the controller it plugs in to, so the controller with index 0 is guaranteed to be a root controller. This means that in the common case of only a single domain, the behavior would be the same as it is now (domain == 0, controller index == bus ID). Example domain:bus pairs: * 0000:00 would identify the bus provided by the root controller with index 0 (as it does now). * 000f:1b would identify the bus provided by the non-root controller with index 27 (0x1b), and that controller is plugged into domain 15 (0xf). Implications of this scheme: * Bus IDs never match any domain IDs (exception: bus 0 in domain 0). * Bus IDs never appear in more than one domain (exception: bus 0 appears in every domain). * There can be gaps between domain IDs. * There can be gaps between bus IDs in a domain. * Each bus's ID is greater than its domain's ID (except for bus 0 in each domain). The gaps between IDs means that the current PCI address set buses array [2] would have to be replaced with a different data structure. I would probably use nested GHashTables, where the first dimension is the domain and the second dimension is the bus. The default names generated for QEMU would continue to be "pci.N" (or "pcie.N") where N is the PCI controller's index number. The PCI specification says that bus IDs are 8 bits, but libvirt bus IDs are independent of the bus IDs seen by the guest so this limitation doesn't need to exist in libvirt configs. As long as each domain has no more than 256 buses, it should be possible to support arbitrarily large bus IDs. (I doubt this will ever be an issue in practice, but I thought it would be worth mentioning.) Thoughts? Thanks, Richard [1] https://gitlab.com/libvirt/libvirt/-/issues/360 [2] https://gitlab.com/libvirt/libvirt/-/blob/v8.7.0/src/conf/domain_addr.h#L12…

1 0

[PATCH v2 21/30] Deprecate 32 bit big-endian MIPS
by Alex Bennée 14 Sep '22

14 Sep '22

It's becoming harder to maintain a cross-compiler to test this host architecture as the old stable Debian 10 ("Buster") moved into LTS which supports fewer architectures. For now: - mark it's deprecation in the docs - downgrade the containers to build TCG tests only - drop the cross builds from our CI Users with an appropriate toolchain and user-space can still take their chances building it. Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Reviewed-by: Huacai Chen <chenhuacai(a)kernel.org> Message-Id: <20220826172128.353798-16-alex.bennee(a)linaro.org> --- v2 - explicit little endian instead of LE - s/A/As/ - restore mips to dockerfile --- docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 13 +++++++ .gitlab-ci.d/container-cross.yml | 1 - .gitlab-ci.d/crossbuilds.yml | 14 ------- tests/docker/Makefile.include | 5 +-- .../dockerfiles/debian-mips-cross.docker | 38 +++++-------------- 6 files changed, 26 insertions(+), 47 deletions(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index a2fee53248..1c1e7b9e11 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -41,7 +41,7 @@ Those hosts are officially supported, with various accelerators: - Accelerators * - Arm - kvm (64 bit only), tcg, xen - * - MIPS + * - MIPS (little endian only) - kvm, tcg * - PPC - kvm, tcg diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c75a25daad..0d1fd4469b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -213,6 +213,19 @@ MIPS ``Trap-and-Emul`` KVM support (since 6.0) The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed from Linux upstream kernel, declare it deprecated. +Host Architectures +------------------ + +BE MIPS (since 7.2) +''''''''''''''''''' + +As Debian 10 ("Buster") moved into LTS the big endian 32 bit version of +MIPS moved out of support making it hard to maintain our +cross-compilation CI tests of the architecture. As we no longer have +CI coverage support may bitrot away before the deprecation process +completes. The little endian variants of MIPS (both 32 and 64 bit) are +still a supported host architecture. + QEMU API (QAPI) events ---------------------- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 611c6c0b39..95d57e1c5d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -89,7 +89,6 @@ mips64el-debian-cross-container: mips-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 4a5fb6ea2a..c4cd96433d 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -70,20 +70,6 @@ cross-i386-tci: EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user MAKE_CHECK_ARGS: check check-tcg -cross-mips-system: - extends: .cross_system_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - -cross-mips-user: - extends: .cross_user_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - cross-mipsel-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c3375f89c5..b1bf56434f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -81,14 +81,12 @@ endif # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross +DOCKER_PARTIAL_IMAGES += debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-mips-cross: docker-image-debian10 - # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= @@ -144,6 +142,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross +DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 26c154014d..7b55f0f3b2 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -1,32 +1,14 @@ # # Docker mips cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 - -MAINTAINER Philippe Mathieu-Daudé <f4bug(a)amsat.org> - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mips -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mips-linux-gnu - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips --arch-only qemu - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu- -ENV DEF_TARGET_LIST mips-softmmu,mipsel-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mips \ - liblzo2-dev:mips \ - librdmacm-dev:mips \ - libsnappy-dev:mips +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross -- 2.34.1

1 0

[PATCH] meson: Require libssh-0.8.0 or newer
by Michal Privoznik 14 Sep '22

14 Sep '22

According to repology.org: RHEL-8: 0.9.4 RHEL-9: 0.9.6 Debian 11: 0.9.5 openSUSE Leap 15.3: 0.8.7 Ubuntu 20.04: 0.9.3 And the rest of distros has something newer anyways. Requiring 0.8.0 or newer allows us to drop the terrible hack where we rename functions at meson level using #define. Note, 0.8.0 is the version of libssh where the rename happened. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 2 +- meson.build | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b199c624b8..a46389c78f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -378,7 +378,7 @@ BuildRequires: wireshark-devel %endif %if %{with_libssh} -BuildRequires: libssh-devel >= 0.7.0 +BuildRequires: libssh-devel >= 0.8.0 %endif BuildRequires: rpcgen diff --git a/meson.build b/meson.build index ed9f4b3f70..11490b8980 100644 --- a/meson.build +++ b/meson.build @@ -1025,24 +1025,11 @@ else libpcap_dep = dependency('', required: false) endif -libssh_version = '0.7' +libssh_version = '0.8.0' if conf.has('WITH_REMOTE') libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) - - # Check if new functions exists, if not redefine them with old deprecated ones. - # List of [ new_function, deprecated_function ]. - functions = [ - [ 'ssh_get_server_publickey', 'ssh_get_publickey' ], - [ 'ssh_session_is_known_server', 'ssh_is_server_known' ], - [ 'ssh_session_update_known_hosts', 'ssh_write_knownhost' ], - ] - foreach name : functions - if not cc.has_function(name[0], dependencies: libssh_dep) - conf.set(name[0], name[1]) - endif - endforeach endif else libssh_dep = dependency('', required: false) -- 2.35.1

2 1

[libvirt PATCH] ci: refresh with latest lcitool manifest
by Daniel P. Berrangé 14 Sep '22

14 Sep '22

This updates the FreeBSD 13 image to 13.1 which should fix the symbol lookup errors seen in CI recently. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushing as a CI fix. ci/gitlab/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index e51cce65b6..420d7f0211 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -479,7 +479,7 @@ x86_64-freebsd-13: needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_IMAGE_NAME: freebsd-13-1 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y -- 2.37.2

1 0

[PATCH] cpu_map: Introduce Neoverse-N1
by Zhenyu Zhang 14 Sep '22

14 Sep '22

From: root <root(a)ampere-mtsnow-altramax-21.khw4.lab.eng.bos.redhat.com> Add Neoverse-N1 as a supported cpu model. Signed-off-by: root <root(a)ampere-mtsnow-altramax-21.khw4.lab.eng.bos.redhat.com> --- src/cpu_map/arm_neoverse-n1.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 4 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_neoverse-n1.xml diff --git a/src/cpu_map/arm_neoverse-n1.xml b/src/cpu_map/arm_neoverse-n1.xml new file mode 100644 index 0000000000..14c7f7c300 --- /dev/null +++ b/src/cpu_map/arm_neoverse-n1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='Ampere'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 92d10565f4..a9a945584b 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -13,4 +13,5 @@ <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> <vendor name='Phytium' value='0x70'/> + <vendor name='Ampere' value='0x71'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..2419fa0a64 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -98,6 +98,9 @@ <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> +  + <include filename='arm_neoverse-n1.xml'/> +  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..c8f2e36eea 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,7 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_neoverse-n1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

1 0

[PATCH] cpu_map: Introduce Neoverse-N1
by Zhenyu Zhang 14 Sep '22

14 Sep '22

From: root <root(a)ampere-mtsnow-altramax-21.khw4.lab.eng.bos.redhat.com> Add Neoverse-N1 as a supported cpu model. Signed-off-by: root <root(a)ampere-mtsnow-altramax-21.khw4.lab.eng.bos.redhat.com> --- src/cpu_map/arm_neoverse-n1.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 4 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_neoverse-n1.xml diff --git a/src/cpu_map/arm_neoverse-n1.xml b/src/cpu_map/arm_neoverse-n1.xml new file mode 100644 index 0000000000..14c7f7c300 --- /dev/null +++ b/src/cpu_map/arm_neoverse-n1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='Ampere'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 92d10565f4..a9a945584b 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -13,4 +13,5 @@ <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> <vendor name='Phytium' value='0x70'/> + <vendor name='Ampere' value='0x71'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..2419fa0a64 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -98,6 +98,9 @@ <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> +  + <include filename='arm_neoverse-n1.xml'/> +  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..c8f2e36eea 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,7 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_neoverse-n1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

1 0

[libvirt][PATCH v15 0/9] Support query and use SGX
by Lin Yang 10 Sep '22

10 Sep '22

The previous v14 version can be found here: https://listman.redhat.com/archives/libvir-list/2022-July/233257.html Diff to v14: - Dropped SGX support for QEMU 6.2.0, only focus on QEMU 7.0.0 (BTW, I noticed the default QEMU version in RHEL9 is still 6.2.0, so those user cannot access this feature unless manually upgrade QEMU) - Removed total EPC size from domain capability, since the corresponding attribute is marked as deprecated in QMP command "query-sgx-capabilities" - Some cleanups to address comments (pin test to 7.0.0, more validations on qemu_validate.c, name issue, use built-in functions, ...) BTW, it still adds SGX EPC as memory device, since basically SGX EPC is one kind of memory. More specifically, a private region of memory, so didn't add additional general memory. QEMU allocate part of them and pass through to guest VM. I don't have a better alternative to represent it in domain definition. Haibin Huang (4): domain_capabilities: Define SGX capabilities structs qemu: Get SGX capabilities form QMP Convert QMP capabilities to domain capabilities conf: expose SGX feature in domain capabilities Lin Yang (2): conf: Introduce SGX EPC element into device memory xml qemu: Add command-line to generate SGX EPC memory backend Michal Prívozník (3): qemu_cgroup: Allow SGX in devices controller qemu_namespace: Create SGX related nodes in domain's namespace security_dac: Set DAC label on SGX /dev nodes docs/formatdomain.rst | 25 +- docs/formatdomaincaps.rst | 40 ++++ src/conf/domain_capabilities.c | 46 ++++ src/conf/domain_capabilities.h | 21 ++ src/conf/domain_conf.c | 30 +++ src/conf/domain_conf.h | 1 + src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 9 + src/conf/schemas/domaincaps.rng | 37 +++ src/conf/schemas/domaincommon.rng | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 6 +- src/qemu/qemu_capabilities.c | 219 ++++++++++++++++++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_cgroup.c | 76 +++++- src/qemu/qemu_command.c | 66 +++++- src/qemu/qemu_domain.c | 48 ++-- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_domain_address.c | 6 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor.c | 10 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 137 ++++++++++- src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_namespace.c | 20 +- src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 40 ++++ src/security/security_apparmor.c | 1 + src/security/security_dac.c | 46 ++-- src/security/security_selinux.c | 2 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 9 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 9 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 9 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.replies | 27 ++- .../caps_7.0.0.x86_64.replies | 34 ++- .../caps_7.0.0.x86_64.xml | 10 + .../caps_7.1.0.x86_64.replies | 21 +- .../sgx-epc.x86_64-7.0.0.args | 40 ++++ tests/qemuxml2argvdata/sgx-epc.xml | 64 +++++ tests/qemuxml2argvtest.c | 2 + .../sgx-epc.x86_64-7.0.0.xml | 1 + tests/qemuxml2xmltest.c | 2 + 93 files changed, 1107 insertions(+), 79 deletions(-) create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml create mode 120000 tests/qemuxml2xmloutdata/sgx-epc.x86_64-7.0.0.xml -- 2.25.1

2 1

[PATCH 0/6] docs: Improve and clarify information how to compile and install libvirt
by Peter Krempa 09 Sep '22

09 Sep '22

As a first step encourage users to use packages provided by the distro rather than risking messing up their system. Improve the rest too especially noting how to ensure that the build has required functionality compiled in. Rendered version: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/3005952997/artifacts/website/com… Peter Krempa (6): docs: compiling: Add a paragraph suggesting installation from repository docs: compiling: Section off block on how to run from build directory docs: compiling: Separate information on how to install libvirt and add disclaimer docs: compiling: Separate 'prepare', 'configure', and 'build' steps docs: compiling: Encourage force-enabling required functionality docs: compiling: Add notes on starting compiled libvirt daemons docs/compiling.rst | 178 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 134 insertions(+), 44 deletions(-) -- 2.37.1

3 9

[PATCH v2 0/9] ix double free in URI alias lookup and fix misleading error with libvirtd
by Peter Krempa 09 Sep '22

09 Sep '22

When libvirtd is built without a driver we report a terrible error message which doesn't really point to what's happening. v2: - propagate that we want to avoid the remote driver internally rather than via a public API flag Peter Krempa (9): virConnectOpenInternal: Avoid double free() when alias is an invalid URI virConnectOpenInternal: Switch to automatic memory cleanup virConnectOpenInternal: Remove 'failed' label remote: remoteOpenConn: Use virConnectOpenAuth instead of virConnectOpen(ReadOnly) remoteConnectOpen: Refactor cleanup remote: doRemoteOpen: Automatically clean up 'priv' lxc: Remove unneeded forward declaration of 'lxcStateInitialize' virStateInitialize: Propagate whether running in monolithic daemon mode to stateful driver init remote: Don't attempt remote connection from libvirtd src/bhyve/bhyve_driver.c | 1 + src/ch/ch_driver.c | 1 + src/driver-state.h | 1 + src/interface/interface_backend_netcf.c | 1 + src/interface/interface_backend_udev.c | 1 + src/libvirt.c | 67 +++++++++++-------------- src/libvirt_internal.h | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 5 +- src/network/bridge_driver.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_daemon.c | 6 +++ src/remote/remote_daemon_dispatch.c | 7 ++- src/remote/remote_driver.c | 59 +++++++++++----------- src/secret/secret_driver.c | 1 + src/storage/storage_driver.c | 1 + src/vz/vz_driver.c | 1 + 19 files changed, 83 insertions(+), 75 deletions(-) -- 2.37.1

2 11

[(pushed) PATCH] Revert "build: Decrease maximum stack frame size to 2048"
by Peter Krempa 09 Sep '22

09 Sep '22

The bhyve driver still has some frames larger than 2048 bytes, so we need to keep the limit as is. The CI failure was masked by the Freebsd-13 failing for unrelated reasons. This reverts commit 46302172d47709b169c4b9b4cd6a4847fc2f0b4c Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as a build fix. Unfortunately I didn't notice that another job failed before pushing . meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 9d3703a321..ed9f4b3f70 100644 --- a/meson.build +++ b/meson.build @@ -226,7 +226,7 @@ alloc_max = run_command( ) # sanitizer instrumentation may enlarge stack frames -stack_frame_size = get_option('b_sanitize') == 'none' ? 2048 : 32768 +stack_frame_size = get_option('b_sanitize') == 'none' ? 4096 : 32768 # array_bounds=2 check triggers false positive on some GCC # versions when using sanitizers. Seen on Fedora 34 with -- 2.37.1

1 0

[PATCH 0/3] fix some potential memory leak issues
by Jiacheng Jiang 09 Sep '22

09 Sep '22

From: jiangjiacheng <jiangjiacheng(a)huawei.com> *** BLURB HERE *** jiangjiacheng (3): rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall qemu: fix memory leak in qemu_driver.c qemu: Fix memory leak fix memory leak in the condition of attaching cdrom src/qemu/qemu_driver.c | 15 +++++++++++++++ src/rpc/virnetserverclient.c | 1 + src/rpc/virnetserverprogram.c | 12 +++++++++--- 3 files changed, 25 insertions(+), 3 deletions(-) -- 2.33.0

2 6

[PATCH 0/2] qemu: Two improvements wrt mount namespaces
by Michal Privoznik 09 Sep '22

09 Sep '22

While investigating a bug (which I believe is just a misconfiguration; linked in 2/2) I've found a problem with memfd (patch 1/2). Michal Prívozník (2): qemu_process: Don't require a hugetlbfs mount for memfd kbase: Document QEMU private mount NS limitations docs/kbase/qemu-passthrough-security.rst | 22 ++++++++++++++++++++++ src/qemu/qemu_process.c | 12 +++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) -- 2.35.1

2 3

libvirtd: failed to connect to socket after installation
by Carlos Bilbao 08 Sep '22

08 Sep '22

Hello, I am trying to test some changes made to libvirt. I tried compiling and installing, following the available documentation, with: ninja -C build clean meson build --prefix=$HOME/usr ninja -C build -Dsystem=true sudo ninja -C build install After doing this, I try to run virt-install and get the following error on the active libvirtd daemon: Failed to connect socket to '/var/local/run/libvirt/virtqemud-sock': No such file or directory Indeed, that file does not exist: $ ls /var/local/run/libvirt/ common hostdevmgr lockd lxc network nwfilter nwfilter-binding secrets storage virt-install was working fine before started changing libvirt's source code. I'm working with Ubuntu 22.04 LTS, virsh v8.7.0. I would appreciate any directions on how to fix this/successfully install libvirt. Thanks in advance. Carlos

3 8

[PATCH 0/6] Fix double free in URI alias lookup and fix misleading error with libvirtd
by Peter Krempa 08 Sep '22

08 Sep '22

When libvirtd is built without a driver we report a terrible error message which doesn't really point to what's happening. Peter Krempa (6): virConnectOpenInternal: Avoid double free() when alias is an invalid URI virConnectOpenInternal: Switch to automatic memory cleanup virConnectOpenInternal: Remove 'failed' label remote: remoteOpenConn: Use virConnectOpenAuth instead of virConnectOpen(ReadOnly) Introduce VIR_CONNECT_NO_REMOTE remote: Don't attempt remote connection from libvirtd include/libvirt/libvirt-host.h | 2 + src/libvirt.c | 98 ++++++++++++++--------------- src/remote/remote_daemon_dispatch.c | 15 +++-- 3 files changed, 62 insertions(+), 53 deletions(-) -- 2.37.1

2 9

[PATCH 0/5] Various cleanups to decrease amount of stack allocated buffers
by Peter Krempa 08 Sep '22

08 Sep '22

The common theme is the attempt to decrease the use of stack allocated buffers. In few cases it's coupled with outher cleanups too. Most patches are standalone and can be individually applied. The last patch is also optional but can be applied only if the fixes before that are applied too. Peter Krempa (5): lxc: virLXCProcessReadLogOutput: Automatically close FD lxc: process: Rework reading errors from the log file util: netdev: Dynamically allocate 'struct nlattr' in virNetDevSwitchdevFeature remote: dispatch: Allocate 'virDomainDef' in ACL helpers dynamically build: Decrease maximum stack frame size to 2048 meson.build | 2 +- src/lxc/lxc_process.c | 100 ++++++++++++++++------------ src/remote/remote_daemon_dispatch.c | 17 +++-- src/util/virnetdev.c | 2 +- 4 files changed, 66 insertions(+), 55 deletions(-) -- 2.37.1

2 6

[PATCH 0/8] qemu: Fix regression with non-shared storage migration and clean out more dead code
by Peter Krempa 08 Sep '22

08 Sep '22

Patch 1 fixes regression caused by improper refactor from the pre-blockdev removal series. The rest are cleanups noticed while investigating the code. Peter Krempa (8): qemu: migration: Fix setup of non-shared storage migration in qemuMigrationSrcBeginPhase NEWS: Mention that non-shared storage migration was broken in libvirt-8.7 qemu: migration: Always assume support for QEMU_CAPS_NBD_SERVER qemu: capabilities: Retire QEMU_CAPS_NBD_SERVER qemu: migration: Don't attempt to fall back to old-style storage migration qemu: monitor: Drop support for old-style non-shared storage migration qemu: migration: Remove QEMU_MONITOR_MIGRATE_BACKGROUND qemu: monitor: Renumber QEMU_MONITOR_MIGRATE_RESUME NEWS.rst | 6 ++ src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_migration.c | 78 ++++++++----------- src/qemu/qemu_monitor.h | 5 +- src/qemu/qemu_monitor_json.c | 7 +- .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../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 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - .../caps_7.1.0.x86_64.xml | 1 - tests/qemumonitorjsontest.c | 4 +- 33 files changed, 42 insertions(+), 89 deletions(-) -- 2.37.1

2 9

Internal disk-only snapshots in qemu domain
by Or Ozeri 08 Sep '22

08 Sep '22

Hi, We are considering the following use-case of libvirt's domain snapshot (and revert) feature: 1. Domain is qemu 2. Snapshot type is disk-only (VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) 3. Snapshot location is internal (VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL) 4. All of the VM disks are: * Network type (VIR_STORAGE_TYPE_NETWORK) * RBD protocol (VIR_STORAGE_NET_PROTOCOL_RBD) * Raw format (VIR_STORAGE_FILE_RAW) 5. VM can be either active or inactive We want to extend libvirt to support this use-case. Consider the following changes: 1. For the inactive VM case, libvirt currently calls "qemu-img snapshot" for taking a snapshot, as well as reverting (adding "-a" to qemu-img). The same would also work for our-use case, as basically the same qemu-img command would work for RBD disks as well (using rbd:poolname/imagename as the filename). So basically we need to reuse code from qemuDomainSnapshotForEachQcow2Raw. 2. For the active VM case, we can re-use code from qemuDomainSnapshotCreateActiveExternal, but call qemu's "snapshot_blkdev_internal" instead of the current "snapshot_blkdev". This would work for RBD disks, but more generally for any qemu block driver which implements "bdrv_snapshot_create". BTW it seems to me that if you try to take an internal snapshot of just the disks, you will actually get an external snapshot? Or is there some place in the code which validates and fails this case? Anyhow, I would really appreciate any feedback or thoughts. Thanks, Or

1 0

kvm ram in live migratiom
by Ignazio Cassano 07 Sep '22

07 Sep '22

Hello, I am using openstack rdo with kvm libvirt. Live migration is very slow when the vm is using ram intensively. If I migrate a vm that has been running on a host for a few days, it takes several minutes to migrate the memory. After the first migration, I immediately try another one on the same vm, it takes very little. I think it's due to the fragmentation of the pages: is there any remedy? Thanks Ignazio

1 0

[PATCH] Revert "conf: clean up memory containing secrets before freeing"
by Peter Krempa 07 Sep '22

07 Sep '22

Adding supposedly secure cleanup for secrets in anything related to the XML parser is pointless because there are multiple other un-sanitized copies of the full XML and the XML parser state at the very least. Similarly in case RPC was used to transport the XML the RPC buffers are not sanitized. Additionally this patch was incomplete as it didn't sanitize the the password in the cleanup function for virDomainGraphicsAuthDef. This reverts commit 51f8130d78fde3201b49c02b7095ff918b6e658a. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_conf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3d1bf18c6c..406c348a00 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -60,7 +60,6 @@ #include "virdomainsnapshotobjlist.h" #include "virdomaincheckpointobjlist.h" #include "virutil.h" -#include "virsecureerase.h" #include "virdomainjob.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -10862,7 +10861,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"), validTo); - virSecureEraseString(def->passwd); VIR_FREE(def->passwd); return -1; } -- 2.37.1

4 3

[PATCH 0/3] Fix some coding issues
by Jiacheng Jiang 07 Sep '22

07 Sep '22

From: jiangjiacheng <jiangjiacheng(a)huawei.com> *** BLURB HERE *** jiangjiacheng (3): conf: clean up memory containing secrets before freeing remote: remove unnecessary return value and if branch Fix some coding style issues src/conf/domain_conf.c | 4 +++- src/remote/remote_daemon.c | 6 +----- src/remote/remote_daemon_config.c | 4 +--- src/remote/remote_daemon_config.h | 2 +- src/rpc/virnetserverclient.c | 28 ++++++++++++++-------------- 5 files changed, 20 insertions(+), 24 deletions(-) -- 2.33.0

4 8

[PATCH v2] cpu_map: Introduce Fujitsu a64fx
by Liu Yiding 06 Sep '22

06 Sep '22

Add Fujitsu a64fx as a supported cpu model. Signed-off-by: Liu Yiding <liuyd.fnst(a)fujitsu.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-August/234040.html diff to v1: - Change title. - Unify model and vendor spelling. --- src/cpu_map/arm_a64fx.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 4 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_a64fx.xml diff --git a/src/cpu_map/arm_a64fx.xml b/src/cpu_map/arm_a64fx.xml new file mode 100644 index 0000000000..5b53580df4 --- /dev/null +++ b/src/cpu_map/arm_a64fx.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='a64fx'> + <vendor name='Fujitsu'/> + <pvr value='0x001'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 4465463b5b..92d10565f4 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -3,6 +3,7 @@ <vendor name='Broadcom' value='0x42'/> <vendor name='Cavium' value='0x43'/> <vendor name='DigitalEquipment' value='0x44'/> + <vendor name='Fujitsu' value='0x46'/> <vendor name='HiSilicon' value='0x48'/> <vendor name='Infineon' value='0x49'/> <vendor name='Freescale' value='0x4D'/> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 351c2ae4fa..d533a28865 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -104,6 +104,9 @@  <include filename='arm_ThunderX299xx.xml'/> +  + <include filename='arm_a64fx.xml'/> +  <include filename='arm_Kunpeng-920.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99815981b5..99264289e2 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -1,4 +1,5 @@ cpumap_data = [ + 'arm_a64fx.xml', 'arm_cortex-a53.xml', 'arm_cortex-a57.xml', 'arm_cortex-a72.xml', -- 2.34.1

2 1

[PATCH] qemu_driver: Fix order of arguments in qemuDomainGetStatsCpuProc()
by Michal Privoznik 06 Sep '22

06 Sep '22

Just before pushing my earlier commit I've switch order of two arguments of virProcessGetStatInfo() (as suggested in review). However, I forgot to swap the arguments in qemuDomainGetStatsCpuProc() which leads to userTime and sysTime being swapped. Fixes: 044b8744d65f8571038f85685b3c4b241162977b Reported-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c7cca64001..a3f8d8baf5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17771,10 +17771,10 @@ qemuDomainGetStatsCpuProc(virDomainObj *vm, virTypedParamList *params) { unsigned long long cpuTime = 0; - unsigned long long sysTime = 0; unsigned long long userTime = 0; + unsigned long long sysTime = 0; - if (virProcessGetStatInfo(&cpuTime, &sysTime, &userTime, + if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime, NULL, NULL, vm->pid, 0) < 0) { /* ignore error */ return 0; -- 2.35.1

1 0

[PATCH] qemu: Don't report error from domblkinfo if vm is inactive
by huangy81＠chinatelecom.cn 06 Sep '22

06 Sep '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> Libvirt logs and reports error when executing domblkinfo if vm configured rbd storage and in inactive state. The steps to reproduce the problem: 1. define and start domain with its storage configured rbd disk, and corresponding disk label is 'vda'. 2. set vm in inactive state. 3. call 'virsh domblklinfo' as the following and problem reproduced. $ virsh domblkinfo vm1 vda error: internal error: missing storage backend for network files using rbd protocol Meanwhile, libvirtd log message also report the same error. To fix this, validate the disk type if vm is inactive before refreshing capacity and allocation limits of a given storage source in qemuDomainGetBlockInfo in advance, if storage source type is VIR_STORAGE_TYPE_NETWORK and net protocol is VIR_STORAGE_NET_PROTOCAOL_RBD, set info to 0 like 'domblkinfo --all' command does and return directly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1724808 Signed-off-by: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> Signed-off-by: Pengcheng Deng <dengpc12(a)chinatelecom.cn> --- src/qemu/qemu_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c7cca64..bfe1fa2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11118,6 +11118,19 @@ qemuDomainGetBlockInfo(virDomainPtr dom, /* for inactive domains we have to peek into the files */ if (!virDomainObjIsActive(vm)) { + /* for rbd protocol, virStorageFileBackend not loaded if vm is inactive, + * so generate 0 based info like 'domblkinfo --all' does and return directly + * */ + if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + info->capacity = 0; + info->allocation = 0; + info->physical = 0; + + ret = 0; + goto endjob; + } + if ((qemuStorageLimitsRefresh(driver, cfg, vm, disk->src, false)) < 0) goto endjob; -- 1.8.3.1

3 2

[PATCH 0/2] Implement qemuDomainGetStatsCpu fallback for qemu:///session
by Michal Privoznik 06 Sep '22

06 Sep '22

*** BLURB HERE *** Michal Prívozník (2): util: Extend virProcessGetStatInfo() for sysTime and userTime qemu: Implement qemuDomainGetStatsCpu fallback for qemu:///session src/ch/ch_driver.c | 1 + src/qemu/qemu_driver.c | 39 ++++++++++++++++++++++++++++++++++++--- src/util/virprocess.c | 30 +++++++++++++++++++++++------- src/util/virprocess.h | 2 ++ 4 files changed, 62 insertions(+), 10 deletions(-) -- 2.35.1

3 5

[(pushed) PATCH] tests: qemuxml2argvdata: Remove two unused output files
by Peter Krempa 05 Sep '22

05 Sep '22

Commit d7ae7ce363aa51ab46 forgot to clean up unused error output files 'boot-dev+order.err' and 'boot-menu-enable-with-timeout-invalid' after converting tests to DO_TEST_CAPS_LATEST. Fixes: d7ae7ce363aa51ab4600261b5934075388843142 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. tests/qemuxml2argvdata/boot-dev+order.err | 1 - tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.err | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tests/qemuxml2argvdata/boot-dev+order.err delete mode 100644 tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.err diff --git a/tests/qemuxml2argvdata/boot-dev+order.err b/tests/qemuxml2argvdata/boot-dev+order.err deleted file mode 100644 index aeb27ec0b8..0000000000 --- a/tests/qemuxml2argvdata/boot-dev+order.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: per-device boot elements cannot be used together with os/boot elements diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.err b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.err deleted file mode 100644 index 38c0be7818..0000000000 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: invalid value for boot menu timeout, must be in range [0,65535] -- 2.37.1

1 0

[libvirt PATCH 00/12] qemu: retire some more capabilities
by Ján Tomko 05 Sep '22

05 Sep '22

Applies on top of Peter's QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY series Ján Tomko (12): qemu: assume QEMU_CAPS_CHARDEV_FILE_APPEND qemu: retire QEMU_CAPS_CHARDEV_FILE_APPEND qemu: assume QEMU_CAPS_CHARDEV_LOGFILE qemu: retire QEMU_CAPS_CHARDEV_LOGFILE qemu: assume QEMU_CAPS_NEC_USB_XHCI_PORTS qemu: retire QEMU_CAPS_NEC_USB_XHCI_PORTS qemu: assume QEMU_CAPS_VIRTIO_SCSI_IOTHREAD qemu: retire QEMU_CAPS_VIRTIO_SCSI_IOTHREAD qemu: assume QEMU_CAPS_VIRTIO_PACKED_QUEUES qemu: retire QEMU_CAPS_VIRTIO_PACKED_QUEUES qemu: remove qemuValidateDomainVirtioOptions qemu: do not probe for properties of nec-usb-xhci src/qemu/qemu_capabilities.c | 25 +-- src/qemu/qemu_capabilities.h | 10 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_process.c | 21 +- src/qemu/qemu_validate.c | 80 +------ .../caps_4.2.0.aarch64.replies | 156 +++----------- .../caps_4.2.0.aarch64.xml | 5 - .../caps_4.2.0.ppc64.replies | 140 +++--------- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 4 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 4 - .../caps_4.2.0.x86_64.replies | 168 ++++----------- .../caps_4.2.0.x86_64.xml | 5 - .../caps_5.0.0.aarch64.replies | 169 +++------------ .../caps_5.0.0.aarch64.xml | 5 - .../caps_5.0.0.ppc64.replies | 165 +++----------- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 5 - .../caps_5.0.0.riscv64.replies | 153 +++---------- .../caps_5.0.0.riscv64.xml | 5 - .../caps_5.0.0.x86_64.replies | 181 ++++------------ .../caps_5.0.0.x86_64.xml | 5 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 - .../caps_5.1.0.x86_64.replies | 185 ++++------------ .../caps_5.1.0.x86_64.xml | 5 - .../caps_5.2.0.aarch64.replies | 181 ++++------------ .../caps_5.2.0.aarch64.xml | 5 - .../caps_5.2.0.ppc64.replies | 173 +++------------ .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 5 - .../caps_5.2.0.riscv64.replies | 161 +++----------- .../caps_5.2.0.riscv64.xml | 5 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 4 - .../caps_5.2.0.x86_64.replies | 193 ++++------------- .../caps_5.2.0.x86_64.xml | 5 - .../caps_6.0.0.aarch64.replies | 191 ++++------------ .../caps_6.0.0.aarch64.xml | 5 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 4 - .../caps_6.0.0.x86_64.replies | 203 ++++-------------- .../caps_6.0.0.x86_64.xml | 5 - .../caps_6.1.0.x86_64.replies | 203 ++++-------------- .../caps_6.1.0.x86_64.xml | 5 - .../caps_6.2.0.aarch64.replies | 191 ++++------------ .../caps_6.2.0.aarch64.xml | 5 - .../caps_6.2.0.ppc64.replies | 183 +++------------- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 5 - .../caps_6.2.0.x86_64.replies | 203 ++++-------------- .../caps_6.2.0.x86_64.xml | 5 - .../caps_7.0.0.aarch64.replies | 195 ++++------------- .../caps_7.0.0.aarch64.xml | 5 - .../caps_7.0.0.ppc64.replies | 183 +++------------- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 5 - .../caps_7.0.0.x86_64.replies | 203 ++++-------------- .../caps_7.0.0.x86_64.xml | 5 - .../caps_7.1.0.x86_64.replies | 203 ++++-------------- .../caps_7.1.0.x86_64.xml | 5 - .../virtio-options-controller-packed.err | 1 - .../virtio-options-disk-packed.err | 1 - .../virtio-options-fs-packed.err | 1 - .../virtio-options-input-packed.err | 1 - .../virtio-options-memballoon-packed.err | 1 - .../virtio-options-net-packed.err | 1 - .../virtio-options-rng-packed.err | 1 - .../virtio-options-video-packed.err | 1 - tests/qemuxml2argvtest.c | 28 +-- tests/qemuxml2xmltest.c | 1 - 63 files changed, 811 insertions(+), 3471 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.err -- 2.37.1

2 24

[PATCH 0/7] Clean up virFileIsSharedFSType
by Peter Krempa 05 Sep '22

05 Sep '22

Few cleanups for problems I've noticed when I had to understand how the shared FS detection is supposed to work. Peter Krempa (7): util: virFileIsSharedFSType: Pass bitmap of checked fs types as unsigned util: virFileIsSharedFSType: Annotate (some) shared filesystem names util: virFileIsSharedFixFUSE: Refactor cleanup util: virfile: Rewrite matching of FUSE-based shared filesystems util: virfile: Don't use VIR_FILE_SHFS_GFS2 for glusterfs util: virfile: Drop QB_MAGIC constant util: virFileIsSharedFSType: Simplify shared fs type declarations src/util/virfile.c | 139 +++++++++++++++++++++------------------------ src/util/virfile.h | 19 ++++--- 2 files changed, 76 insertions(+), 82 deletions(-) -- 2.37.1

2 10

[libvirt] [PATCH 0/2] Minor fixes for maxphysaddr
by Lin Ma 02 Sep '22

02 Sep '22

Lin Ma (2): docs: Fix missing slashes in the maxphysaddr example qemu: Remove host-passthrough validation check for host-phys-bits=on docs/formatdomain.rst | 4 ++-- src/qemu/qemu_validate.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) -- 2.26.2

4 10

Slow live migration
by Ignazio Cassano 02 Sep '22

02 Sep '22

Hello, I am using openstack rdo with kvm libvirt. Live migration is very slow when the vm is using ram intensively. If I migrate a vm that has been running on a host for a few days, it takes several minutes to migrate the memory. After the first migration, I immediately try another one on the same vm, it takes very little. I think it's due to the fragmentation of the pages: is there any remedy? Thanks Ignazio

1 0

[libvirt PATCH 0/3] Ensure synchronous behavior of migrate_cancel
by Jiri Denemark 01 Sep '22

01 Sep '22

See 3/3 for details. Jiri Denemark (3): qemu: Rename qemuMigrationSrcCancel qemu: Create wrapper for qemuMonitorMigrateCancel qemu: Make qemuMigrationSrcCancel optionally synchronous src/qemu/qemu_driver.c | 9 +---- src/qemu/qemu_migration.c | 76 +++++++++++++++++++++++++++++++-------- src/qemu/qemu_migration.h | 7 +++- src/qemu/qemu_process.c | 7 ++-- 4 files changed, 70 insertions(+), 29 deletions(-) -- 2.37.2

2 8

[PATCH 0/2] Update CI and news after sheepdog removal
by Peter Krempa 01 Sep '22

01 Sep '22

Peter Krempa (2): ci: Regenerate dockerfiles after 'sheepdog' removal NEWS: Mention removal of the sheepdog storage driver backend NEWS.rst | 6 ++++++ ci/containers/fedora-35.Dockerfile | 1 - ci/containers/fedora-36-cross-mingw32.Dockerfile | 3 +-- ci/containers/fedora-36-cross-mingw64.Dockerfile | 3 +-- ci/containers/fedora-36.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 +-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 +-- ci/containers/fedora-rawhide.Dockerfile | 1 - 8 files changed, 10 insertions(+), 11 deletions(-) -- 2.37.1

2 3

[PATCH] cpu_map: Introduce A64FX
by Liu Yiding 01 Sep '22

01 Sep '22

Add A64FX as a supported cpu model. Signed-off-by: Liu Yiding <liuyd.fnst(a)fujitsu.com> --- src/cpu_map/arm_A64FX.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 1 + 4 files changed, 11 insertions(+) create mode 100644 src/cpu_map/arm_A64FX.xml diff --git a/src/cpu_map/arm_A64FX.xml b/src/cpu_map/arm_A64FX.xml new file mode 100644 index 0000000000..db7b328cd1 --- /dev/null +++ b/src/cpu_map/arm_A64FX.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='a64fx'> + <vendor name='FUJITSU'/> + <pvr value='0x001'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 4465463b5b..b10c07815a 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -3,6 +3,7 @@ <vendor name='Broadcom' value='0x42'/> <vendor name='Cavium' value='0x43'/> <vendor name='DigitalEquipment' value='0x44'/> + <vendor name='FUJITSU' value='0x46'/> <vendor name='HiSilicon' value='0x48'/> <vendor name='Infineon' value='0x49'/> <vendor name='Freescale' value='0x4D'/> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 351c2ae4fa..44534f067a 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -104,6 +104,9 @@  <include filename='arm_ThunderX299xx.xml'/> +  + <include filename='arm_A64FX.xml'/> +  <include filename='arm_Kunpeng-920.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99815981b5..af7e5bc9f3 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -1,4 +1,5 @@ cpumap_data = [ + 'arm_A64FX.xml', 'arm_cortex-a53.xml', 'arm_cortex-a57.xml', 'arm_cortex-a72.xml', -- 2.34.1

3 6

Release of libvirt-8.7.0
by Jiri Denemark 01 Sep '22

01 Sep '22

The 8.7.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * Removed features * qemu: Remove support for QEMU < 4.2 In accordance with our platform support policy, the oldest supported QEMU version is now bumped from 3.1 to 4.2. * New features * qemu: Add support for specifying vCPU physical address size in bits Users can now specify the number of vCPU physical address bits with the `<maxphysaddr>` subelement of the `<cpu>` element. * Improvements * esx: Domain XMLs can now be dumped for VMs with two new interface types One is when the interface is not connected anywhere `type='null'` and one when it is connected to VMWare Distributed Switch `type='vds'`. * Bug fixes * qemu: increase memlock limit for a domain with multiple vfio/vdpa devices When multiple vfio or vdpa devices are assigned to a domain, the locked memory limit could be too low to map memory for all devices. The memlock limit has been increased to be proportional to the number of vdpa/vfio devices. Enjoy. Jirka

1 0

[PATCH v1 15/25] Deprecate 32 bit big-endian MIPS
by Alex Bennée 01 Sep '22

01 Sep '22

It's becoming harder to maintain a cross-compiler to test this host architecture as the old stable Debian 10 ("Buster") moved into LTS which supports fewer architectures. For now: - mark it's deprecation in the docs - downgrade the containers to build TCG tests only - drop the cross builds from our CI Users with an appropriate toolchain and user-space can still take their chances building it. Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> --- docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 13 ++++++ .gitlab-ci.d/container-cross.yml | 1 - .gitlab-ci.d/crossbuilds.yml | 14 ------- tests/docker/Makefile.include | 5 +-- .../dockerfiles/debian-mips-cross.docker | 40 +++++-------------- 6 files changed, 27 insertions(+), 48 deletions(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 26028756d0..1ca9144a7d 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -41,7 +41,7 @@ Those hosts are officially supported, with various accelerators: - Accelerators * - Arm - kvm (64 bit only), tcg, xen - * - MIPS + * - MIPS (LE only) - kvm, tcg * - PPC - kvm, tcg diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 91b03115ee..22c2f4f4de 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -213,6 +213,19 @@ MIPS ``Trap-and-Emul`` KVM support (since 6.0) The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed from Linux upstream kernel, declare it deprecated. +Host Architectures +------------------ + +BE MIPS (since 7.2) +''''''''''''''''''' + +A Debian 10 ("Buster") moved into LTS the big endian 32 bit version of +MIPS moved out of support making it hard to maintain our +cross-compilation CI tests of the architecture. As we no longer have +CI coverage support may bitrot away before the deprecation process +completes. The little endian variants of MIPS (both 32 and 64 bit) are +still a supported host architecture. + QEMU API (QAPI) events ---------------------- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 611c6c0b39..95d57e1c5d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -89,7 +89,6 @@ mips64el-debian-cross-container: mips-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 4a5fb6ea2a..c4cd96433d 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -70,20 +70,6 @@ cross-i386-tci: EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user MAKE_CHECK_ARGS: check check-tcg -cross-mips-system: - extends: .cross_system_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - -cross-mips-user: - extends: .cross_user_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - cross-mipsel-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c3375f89c5..b1bf56434f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -81,14 +81,12 @@ endif # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross +DOCKER_PARTIAL_IMAGES += debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-mips-cross: docker-image-debian10 - # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= @@ -144,6 +142,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross +DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 26c154014d..75943619df 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -1,32 +1,14 @@ # -# Docker mips cross-compiler target +# Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 - -MAINTAINER Philippe Mathieu-Daudé <f4bug(a)amsat.org> - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mips -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mips-linux-gnu - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips --arch-only qemu - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu- -ENV DEF_TARGET_LIST mips-softmmu,mipsel-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mips \ - liblzo2-dev:mips \ - librdmacm-dev:mips \ - libsnappy-dev:mips +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross -- 2.30.2

4 4

[PATCH] qemucapabilitiestest: Update qemu capabilities for qemu-7.1 release
by Peter Krempa 01 Sep '22

01 Sep '22

qemu-7.1 is released now. Update the capabilities for the final time. Notable change since last update: - 'exit-failure' action for 'panic' lifecycle action added The 'min-xlevel' change is related to upgrade of the host kernel. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../qemucapabilitiesdata/caps_7.1.0.x86_64.replies | 14 +++++++++----- tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies index 26768eba9d..2e3bbb5bc8 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, - "minor": 0, + "micro": 0, + "minor": 1, "major": 7 }, - "package": "v7.0.0-2780-g5288bee45f" + "package": "v7.1.0" }, "id": "libvirt-2" } @@ -8029,6 +8029,9 @@ { "name": "shutdown" }, + { + "name": "exit-failure" + }, { "name": "none" } @@ -8037,6 +8040,7 @@ "values": [ "pause", "shutdown", + "exit-failure", "none" ] }, @@ -34119,7 +34123,7 @@ "md-clear": false, "misalignsse": true, "split-lock-detect": false, - "min-xlevel": 2147483679, + "min-xlevel": 2147483681, "bmi1": true, "bmi2": true, "kvm-pv-unhalt": true, @@ -34471,7 +34475,7 @@ "md-clear": false, "misalignsse": true, "split-lock-detect": false, - "min-xlevel": 2147483679, + "min-xlevel": 2147483681, "bmi1": true, "bmi2": true, "kvm-pv-unhalt": true, diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index a7a3bd7f4a..409712e3bf 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -223,10 +223,10 @@ <flag name='usb-host.guest-resets-all'/> <flag name='migration.blocked-reasons'/> <flag name='query-stats'/> - <version>7000050</version> + <version>7001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> - <package>v7.0.0-2780-g5288bee45f</package> + <package>v7.1.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -495,7 +495,7 @@ <property name='md-clear' type='boolean' value='false'/> <property name='misalignsse' type='boolean' value='true' migratable='yes'/> <property name='split-lock-detect' type='boolean' value='false'/> - <property name='min-xlevel' type='number' value='2147483679'/> + <property name='min-xlevel' type='number' value='2147483681'/> <property name='bmi1' type='boolean' value='true' migratable='yes'/> <property name='bmi2' type='boolean' value='true' migratable='yes'/> <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/> -- 2.37.1

2 1

[PATCH 00/17] jobs: finish generalization
by Kristina Hanicova 31 Aug '22

31 Aug '22

This series finishes the generalization of the jobs-related code across jobs-using drivers. This is the last one, I promise. Kristina Hanicova (17): qemu & hypervisor: move qemuDomainObjBeginJobInternal() into hyperisor libxl: remove usage of virDomainJobData move files: hypervisor/domain_job -> conf/virdomainjob virdomainjob: add check for callbacks conf: extend xmlopt with job config & add job object into domain object virdomainjob: make drivers use job object in the domain object qemu: use virDomainObjBeginJob() libxl: use virDomainObjBeginJob() LXC: use virDomainObjBeginJob() CH: use virDomainObjBeginJob() qemu: use virDomainObjEndJob() libxl: use virDomainObjEndJob() LXC: use virDomainObjEndJob() CH: use virDomainObjEndJob() qemu & conf: move BeginAgentJob & EndAgentJob into src/conf/virdomainjob qemu & conf: move BeginAsyncJob & EndAsyncJob into src/conf qemu & conf: move BeginNestedJob & BeginJobNowait into src/conf docs/kbase/internals/qemu-threads.rst | 34 +- po/POTFILES | 1 + src/bhyve/bhyve_domain.c | 2 +- src/ch/ch_conf.c | 2 +- src/ch/ch_domain.c | 76 -- src/ch/ch_domain.h | 11 +- src/ch/ch_driver.c | 40 +- src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 16 +- src/conf/meson.build | 1 + src/conf/virconftypes.h | 2 + src/conf/virdomainjob.c | 664 ++++++++++++++++++ .../domain_job.h => conf/virdomainjob.h} | 37 +- src/hyperv/hyperv_driver.c | 2 +- src/hypervisor/domain_job.c | 249 ------- src/hypervisor/meson.build | 1 - src/libvirt_private.syms | 52 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 113 +-- src/libxl/libxl_domain.h | 18 +- src/libxl/libxl_driver.c | 123 ++-- src/libxl/libxl_migration.c | 20 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_domain.c | 86 --- src/lxc/lxc_domain.h | 14 +- src/lxc/lxc_driver.c | 103 ++- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_backup.c | 24 +- src/qemu/qemu_checkpoint.c | 12 +- src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_domain.c | 83 ++- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_domainjob.c | 560 ++------------- src/qemu/qemu_domainjob.h | 25 +- src/qemu/qemu_driver.c | 482 +++++++------ src/qemu/qemu_migration.c | 201 +++--- src/qemu/qemu_migration_cookie.c | 17 +- src/qemu/qemu_migration_cookie.h | 3 +- src/qemu/qemu_migration_params.c | 8 +- src/qemu/qemu_process.c | 95 ++- src/qemu/qemu_snapshot.c | 20 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/qemumigrationcookiexmltest.c | 3 +- tests/testutils.c | 2 +- 50 files changed, 1475 insertions(+), 1771 deletions(-) create mode 100644 src/conf/virdomainjob.c rename src/{hypervisor/domain_job.h => conf/virdomainjob.h} (86%) delete mode 100644 src/hypervisor/domain_job.c -- 2.37.1

2 33

[PATCH] conf: Add USB redirect devices to domain capabilities
by Jim Fehlig 31 Aug '22

31 Aug '22

As qemu becomes more modularized, it is important for libvirt to advertise availability of the modularized functionality through capabilities. This change adds USB redirect devices to domain capabilities, allowing clients such as virt-install to avoid using redirdev devices when not supported by the target qemu. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/formatdomaincaps.rst | 22 +++++++++++++++++++ src/conf/domain_capabilities.c | 13 +++++++++++ src/conf/domain_capabilities.h | 8 +++++++ src/conf/schemas/domaincaps.rng | 10 +++++++++ src/qemu/qemu_capabilities.c | 17 ++++++++++++++ src/qemu/qemu_capabilities.h | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.2.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_7.0.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 +++++ 54 files changed, 265 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 70f46b972a..557b61bf26 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -529,6 +529,28 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance: ``backendVersion`` Options for the ``version`` attribute of the ``<tpm><backend/>`` element. +USB redirect device +^^^^^^^^^^^^^^^^^^^ + +USB redirdev device capabilities are exposed under the ``redirdev`` element. For instance: + +:: + + <domainCapabilities> + ... + <devices> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> + ... + </devices> + </domainCapabilities> + +``bus`` + Options for the ``bus`` attribute of the ``<redirdev/>`` element. + Features ~~~~~~~~ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 653123f293..9cb1dbe7bd 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -559,6 +559,18 @@ virDomainCapsDeviceFilesystemFormat(virBuffer *buf, } +static void +virDomainCapsDeviceRedirdevFormat(virBuffer *buf, + const virDomainCapsDeviceRedirdev *redirdev) +{ + FORMAT_PROLOGUE(redirdev); + + ENUM_PROCESS(redirdev, bus, virDomainRedirdevBusTypeToString); + + FORMAT_EPILOGUE(redirdev); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -672,6 +684,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceRNGFormat(&buf, &caps->rng); virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem); virDomainCapsDeviceTPMFormat(&buf, &caps->tpm); + virDomainCapsDeviceRedirdevFormat(&buf, &caps->redirdev); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</devices>\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a526969cda..de2a89c963 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -130,6 +130,13 @@ struct _virDomainCapsDeviceTPM { virDomainCapsEnum backendVersion; /* virDomainTPMVersion */ }; +STATIC_ASSERT_ENUM(VIR_DOMAIN_REDIRDEV_BUS_LAST); +typedef struct _virDomainCapsDeviceRedirdev virDomainCapsDeviceRedirdev; +struct _virDomainCapsDeviceRedirdev { + virTristateBool supported; + virDomainCapsEnum bus; /* virDomainRedirdevBus */ +}; + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesystem; struct _virDomainCapsDeviceFilesystem { @@ -225,6 +232,7 @@ struct _virDomainCaps { virDomainCapsDeviceRNG rng; virDomainCapsDeviceFilesystem filesystem; virDomainCapsDeviceTPM tpm; + virDomainCapsDeviceRedirdev redirdev; /* add new domain devices here */ virDomainCapsFeatureGIC gic; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng index 9cbc2467ab..8da3fbb352 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -195,6 +195,9 @@ <optional> <ref name="tpm"/> </optional> + <optional> + <ref name="redirdev"/> + </optional> </element> </define> @@ -247,6 +250,13 @@ </element> </define> + <define name="redirdev"> + <element name="redirdev"> + <ref name="supported"/> + <ref name="enum"/> + </element> + </define> + <define name="features"> <element name="features"> <optional> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c5338f6830..e54df1788e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6349,6 +6349,21 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, } +void +virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *redirdev) +{ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) { + redirdev->supported = VIR_TRISTATE_BOOL_YES; + redirdev->bus.report = true; + VIR_DOMAIN_CAPS_ENUM_SET(redirdev->bus, VIR_DOMAIN_REDIRDEV_BUS_USB); + } else { + redirdev->supported = VIR_TRISTATE_BOOL_NO; + } +} + + + /** * virQEMUCapsSupportsGICVersion: * @qemuCaps: QEMU capabilities @@ -6484,6 +6499,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceRNG *rng = &domCaps->rng; virDomainCapsDeviceFilesystem *filesystem = &domCaps->filesystem; virDomainCapsDeviceTPM *tpm = &domCaps->tpm; + virDomainCapsDeviceRedirdev *redirdev = &domCaps->redirdev; virDomainCapsMemoryBacking *memoryBacking = &domCaps->memoryBacking; virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6516,6 +6532,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng); virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem); virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm); + virQEMUCapsFillDomainDeviceRedirdevCaps(qemuCaps, redirdev); virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8e777297f6..b2de931e2d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -830,6 +830,9 @@ void virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps, void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceTPM *tpm); +void virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *redirdev); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 0ec4c570ac..a39ada0182 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -216,6 +216,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 4e0cb08b72..e054993aaf 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -231,6 +231,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index 05d606967b..579ca0eed7 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -165,6 +165,7 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index f19ad5e6db..1632c85d7a 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -163,6 +163,7 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index 8ea7ad5714..909feac47c 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -136,6 +136,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index fb162ea578..1c3877ec0c 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -238,6 +238,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index d8793bb38a..666a974489 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -216,6 +216,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 036e446c64..e6625bcdbc 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -218,6 +218,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 4df4e86cf1..9e1ffe3a4d 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index bb8500baa6..631bb6b15f 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -177,6 +177,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index e7227d092f..dcf8d22806 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -175,6 +175,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index cac329fd08..fcfc2266d2 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -142,6 +142,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index e901d12918..f08278cfbf 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -218,6 +218,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index df1572c901..814f81defc 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 3a6dc7b5fc..6391383da7 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index 5c1c0c4680..ea4d1d28dd 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -105,6 +105,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index e0e8e0ed12..5dd7efe165 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 6a49f568be..8b4c1dd954 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index f41f47c346..3306a14ba0 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index dfd792c031..4571622c4c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -177,6 +177,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index e7227d092f..dcf8d22806 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -175,6 +175,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index 88e4837ec3..bc43fb6a38 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -142,6 +142,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 2a2ca8abcf..041c1ede15 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -240,6 +240,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 0a6f72df7e..6147fc84b8 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 40df34edf0..3e36847385 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -221,6 +221,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index e563b0cb59..d622f67ef3 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 958c40437f..9bf854869f 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -179,6 +179,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 4164bf49f7..fbd48cac00 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -177,6 +177,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index 13fa3a637e..880ea5062a 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -241,6 +241,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index eb60a2105f..84e575829d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -221,6 +221,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 0480a086c6..a25fa7bacc 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 7baecb0c73..2972e119e7 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 9cbe93ad46..60da420044 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 07b951b81f..61d43e6599 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 367e656b31..057a67c034 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -236,6 +236,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index 99c0fc03fd..2843599b57 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -181,6 +181,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index 8e04508694..45806a8f10 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -179,6 +179,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 0bbe501383..cc3a45618c 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -141,6 +141,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index f363cf1b79..56fae62434 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 136dadaeb4..5e4d4d48da 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -223,6 +223,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index c684759356..8a18d45fca 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -237,6 +237,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 1d6f29db9f..8e3313f383 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -180,6 +180,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 73097470f8..f25ab0b796 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -178,6 +178,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 7765c941c5..c43c63c741 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -142,6 +142,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 0f9a65ef1b..410cc84977 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -223,6 +223,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 30082712f4..3b5a846342 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index bcca02f0a4..dd7b8c2ab9 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f377b8e3a9..d8c83e03f3 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> -- 2.37.1

1 0

[libvirt][PATCH v15 1/9] domain_capabilities: Define SGX capabilities structs
by Lin Yang 31 Aug '22

31 Aug '22

From: Haibin Huang <haibin.huang(a)intel.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Haibin Huang <haibin.huang(a)intel.com> --- src/conf/domain_capabilities.c | 11 +++++++++++ src/conf/domain_capabilities.h | 21 +++++++++++++++++++++ src/libvirt_private.syms | 1 + 3 files changed, 33 insertions(+) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 653123f293..869b5d68e6 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -76,6 +76,17 @@ virSEVCapabilitiesFree(virSEVCapability *cap) } +void +virSGXCapabilitiesFree(virSGXCapability *cap) +{ + if (!cap) + return; + + g_free(cap->sgxSections); + g_free(cap); +} + + static void virDomainCapsDispose(void *obj) { diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a526969cda..ae93622777 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -193,6 +193,21 @@ struct _virSEVCapability { unsigned int max_es_guests; }; +typedef struct _virSGXSection virSGXSection; +struct _virSGXSection { + unsigned long long size; + unsigned int node; +}; + +typedef struct _virSGXCapability virSGXCapability; +struct _virSGXCapability { + bool flc; + bool sgx1; + bool sgx2; + size_t nSgxSections; + virSGXSection *sgxSections; +}; + typedef enum { VIR_DOMAIN_CAPS_FEATURE_IOTHREADS = 0, VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, @@ -229,6 +244,7 @@ struct _virDomainCaps { virDomainCapsFeatureGIC gic; virSEVCapability *sev; + virSGXCapability *sgx; /* add new domain features here */ virTristateBool features[VIR_DOMAIN_CAPS_FEATURE_LAST]; @@ -277,3 +293,8 @@ void virSEVCapabilitiesFree(virSEVCapability *capabilities); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSEVCapability, virSEVCapabilitiesFree); + +void +virSGXCapabilitiesFree(virSGXCapability *capabilities); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ac2802095e..bb539e62fb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -218,6 +218,7 @@ virDomainCapsEnumSet; virDomainCapsFormat; virDomainCapsNew; virSEVCapabilitiesFree; +virSGXCapabilitiesFree; # conf/domain_conf.h -- 2.25.1

1 8

[PATCH] NEWS: Fix spelling of 'subelment'
by Jim Fehlig 31 Aug '22

31 Aug '22

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing as trivial NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index ff618d5848..82389b48dd 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,7 +25,7 @@ v8.7.0 (unreleased) * qemu: Add support for specifying vCPU physical address size in bits Users can now specify the number of vCPU physical address bits with - the `<maxphysaddr>` subelment of the `<cpu>` element. + the `<maxphysaddr>` subelement of the `<cpu>` element. * **Improvements** -- 2.37.1

1 0

[PATCH] qemuValidateDomainDef: Clarify error message when S390 PV launch security is unsupported by the kernel
by Peter Krempa 30 Aug '22

30 Aug '22

Split up the condition and report a different error message when the host or host config results in S390 PV launch security being unavailable. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2122534 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_validate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6403266559..63f3459c90 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1454,11 +1454,14 @@ qemuValidateDomainDef(const virDomainDef *def, break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST) || - !virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps)) { + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("S390 PV launch security is not supported with " - "this QEMU binary")); + _("S390 PV launch security is not supported with this QEMU binary")); + return -1; + } + if (!virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("S390 PV launch security is not supported by this host or kernel")); return -1; } break; -- 2.37.1

2 2

Entering freeze for libvirt-8.7.0
by Jiri Denemark 30 Aug '22

30 Aug '22

I have just tagged v8.7.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH] conf: Add more checks for VDS interface parameters
by Martin Kletzander 30 Aug '22

30 Aug '22

Add some checks that commit 0225483adce9 forgot to include. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6950f7ec1d8f..970cc85ded6c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9336,6 +9336,27 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, goto error; } + if (!portid) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source portid for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + + if (!connectionid) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source connectionid for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + + if (!portgroup) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source portgroup for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + if (virUUIDParse(switchid, def->data.vds.switch_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse switchid '%s'"), switchid); -- 2.37.2

2 1

[PATCH 0/5] Add "support" for VMWare Distributed Switch
by Martin Kletzander 30 Aug '22

30 Aug '22

Previously (but still in this release) such interfaces were represented as dummy ones, but hopefully we can properly represent them still in the same release. Martin Kletzander (5): tests: Fix vmx/xml filenames conf: Rewrite virNetDevVPortProfileCopy vmx: Require networkName for bridged and custom NICs conf, docs, schemas: Add support for interface type vds vmx: Add support for VDS interface docs/formatdomain.rst | 30 ++++++-- src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 73 ++++++++++++++++-- src/conf/domain_conf.h | 7 ++ src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 23 ++++++ src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 + src/lxc/lxc_process.c | 2 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_interface.c | 2 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 1 + src/util/virnetdevvportprofile.c | 18 +++-- src/util/virnetdevvportprofile.h | 5 +- src/vmx/vmx.c | 77 +++++++++++++++---- ...unmanaged-nodev.vmx => ethernet-dummy.vmx} | 0 ...unmanaged-nodev.xml => ethernet-dummy.xml} | 0 tests/vmx2xmldata/ethernet-vds.vmx | 11 +++ tests/vmx2xmldata/ethernet-vds.xml | 24 ++++++ tests/vmx2xmltest.c | 3 +- ...d-nodev.vmx => xml2vmx-ethernet-dummy.vmx} | 0 ...d-nodev.xml => xml2vmx-ethernet-dummy.xml} | 0 tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx | 18 +++++ tests/xml2vmxdata/xml2vmx-ethernet-vds.xml | 15 ++++ tests/xml2vmxtest.c | 3 +- tools/virsh-domain.c | 1 + 31 files changed, 292 insertions(+), 39 deletions(-) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.vmx => ethernet-dummy.vmx} (100%) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.xml => ethernet-dummy.xml} (100%) create mode 100644 tests/vmx2xmldata/ethernet-vds.vmx create mode 100644 tests/vmx2xmldata/ethernet-vds.xml rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.vmx => xml2vmx-ethernet-dummy.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.xml => xml2vmx-ethernet-dummy.xml} (100%) create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.xml -- 2.37.2

3 9

[libvirt PATCH] tests: add better QEMU capabilities example
by Daniel P. Berrangé 30 Aug '22

30 Aug '22

Updated example covers: * UUID * CPU model, vendor, microcode, signature, counters, topology, maxphysaddr, features, * Power management * NUMA page size info, multiple nodes, CPU topology IDs, distances * CPU cache bank info * Multiple secmodels Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/capabilityschemadata/caps-qemu-kvm.xml | 95 ++++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 65c3bba7c4..acdbb362cc 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -1,9 +1,50 @@ <capabilities> <host> + <uuid>a25c794c-34ad-11b2-a85c-b030533115b8</uuid> <cpu> <arch>x86_64</arch> + <model>Haswell-noTSX</model> + <vendor>Intel</vendor> + <microcode version='45'/> + <counter name='tsc' frequency='2596991000' scaling='no'/> + <topology sockets='1' dies='1' cores='8' threads='1'/> + <maxphysaddr mode='emulate' bits='39'/> + <feature name='vme'/> + <feature name='ds'/> + <feature name='acpi'/> + <feature name='ss'/> + <feature name='ht'/> + <feature name='tm'/> + <feature name='pbe'/> + <feature name='dtes64'/> + <feature name='ds_cpl'/> + <feature name='vmx'/> + <feature name='smx'/> + <feature name='est'/> + <feature name='tm2'/> + <feature name='xtpr'/> + <feature name='pdcm'/> + <feature name='dca'/> + <feature name='osxsave'/> + <feature name='f16c'/> + <feature name='rdrand'/> + <feature name='arat'/> + <feature name='tsc_adjust'/> + <feature name='cmt'/> + <feature name='xsaveopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> + <feature name='invtsc'/> + <pages unit='KiB' size='4'/> + <pages unit='KiB' size='2048'/> + <pages unit='KiB' size='1048576'/> </cpu> + <power_management> + <suspend_mem/> + <suspend_disk/> + <suspend_hybrid/> + </power_management> <migration_features> <live/> <uri_transports> @@ -12,23 +53,65 @@ </uri_transports> </migration_features> <topology> - <cells num='1'> + <cells num='2'> <cell id='0'> - <cpus num='4'> - <cpu id='0'/> - <cpu id='1'/> - <cpu id='2'/> - <cpu id='3'/> + <memory unit='KiB'>16175540</memory> + <pages unit='KiB' size='4'>4043885</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>0</pages> + <distances> + <sibling id='0' value='10'/> + <sibling id='1' value='21'/> + </distances> + <cpus num='8'> + <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> + <cpu id='2' socket_id='0' die_id='0' core_id='1' siblings='2'/> + <cpu id='4' socket_id='0' die_id='0' core_id='2' siblings='4'/> + <cpu id='6' socket_id='0' die_id='0' core_id='3' siblings='6'/> + <cpu id='8' socket_id='0' die_id='0' core_id='4' siblings='8'/> + <cpu id='10' socket_id='0' die_id='0' core_id='5' siblings='10'/> + <cpu id='12' socket_id='0' die_id='0' core_id='6' siblings='12'/> + <cpu id='14' socket_id='0' die_id='0' core_id='7' siblings='14'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>16510060</memory> + <pages unit='KiB' size='4'>4127515</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>0</pages> + <distances> + <sibling id='0' value='21'/> + <sibling id='1' value='10'/> + </distances> + <cpus num='8'> + <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> + <cpu id='3' socket_id='1' die_id='0' core_id='1' siblings='3'/> + <cpu id='5' socket_id='1' die_id='0' core_id='2' siblings='5'/> + <cpu id='7' socket_id='1' die_id='0' core_id='3' siblings='7'/> + <cpu id='9' socket_id='1' die_id='0' core_id='4' siblings='9'/> + <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='13' socket_id='1' die_id='0' core_id='6' siblings='13'/> + <cpu id='15' socket_id='1' die_id='0' core_id='7' siblings='15'/> </cpus> </cell> </cells> </topology> + <cache> + <bank id='0' level='3' type='both' size='20' unit='MiB' cpus='0,2,4,6,8,10,12,14'/> + <bank id='1' level='3' type='both' size='20' unit='MiB' cpus='1,3,5,7,9,11,13,15'/> + </cache> <secmodel> <model>selinux</model> <doi>0</doi> <baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel> <baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel> </secmodel> + <secmodel> + <model>dac</model> + <doi>0</doi> + <baselabel type='kvm'>+107:+107</baselabel> + <baselabel type='qemu'>+107:+107</baselabel> + </secmodel> </host> <guest> -- 2.37.2

2 1

[PATCH] qemu: command: Don't use deprecated chardev backend drivers 'tty' and 'parport'
by Peter Krempa 29 Aug '22

29 Aug '22

The replacement is 'serial' and 'parallel' respectively introduced at least in qemu-2.9 and the old versions are deprecated since qemu-6.0. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 12 ++++++++---- .../qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +- .../parallel-parport-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- .../pci-serial-dev-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +- .../serial-dev-chardev-iobase.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a31b8ee438..da04537234 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1314,12 +1314,16 @@ qemuBuildChardevStr(const virDomainChrSourceDef *dev, virBufferAsprintf(&buf, "pty,id=%s", charAlias); break; - case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferAsprintf(&buf, "%s,id=%s,path=", - STRPREFIX(charAlias, "charparallel") ? "parport" : "tty", - charAlias); + case VIR_DOMAIN_CHR_TYPE_DEV: { + const char *backend = "serial"; + + if (STRPREFIX(charAlias, "charparallel")) + backend = "parallel"; + + virBufferAsprintf(&buf, "%s,id=%s,path=", backend, charAlias); virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; + } case VIR_DOMAIN_CHR_TYPE_FILE: virBufferAsprintf(&buf, "file,id=%s", charAlias); diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args index b8ac17eee6..42b0ad3230 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"smartcard0","bus":"ccid0.0"}' \ --chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ +-chardev serial,id=charserial0,path=/dev/ttyS2,,foo \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":1}' \ -add-fd set=0,fd=1750,opaque=serial1-source \ -chardev file,id=charserial1,path=/dev/fdset/0,append=on \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args index e3d3d6f3db..66b398fe64 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev parport,id=charparallel0,path=/dev/parport0 \ +-chardev parallel,id=charparallel0,path=/dev/parport0 \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args index 2ce2e381bb..6200251f1e 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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}' \ --chardev parport,id=charparallel0,path=/dev/parport0 \ +-chardev parallel,id=charparallel0,path=/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args index 651b2732f5..0cc0ef2c14 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args index c513ae0316..94d90b215c 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args index 735dcd053a..32218842ef 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index a22237b680..3b5ce0a59b 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0,"iobase":1016,"irq":4}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args index 52f9c3d0bb..ba8832f64f 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,index=0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index a19d3bb209..ffa9bac136 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -- 2.37.1

2 1

[PATCH] NEWS: Mention bumping of minimum qemu version to 4.2
by Peter Krempa 29 Aug '22

29 Aug '22

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 bd848a8867..ff618d5848 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -15,6 +15,11 @@ v8.7.0 (unreleased) * **Removed features** + * qemu: Remove support for QEMU < 4.2 + + In accordance with our platform support policy, the oldest supported QEMU + version is now bumped from 3.1 to 4.2. + * **New features** * qemu: Add support for specifying vCPU physical address size in bits -- 2.37.1

2 1

[libvirt PATCH] NEWS: memtion vdpa/vfio memlock bump in release notes
by Jonathon Jongsma 26 Aug '22

26 Aug '22

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2e0a4a7b94..8ebf67581f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -31,6 +31,12 @@ v8.7.0 (unreleased) * **Bug fixes** + * qemu: increase memlock limit for a domain with multiple vfio/vdpa devices + + When multiple vfio or vdpa devices are assigned to a domain, the memory + limit could be too low to map memory for all devices. The memlock limit has + been increased to be proportional to the number of vdpa/vfio devices. + v8.6.0 (2022-08-01) =================== -- 2.37.1

2 1

[PATCH v1 00/10] Dirty page rate limit support
by huangy81＠chinatelecom.cn 26 Aug '22

26 Aug '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> Ping How about this series? hoping to get comments if anyone has played with it. Thanks very much sincerely. Yong v1: - rebase on master and fix conflicts - filter out dirty page limit info for hotpluggable vcpu but not active - drop the documents patch, which can be post later after main series being reviewed. - code clean Abstract ======== Qemu introduced dirty page rate limit feature in 7.1.0, see the details in the following link: https://lore.kernel.org/qemu-devel/cover.1656177590.git.huangy81@chinatelec… So may be it's the right time to enabling this feature in libvirt meanwhile so that upper user can play with it. Expecting the upper app can use this feature to do a vcpu Qos or whatever else. This patch add 2 new apis to implement dirty page rate limit: 1. virDomainSetVcpuDirtyLimit, which set vcpu dirty page rate limit. virsh command 'vcpudirtylimit' also implemented correspondingly. 2. virDomainCancelVcpuDirtyLimit, which cancel vcpu dirty page rate limit. 'cancel' option was introduced to 'vcpudirtylimit' to cancel the limit correspondingly. In addition, function 'qemuMonitorQueryVcpuDirtyLimit' was implemented to query dirty page rate limit, virsh command 'vcpuinfo' was extended so that user can query dirty page rate limit info via 'vcpuinfo'. This series make main modifications as the following: - introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability so that libvirt can probe before using dirty page rate limit feature. - implement virsh command 'vcpudirtylimit' to set/cancel dirty page rate limit. - extend vcpuinfo api so that it can display dirtylimit info. Please review, thanks! Best regards! Hyman Huang(黄勇) (10): qemu_capabilities: Introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability libvirt: Add virDomainSetVcpuDirtyLimit API qemu_driver: Implement qemuDomainSetVcpuDirtyLimit virsh: Introduce vcpudirtylimit api qemu_monitor: Implement qemuMonitorQueryVcpuDirtyLimit qemu_driver: Extend qemuDomainGetVcpus for dirtylimit virsh: Extend vcpuinfo api to display dirtylimit info libvirt: Add virDomainCancelVcpuDirtyLimit API qemu_driver: Implement qemuDomainCancelVcpuDirtyLimit virsh: Add cancel option to vcpudirtylimit api include/libvirt/libvirt-domain.h | 22 ++++ src/driver-hypervisor.h | 13 ++ src/libvirt-domain.c | 94 ++++++++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 156 +++++++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++++++ src/qemu/qemu_monitor.h | 26 ++++ src/qemu/qemu_monitor_json.c | 138 ++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 13 ++ src/remote/remote_daemon_dispatch.c | 2 + src/remote/remote_driver.c | 4 + src/remote/remote_protocol.x | 30 ++++- src/remote_protocol-structs | 13 ++ tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 + tools/virsh-domain.c | 112 ++++++++++++++++ 17 files changed, 667 insertions(+), 2 deletions(-) -- 1.8.3.1

1 10

[PATCH] lib: Drop needless ret variables
by Michal Privoznik 26 Aug '22

26 Aug '22

This patch was generated using the following spatch: @@ type T; constant C; expression f; identifier ret; @@ ( -T ret = C; | -T ret; ) ... when != ret when strict ( -ret = f; -return ret; +return f; | -return ret; +return C; ) Basically, if there's a variable declared at the beginning of a function and the variable is not changed until the very last moment, just before return, such variable is useless. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/checkpoint_conf.c | 4 +--- src/conf/domain_addr.c | 6 +----- src/conf/domain_conf.c | 8 ++------ src/esx/esx_driver.c | 5 +---- src/libxl/libxl_domain.c | 4 +--- src/libxl/xen_xl.c | 5 +---- src/openvz/openvz_conf.c | 3 +-- src/qemu/qemu_driver.c | 6 ++---- src/qemu/qemu_process.c | 5 +---- src/test/test_driver.c | 18 +++++++----------- src/util/virbitmap.c | 4 +--- src/util/virerror.c | 3 +-- src/util/virxml.c | 5 +---- tests/genericxml2xmltest.c | 10 ++++------ tests/interfacexml2xmltest.c | 5 +---- tests/libxlxml2domconfigtest.c | 5 +---- tests/lxcconf2xmltest.c | 10 ++-------- tests/lxcxml2xmltest.c | 11 ++++------- tests/networkxml2conftest.c | 5 +---- tests/networkxml2firewalltest.c | 5 +---- tests/networkxml2xmltest.c | 7 ++----- tests/networkxml2xmlupdatetest.c | 9 +++------ tests/nodedevxml2xmltest.c | 5 +---- tests/nwfilterxml2firewalltest.c | 5 +---- tests/nwfilterxml2xmltest.c | 5 +---- tests/secretxml2xmltest.c | 5 +---- tests/vboxsnapshotxmltest.c | 5 +---- tests/virnwfilterbindingxml2xmltest.c | 5 +---- tests/vmx2xmltest.c | 5 +---- tests/xml2vmxtest.c | 5 +---- 30 files changed, 48 insertions(+), 135 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 338cf10d12..17aa98dc2a 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -119,7 +119,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, void *parseOpaque, unsigned int flags) { - virDomainCheckpointDef *ret = NULL; size_t i; int n; g_autofree xmlNodePtr *nodes = NULL; @@ -177,8 +176,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, return NULL; } - ret = g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } static virDomainCheckpointDef * diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 76f9c12ca6..f7b2acdcc9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1429,11 +1429,7 @@ virDomainCCWAddressSetCreateFromDomain(virDomainDef *def) static virDomainVirtioSerialAddrSet * virDomainVirtioSerialAddrSetCreate(void) { - virDomainVirtioSerialAddrSet *ret = NULL; - - ret = g_new0(virDomainVirtioSerialAddrSet, 1); - - return ret; + return g_new0(virDomainVirtioSerialAddrSet, 1); } static void diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6950f7ec1d..bc74965d91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28728,7 +28728,6 @@ virSecurityLabelDef * virDomainDefGetSecurityLabelDef(const virDomainDef *def, const char *model) { size_t i; - virSecurityLabelDef *seclabel = NULL; if (def == NULL || model == NULL) return NULL; @@ -28740,7 +28739,7 @@ virDomainDefGetSecurityLabelDef(const virDomainDef *def, const char *model) return def->seclabels[i]; } - return seclabel; + return NULL; } @@ -30592,7 +30591,6 @@ virDomainObjGetMessages(virDomainObj *vm, size_t i = 0; size_t n = 0; int nmsgs = 0; - int rv = -1; *msgs = NULL; @@ -30623,9 +30621,7 @@ virDomainObjGetMessages(virDomainObj *vm, if (*msgs) (*msgs)[nmsgs] = NULL; - rv = nmsgs; - - return rv; + return nmsgs; } bool diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9dc5489411..a0540f585d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2671,7 +2671,6 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, virVMXContext ctx; esxVMX_Data data; g_autoptr(virDomainDef) def = NULL; - char *vmx = NULL; virCheckFlags(0, NULL); @@ -2705,9 +2704,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, ctx.datacenterPath = NULL; ctx.moref = NULL; - vmx = virVMXFormatConfig(&ctx, priv->xmlopt, def, virtualHW_version); - - return vmx; + return virVMXFormatConfig(&ctx, priv->xmlopt, def, virtualHW_version); } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 52e0aa1e60..1cbb007f13 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -712,11 +712,9 @@ libxlDomainEventHandler(void *data, libxl_event *event) char * libxlDomainManagedSavePath(libxlDriverPrivate *driver, virDomainObj *vm) { - char *ret; g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - ret = g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); - return ret; + return g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); } /* diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6919325623..188cecb98e 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1318,7 +1318,6 @@ xenFormatXLVnuma(virConfValue *list, size_t node, size_t nr_nodes) { - int ret = -1; size_t i; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virConfValue *numaVnode; @@ -1365,9 +1364,7 @@ xenFormatXLVnuma(virConfValue *list, tmp->next = numaVnode; else list->list = numaVnode; - ret = 0; - - return ret; + return 0; } static int diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c94f9b8577..368e747a34 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -772,7 +772,6 @@ static int openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) { char *confdir; - int ret = 0; confdir = openvzLocateConfDir(); if (confdir == NULL) @@ -781,7 +780,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) *conffile = g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); VIR_FREE(confdir); - return ret; + return 0; } static char * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 707f4cc1bb..3f9638bc8e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6029,7 +6029,6 @@ qemuDomainRestoreParams(virConnectPtr conn, { const char *path = NULL; const char *dxml = NULL; - int ret = -1; if (virTypedParamsValidate(params, nparams, VIR_DOMAIN_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING, @@ -6050,9 +6049,8 @@ qemuDomainRestoreParams(virConnectPtr conn, return -1; } - ret = qemuDomainRestoreInternal(conn, path, dxml, flags, - virDomainRestoreParamsEnsureACL); - return ret; + return qemuDomainRestoreInternal(conn, path, dxml, flags, + virDomainRestoreParamsEnsureACL); } static char * diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32f03ff79a..f7cf56904b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2974,7 +2974,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, virDomainObj *vm, int asyncJob) { - int ret = -1; ssize_t i; qemuDomainObjPrivate *priv = vm->privateData; virDomainVideoDef *video = NULL; @@ -3035,9 +3034,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); cfg = virQEMUDriverGetConfig(driver); - ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); - - return ret; + return virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); error: qemuDomainObjExitMonitor(vm); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 641a141b6a..15fe9404e4 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7751,7 +7751,6 @@ testNodeDeviceCreateXML(virConnectPtr conn, static int testNodeDeviceDestroy(virNodeDevicePtr dev) { - int ret = 0; testDriver *driver = dev->conn->privateData; virNodeDeviceObj *obj = NULL; virNodeDeviceObj *parentobj = NULL; @@ -7794,7 +7793,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) cleanup: virNodeDeviceObjEndAPI(&obj); virObjectEventStateQueue(driver->eventState, event); - return ret; + return 0; } @@ -9547,25 +9546,24 @@ testDomainChgIOThread(virDomainObj *vm, unsigned int flags) { virDomainDef *def; - int ret = -1; if (!(def = virDomainObjGetOneDef(vm, flags))) - return ret; + return -1; if (def) { switch (action) { case VIR_DOMAIN_IOTHREAD_ACTION_ADD: if (virDomainDriverAddIOThreadCheck(def, iothread_id) < 0) - return ret; + return -1; if (!virDomainIOThreadIDAdd(def, iothread_id)) - return ret; + return -1; break; case VIR_DOMAIN_IOTHREAD_ACTION_DEL: if (virDomainDriverDelIOThreadCheck(def, iothread_id) < 0) - return ret; + return -1; virDomainIOThreadIDDel(def, iothread_id); @@ -9576,16 +9574,14 @@ testDomainChgIOThread(virDomainObj *vm, virReportError(VIR_ERR_INVALID_ARG, _("cannot find IOThread '%u' in iothreadids"), iothread_id); - return ret; + return -1; } break; } } - ret = 0; - - return ret; + return 0; } static int diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 5b9204cbd7..786b9adb06 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -330,9 +330,7 @@ virBitmapFormat(virBitmap *bitmap) int start, cur, prev; if (!bitmap || (cur = virBitmapNextSetBit(bitmap, -1)) < 0) { - char *ret; - ret = g_strdup(""); - return ret; + return g_strdup(""); } start = prev = cur; diff --git a/src/util/virerror.c b/src/util/virerror.c index d114c0a346..e41544cdb8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -199,7 +199,6 @@ static int virCopyError(virErrorPtr from, virErrorPtr to) { - int ret = 0; if (!to) return 0; virResetError(to); @@ -217,7 +216,7 @@ virCopyError(virErrorPtr from, /* * Deliberately not setting 'conn', 'dom', 'net' references */ - return ret; + return 0; } diff --git a/src/util/virxml.c b/src/util/virxml.c index d6e2e5dd91..1f64cf151b 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1591,13 +1591,10 @@ virXMLValidateAgainstSchema(const char *schemafile, int virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node) { - int ret; g_autoptr(xmlDoc) copy = xmlNewDoc(NULL); xmlDocSetRootElement(copy, xmlCopyNode(node, true)); - ret = virXMLValidateAgainstSchema(schemafile, copy); - - return ret; + return virXMLValidateAgainstSchema(schemafile, copy); } diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 3501eadf55..70b69101d8 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -27,18 +27,16 @@ testCompareXMLToXMLHelper(const void *data) const struct testInfo *info = data; g_autofree char *xml_in = NULL; g_autofree char *xml_out = NULL; - int ret = -1; xml_in = g_strdup_printf("%s/genericxml2xmlindata/%s.xml", abs_srcdir, info->name); xml_out = g_strdup_printf("%s/genericxml2xmloutdata/%s.xml", abs_srcdir, info->name); - ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, - info->different ? xml_out : xml_in, - info->active_only, 0, - info->expectResult); - return ret; + return testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, + info->different ? xml_out : xml_in, + info->active_only, 0, + info->expectResult); } diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index b23e0f589b..95fee4d744 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -38,15 +38,12 @@ testCompareXMLToXMLFiles(const char *xml) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/interfaceschemadata/%s.xml", abs_srcdir, (const char *)data); - result = testCompareXMLToXMLFiles(xml); - - return result; + return testCompareXMLToXMLFiles(xml); } diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index a7080e0fa2..7d59bfe886 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -139,7 +139,6 @@ struct testInfo { static int testCompareXMLToDomConfigHelper(const void *data) { - int ret = -1; const struct testInfo *info = data; g_autofree char *xmlfile = NULL; g_autofree char *jsonfile = NULL; @@ -147,9 +146,7 @@ testCompareXMLToDomConfigHelper(const void *data) xmlfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); jsonfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); - ret = testCompareXMLToDomConfig(xmlfile, jsonfile); - - return ret; + return testCompareXMLToDomConfig(xmlfile, jsonfile); } diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 09f6465567..f384264e59 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -58,7 +58,6 @@ struct testInfo { static int testCompareXMLToConfigHelperLegacy(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *config = NULL; @@ -68,15 +67,12 @@ testCompareXMLToConfigHelperLegacy(const void *data) config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.config", abs_srcdir, info->name); - result = testCompareXMLToConfigFiles(xml, config, info->expectError); - - return result; + return testCompareXMLToConfigFiles(xml, config, info->expectError); } static int testCompareXMLToConfigHelperV3(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *config = NULL; @@ -86,9 +82,7 @@ testCompareXMLToConfigHelperV3(const void *data) config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", abs_srcdir, info->name); - result = testCompareXMLToConfigFiles(xml, config, info->expectError); - - return result; + return testCompareXMLToConfigFiles(xml, config, info->expectError); } diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 2c5d294f18..abb48ff993 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -30,19 +30,16 @@ testCompareXMLToXMLHelper(const void *data) const struct testInfo *info = data; g_autofree char *xml_in = NULL; g_autofree char *xml_out = NULL; - int ret = -1; xml_in = g_strdup_printf("%s/lxcxml2xmldata/lxc-%s.xml", abs_srcdir, info->name); xml_out = g_strdup_printf("%s/lxcxml2xmloutdata/lxc-%s.xml", abs_srcdir, info->name); - ret = testCompareDomXML2XMLFiles(driver->caps, driver->xmlopt, xml_in, - info->different ? xml_out : xml_in, - info->active_only, - info->parse_flags, - TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); - return ret; + return testCompareDomXML2XMLFiles(driver->caps, driver->xmlopt, xml_in, + info->different ? xml_out : xml_in, + info->active_only, info->parse_flags, + TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); } diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index bbeb849a39..81f2b4b9ae 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -93,7 +93,6 @@ typedef struct { static int testCompareXMLToConfHelper(const void *data) { - int result = -1; const testInfo *info = data; g_autofree char *inxml = NULL; g_autofree char *outconf = NULL; @@ -103,9 +102,7 @@ testCompareXMLToConfHelper(const void *data) outconf = g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcdir, info->name); outhostsfile = g_strdup_printf("%s/networkxml2confdata/%s.hostsfile", abs_srcdir, info->name); - result = testCompareXMLToConfFiles(inxml, outconf, outhostsfile, info->caps); - - return result; + return testCompareXMLToConfFiles(inxml, outconf, outhostsfile, info->caps); } static void diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index ca793fd4ea..9cf00d9369 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -125,7 +125,6 @@ struct testInfo { static int testCompareXMLToIPTablesHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -135,9 +134,7 @@ testCompareXMLToIPTablesHelper(const void *data) args = g_strdup_printf("%s/networkxml2firewalldata/%s-%s.args", abs_srcdir, info->name, RULESTYPE); - result = testCompareXMLToArgvFiles(xml, args, info->baseargs); - - return result; + return testCompareXMLToArgvFiles(xml, args, info->baseargs); } diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 521f058acc..86a9cdd137 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -81,17 +81,14 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - int result = -1; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; inxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, info->name); outxml = g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, info->name); - result = testCompareXMLToXMLFiles(inxml, outxml, info->flags, - info->expectResult); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml, info->flags, + info->expectResult); } static int diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index 58b6f70c96..392507cc5c 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -71,7 +71,6 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - int result = -1; g_autofree char *netxml = NULL; g_autofree char *updatexml = NULL; g_autofree char *outxml = NULL; @@ -83,11 +82,9 @@ testCompareXMLToXMLHelper(const void *data) outxml = g_strdup_printf("%s/networkxml2xmlupdateout/%s.xml", abs_srcdir, info->outxml); - result = testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, - info->command, info->section, - info->parentIndex, info->expectFailure); - - return result; + return testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, + info->command, info->section, + info->parentIndex, info->expectFailure); } static int diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index f82027fb87..6f67ffd73f 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -64,7 +64,6 @@ testCompareXMLToXMLFiles(const char *xml, const char *outfile) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; g_autofree char *outfile = NULL; @@ -74,9 +73,7 @@ testCompareXMLToXMLHelper(const void *data) outfile = g_strdup_printf("%s/nodedevxml2xmlout/%s.xml", abs_srcdir, (const char *)data); - result = testCompareXMLToXMLFiles(xml, outfile); - - return result; + return testCompareXMLToXMLFiles(xml, outfile); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 1514002b8f..6c540f90af 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -389,7 +389,6 @@ struct testInfo { static int testCompareXMLToIPTablesHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -399,9 +398,7 @@ testCompareXMLToIPTablesHelper(const void *data) args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", abs_srcdir, info->name, RULESTYPE); - result = testCompareXMLToArgvFiles(xml, args); - - return result; + return testCompareXMLToArgvFiles(xml, args); } diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index c2b6dc575b..1924cfdbde 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -51,7 +51,6 @@ typedef struct test_parms { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; const test_parms *tp = data; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; @@ -59,9 +58,7 @@ testCompareXMLToXMLHelper(const void *data) inxml = g_strdup_printf("%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->name); outxml = g_strdup_printf("%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->name); - result = testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); } static int diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 828e44a32b..4aa7463e83 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -33,7 +33,6 @@ struct testInfo { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; const struct testInfo *info = data; @@ -44,9 +43,7 @@ testCompareXMLToXMLHelper(const void *data) info->different ? "out" : "in", info->name); - result = testCompareXMLToXMLFiles(inxml, outxml); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml); } static int diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 3ad8298895..ed9bb92018 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -87,15 +87,12 @@ testCompareXMLtoXMLFiles(const char *xml) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, (const char *)data); - result = testCompareXMLtoXMLFiles(xml); - - return result; + return testCompareXMLtoXMLFiles(xml); } static int diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c index 0c93b58a0c..afde2e3a4d 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -64,16 +64,13 @@ typedef struct test_parms { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; const test_parms *tp = data; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdir, tp->name); - result = testCompareXMLToXMLFiles(xml); - - return result; + return testCompareXMLToXMLFiles(xml); } static int diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index a43cab3108..d864843c19 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -89,7 +89,6 @@ struct testInfo { static int testCompareHelper(const void *data) { - int ret = -1; const struct testInfo *info = data; g_autofree char *vmx = NULL; g_autofree char *xml = NULL; @@ -99,9 +98,7 @@ testCompareHelper(const void *data) xml = g_strdup_printf("%s/vmx2xmldata/%s.xml", abs_srcdir, info->file); - ret = testCompareFiles(vmx, xml, info->should_fail); - - return ret; + return testCompareFiles(vmx, xml, info->should_fail); } static int diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 1cadb9500a..be9d5f3e6b 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -83,7 +83,6 @@ struct testInfo { static int testCompareHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *vmx = NULL; @@ -93,9 +92,7 @@ testCompareHelper(const void *data) vmx = g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, info->output); - result = testCompareFiles(xml, vmx, info->virtualHW_version); - - return result; + return testCompareFiles(xml, vmx, info->virtualHW_version); } static int -- 2.35.1

2 1

[PATCH 00/10] virDomainControllerDef(Validate|Parse|Format): Refactor and fix several problems
by Peter Krempa 26 Aug '22

26 Aug '22

A relatively simple-looking bug report (see 10/10) lead me looking and finding few more problems. Peter Krempa (10): virDomainControllerDefValidate: Un-break lines in error messages virDomainControllerDefFormat: Use proper type for enum virDomainControllerDefFormat: Split out formatting of PCI controller virDomainControllerDefFormatPCI: Refactor formatting of '<target>' subelement virDomainControllerDefParseXML: Fix broken code indentation when parsing PCI contoller target virDomainControllerDefParseXML: Fix broken error reporting when parsing 'index' virDomainControllerDefParseXML: Remove explicit checks for negative value virDomainControllerDefParseXML: Parse 'index' by virXMLPropInt virDomainControllerDefParseXML: Return early if there's unexpectedly many elements virDomainControllerDefParseXML: Reject '-1' for PCI controller target properties src/conf/domain_conf.c | 286 ++++++++---------- src/conf/domain_validate.c | 24 +- .../pci-bridge-negative-index-invalid.err | 2 +- 3 files changed, 132 insertions(+), 180 deletions(-) -- 2.37.1

2 11

[PATCH] docs: formatdomain: Fix small typos and syntax errors
by Carlos Bilbao 25 Aug '22

25 Aug '22

Fix some small typos and syntax errors in file formatdomain.rs. Signed-off-by: Carlos Bilbao <carlos.bilbao(a)amd.com> --- docs/formatdomain.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 1c4700ac37..34e4906eb4 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -188,7 +188,7 @@ harddisk, cdrom, network) determining where to obtain/find the boot image. features required by selected firmware. Accepted values are ``bios`` and ``efi``. The selection process scans for files describing installed firmware images in - specified location and uses the most specific one which fulfils domain + specified location and uses the most specific one which fulfills domain requirements. The locations in order of preference (from generic to most specific one) are: @@ -1511,7 +1511,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler rather then trying to mimic the host CPU model. If an application does not care about a specific CPU, just wants the - best featureset without a need for migration compatibility, the + best feature set without a need for migration compatibility, the ``maximum`` model is a good choice on hypervisors where it is available. ``model`` @@ -2148,7 +2148,7 @@ are: ``nested-hv`` Configure nested HV availability for pSeries guests. This needs to be enabled from the host (L0) in order to be effective; having HV support in the (L1) - guest is very desiderable if it's planned to run nested (L2) guests inside + guest is very desirable if it's planned to run nested (L2) guests inside it, because it will result in those nested guests having much better performance than they would when using KVM PR or TCG. Possible values for the ``state`` attribute are ``on`` and ``off``. If the attribute is not defined, @@ -2380,7 +2380,7 @@ event name Description ``page_faults_min`` the count of minor page faults, that is, where the page was present in the page cache, and therefore the fault avoided loading it from storage, by applications running on the platform ``perf.page_faults_min`` ``page_faults_maj`` the count of major page faults, that is, where the page was not present in the page cache, and therefore had to be fetched from storage, by applications running on the platform ``perf.page_faults_maj`` ``alignment_faults`` the count of alignment faults, that is when the load or store is not aligned properly, by applications running on the platform ``perf.alignment_faults`` -``emulation_faults`` the count of emulation faults, that is when the kernel traps on unimplemented instrucions and emulates them for user space, by applications running on the platform ``perf.emulation_faults`` +``emulation_faults`` the count of emulation faults, that is when the kernel traps on unimplemented instructions and emulates them for user space, by applications running on the platform ``perf.emulation_faults`` =========================== ======================================================================================================================================================================================= ================================ @@ -3109,7 +3109,7 @@ paravirtualized driver is specified via the ``disk`` element. :since:`Throughput limits since 1.2.11 and QEMU 1.7` ``group_name`` - The optional ``group_name`` provides the cability to share I/O throttling + The optional ``group_name`` provides the ability to share I/O throttling quota between multiple drives. This prevents end-users from circumventing a hosting provider's throttling policy by splitting 1 large drive in N small drives and getting N times the normal throttling quota. Any name may @@ -5670,7 +5670,7 @@ be the "native" VLAN for this interface, and the ``nativeMode`` attribute determines whether or not traffic for that VLAN will be tagged. -Isolating guests's network traffic from each other +Isolating guests' network traffic from each other ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: @@ -8379,7 +8379,7 @@ spec <https://support.amd.com/TechDocs/55766_SEV-KM_API_Specification.pdf>`__ capabilities. ``reducedPhysBits`` The required ``reducedPhysBits`` element provides the physical address bit - reducation. Similar to ``cbitpos`` the value of ``reduced-phys-bit`` is + reduction. Similar to ``cbitpos`` the value of ``reduced-phys-bit`` is hypervisor dependent and can be obtained through the ``sev`` element from the domain capabilities. ``policy`` -- 2.34.1

2 1

[PATCH 0/8] qemu: Retire logic for setting 'disable-modern'/'disable-legacy' props of virtio devices
by Peter Krempa 25 Aug '22

25 Aug '22

The virtio-*-(non-)-transitional device models which replace the properties were introduced in qemu-4.0, so we can remove the logic for the old-style syntax. In addition this series modernizes the tests meant for the virtio devices in question. Peter Krempa (8): qemu: address: Use PCIe for virtio devices also with QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL qemuxml2*test: Use QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL for macos hfv tests qemuxml2argvtest: Add DO_TEST_CAPS_LATEST versions of tests which assert QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemuxml2argvtest: Convert all test cases asserting QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemuxml2*test: Remove 'q35-virtio-pci' test case qemuxml2xmltest: Convert all test cases asserting QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemu: Remove extra logic around QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY src/qemu/qemu_capabilities.c | 13 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 23 +-- src/qemu/qemu_domain_address.c | 2 +- .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../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 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - .../caps_7.1.0.x86_64.xml | 1 - ...h64-virtio-pci-default.aarch64-4.2.0.args} | 17 +- ...h64-virtio-pci-default.aarch64-latest.args | 55 ++++++ ...ev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} | 4 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 35 ++++ ...35-default-devices-only.x86_64-4.2.0.args} | 12 +- ...35-default-devices-only.x86_64-latest.args | 37 +++++ tests/qemuxml2argvdata/q35-multifunction.args | 49 ------ .../q35-multifunction.x86_64-4.2.0.args | 51 ++++++ .../q35-multifunction.x86_64-latest.args | 52 ++++++ ...rgs => q35-pcie-autoadd.x86_64-4.2.0.args} | 36 ++-- .../q35-pcie-autoadd.x86_64-latest.args | 66 ++++++++ ...5-pcie.args => q35-pcie.x86_64-4.2.0.args} | 34 ++-- .../q35-pcie.x86_64-latest.args | 67 ++++++++ ... q35-virt-manager-basic.x86_64-4.2.0.args} | 21 ++- .../q35-virt-manager-basic.x86_64-latest.args | 63 +++++++ tests/qemuxml2argvdata/q35-virtio-pci.args | 64 ------- tests/qemuxml2argvdata/q35-virtio-pci.xml | 1 - tests/qemuxml2argvtest.c | 157 +++--------------- ...h64-virtio-pci-default.aarch64-latest.xml} | 12 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.xml} | 3 + ...35-default-devices-only.x86_64-latest.xml} | 11 +- ...ml => q35-multifunction.x86_64-latest.xml} | 41 ++--- ...xml => q35-pcie-autoadd.x86_64-latest.xml} | 31 ++-- ...35-pcie.xml => q35-pcie.x86_64-latest.xml} | 29 ++-- ... q35-virt-manager-basic.x86_64-latest.xml} | 15 +- tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 154 ----------------- tests/qemuxml2xmltest.c | 142 +--------------- 56 files changed, 610 insertions(+), 714 deletions(-) rename tests/qemuxml2argvdata/{aarch64-virtio-pci-default.args => aarch64-virtio-pci-default.aarch64-4.2.0.args} (71%) create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pcie.args => hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} (88%) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-default-devices-only.args => q35-default-devices-only.x86_64-4.2.0.args} (67%) create mode 100644 tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-multifunction.args create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-pcie-autoadd.args => q35-pcie-autoadd.x86_64-4.2.0.args} (59%) create mode 100644 tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-pcie.args => q35-pcie.x86_64-4.2.0.args} (62%) create mode 100644 tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-virt-manager-basic.args => q35-virt-manager-basic.x86_64-4.2.0.args} (75%) create mode 100644 tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.args delete mode 120000 tests/qemuxml2argvdata/q35-virtio-pci.xml rename tests/qemuxml2xmloutdata/{aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.aarch64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pcie.xml => hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{q35-default-devices-only.xml => q35-default-devices-only.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{q35-multifunction.xml => q35-multifunction.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{q35-pcie-autoadd.xml => q35-pcie-autoadd.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{q35-pcie.xml => q35-pcie.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{q35-virt-manager-basic.xml => q35-virt-manager-basic.x86_64-latest.xml} (93%) delete mode 100644 tests/qemuxml2xmloutdata/q35-virtio-pci.xml -- 2.37.1

2 9

[libvirt PATCH] nodedev: wait a bit longer for new node devices
by Jonathon Jongsma 25 Aug '22

25 Aug '22

Openstack developers reported that newly-created mdevs were not recognized by libvirt until after a libvirt daemon restart. The source of the problem appears to be that when libvirt gets the udev 'add' event, the sysfs tree for that device might not be ready and so libvirt waits 100ms for it to appear (max 100 waits of 1ms each). But in the OpenStack environment, the sysfs tree for new mediated devices was taking closer to 250ms to appear and therefore libvirt gave up waiting and didn't add these new devices to its list of nodedevs. By changing the wait time to 1 second (max 100 waits of 10ms each), this should provide enough time to enable these deployments to recognize newly-created mediated devices, but it shouldn't increase the delay for more traditional deployments too much. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2109450 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Alternatively, we could switch to triggering off of the udev 'bind' event rather than the 'add' event, but I wasn't able to convince myself that this would result in 100% compatible behavior, so this felt like the safest solution. If others can convince me that switching to 'bind' is safe, I can re-submit this patch. src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e76c1a36b8..a06eaade5d 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1058,7 +1058,7 @@ udevProcessMediatedDevice(struct udev_device *dev, linkpath = g_strdup_printf("%s/mdev_type", udev_device_get_syspath(dev)); - if (virFileWaitForExists(linkpath, 1, 100) < 0) { + if (virFileWaitForExists(linkpath, 10, 100) < 0) { virReportSystemError(errno, _("failed to wait for file '%s' to appear"), linkpath); -- 2.37.1

3 7

[PATCH RFC 0/5] storage: Drop the sheepdog storage driver backend
by Peter Krempa 25 Aug '22

25 Aug '22

The sheepdog project is abandoned, with last commit in 2018. QEMU already removed the storage backend in qemu-6.1 This series removes the libvirt storage driver backend. This series is RFC as of: 1/5: I'm not 100% sure whether 'Obsoletes:' is the correct way to deprecate a subpackage in Fedora, but it certainly does the correct thing. 4/5: I personally don't mind that the build option will be kept to prevent breakage of builds, but I can see the value in dropping it and anyone building libvirt having to knowingly acknowledge that they don't need sheepdog any more. (This patch intentionally omits the S-o-b line as the commit message will need to be rewritten if it's going to be pushed) This series does _not_ remove the ability to use qemu-6.0 and older with sheepdog as the qemu driver bits are left untouched. Peter Krempa (5): spec: Drop libvirt-daemon-driver-storage-sheepdog package tests: Remove storage pool/vol tests for sheepdog Remove support for building the sheepdog storage driver backend build: Drop the 'storage_sheepdog' build option completely storage: Remove the sheepdog storage driver backend source code docs/formatstorage.rst | 6 +- docs/kbase/rpm-deployment.rst | 6 +- docs/storage.rst | 3 +- libvirt.spec.in | 38 +- meson.build | 11 - meson_options.txt | 1 - po/POTFILES | 1 - src/storage/meson.build | 25 -- src/storage/storage_backend.c | 6 - src/storage/storage_backend_sheepdog.c | 376 ------------------ src/storage/storage_backend_sheepdog.h | 25 -- src/storage/storage_backend_sheepdog_priv.h | 30 -- tests/meson.build | 6 - tests/storagebackendsheepdogtest.c | 205 ---------- tests/storagepoolxml2argvtest.c | 1 - tests/storagepoolxml2xmlin/pool-sheepdog.xml | 8 - tests/storagepoolxml2xmlout/pool-sheepdog.xml | 11 - tests/storagepoolxml2xmltest.c | 1 - tests/storagevolxml2xmlin/vol-sheepdog.xml | 10 - tests/storagevolxml2xmlout/vol-sheepdog.xml | 8 - tests/storagevolxml2xmltest.c | 1 - tools/virsh.c | 3 - 22 files changed, 12 insertions(+), 770 deletions(-) delete mode 100644 src/storage/storage_backend_sheepdog.c delete mode 100644 src/storage/storage_backend_sheepdog.h delete mode 100644 src/storage/storage_backend_sheepdog_priv.h delete mode 100644 tests/storagebackendsheepdogtest.c delete mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml delete mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml delete mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml delete mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml -- 2.37.1

5 10

[PATCH 0/3] qemuxml2argvtest: Convert 'boot*' cases to DO_TEST_CAPS_LATEST
by Peter Krempa 25 Aug '22

25 Aug '22

As explained in: https://listman.redhat.com/archives/libvir-list/2022-August/233812.html Peter Krempa (3): qemuxml2argvtest: Use different network storage protocol for boot order tests tests: qemuxml2argv: Use x86_64 arch and emulator in all boot* test files tests: qemuxml2argv: Convert all 'boot*' cases to DO_TEST_CAPS_LATEST ...rom.args => boot-cdrom.x86_64-latest.args} | 13 +++++--- tests/qemuxml2argvdata/boot-cdrom.xml | 4 +-- ...x.args => boot-complex.x86_64-latest.args} | 29 +++++++++-------- tests/qemuxml2argvdata/boot-complex.xml | 4 +-- .../boot-dev+order.x86_64-latest.err | 1 + tests/qemuxml2argvdata/boot-dev+order.xml | 6 ++-- ...rgs => boot-floppy-q35.x86_64-latest.args} | 14 +++++--- ...py.args => boot-floppy.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-floppy.xml | 4 +-- ...oot-menu-disable-drive.x86_64-latest.args} | 15 +++++---- .../boot-menu-disable-drive.xml | 4 +-- .../boot-menu-disable-with-timeout.xml | 4 +-- ...s => boot-menu-disable.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-menu-disable.xml | 4 +-- ...ble-with-timeout-invalid.x86_64-latest.err | 1 + .../boot-menu-enable-with-timeout-invalid.xml | 4 +-- ...nu-enable-with-timeout.x86_64-latest.args} | 15 +++++---- .../boot-menu-enable-with-timeout.xml | 4 +-- ...gs => boot-menu-enable.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-menu-enable.xml | 4 +-- ...lti.args => boot-multi.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-multi.xml | 4 +-- ...k.args => boot-network.x86_64-latest.args} | 13 +++++--- tests/qemuxml2argvdata/boot-network.xml | 4 +-- ...der.args => boot-order.x86_64-latest.args} | 25 ++++++++------- tests/qemuxml2argvdata/boot-order.xml | 6 ++-- tests/qemuxml2argvtest.c | 32 ++++++++----------- tests/qemuxml2xmloutdata/boot-cdrom.xml | 4 +-- tests/qemuxml2xmloutdata/boot-floppy.xml | 4 +-- .../boot-menu-disable-with-timeout.xml | 4 +-- .../qemuxml2xmloutdata/boot-menu-disable.xml | 4 +-- .../boot-menu-enable-with-timeout.xml | 4 +-- tests/qemuxml2xmloutdata/boot-multi.xml | 4 +-- tests/qemuxml2xmloutdata/boot-network.xml | 4 +-- tests/qemuxml2xmloutdata/boot-order.xml | 6 ++-- 35 files changed, 171 insertions(+), 137 deletions(-) rename tests/qemuxml2argvdata/{boot-cdrom.args => boot-cdrom.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{boot-complex.args => boot-complex.x86_64-latest.args} (63%) create mode 100644 tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-floppy-q35.args => boot-floppy-q35.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{boot-floppy.args => boot-floppy.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{boot-menu-disable-drive.args => boot-menu-disable-drive.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-menu-disable.args => boot-menu-disable.x86_64-latest.args} (59%) create mode 100644 tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-menu-enable-with-timeout.args => boot-menu-enable-with-timeout.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-menu-enable.args => boot-menu-enable.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-multi.args => boot-multi.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-network.args => boot-network.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{boot-order.args => boot-order.x86_64-latest.args} (55%) -- 2.37.1

2 4

[libvirt PATCH v2 0/2] nwfilter: Fix timeout data type reported by coverity
by Erik Skultety 25 Aug '22

25 Aug '22

Since v1: - instead of time_t, store the timeout as unsigned long long and typecast any affected time_t variables on relevant places here's a successfull CI build: https://gitlab.com/eskultety/libvirt/-/pipelines/620752689 Erik Skultety (2): nwfilter: Replace a redundant 'now' variable with a direct time(0) call nwfilter: Fix timeout data type reported by coverity src/nwfilter/nwfilter_dhcpsnoop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.37.2

2 6

[PATCH] Rename iterface type='dummy' to type='null'
by Martin Kletzander 25 Aug '22

25 Aug '22

When commit bac6b266fb6a added this "functionality" this was the only naming I could think of, but after discussion with Dan we found the name 'null' fits a bit better, so change it before we make a release with the old name. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- NEWS.rst | 2 +- docs/formatdomain.rst | 4 ++-- src/ch/ch_monitor.c | 2 +- src/conf/domain_conf.c | 20 +++++++++---------- src/conf/domain_conf.h | 2 +- src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/schemas/domaincommon.rng | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/xen_common.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 6 +++--- src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 6 +++--- src/qemu/qemu_interface.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_validate.c | 2 +- src/vmx/vmx.c | 4 ++-- .../{ethernet-dummy.vmx => ethernet-null.vmx} | 0 .../{ethernet-dummy.xml => ethernet-null.xml} | 2 +- tests/vmx2xmltest.c | 2 +- ...et-dummy.vmx => xml2vmx-ethernet-null.vmx} | 0 ...et-dummy.xml => xml2vmx-ethernet-null.xml} | 2 +- tests/xml2vmxtest.c | 2 +- tools/virsh-domain.c | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) rename tests/vmx2xmldata/{ethernet-dummy.vmx => ethernet-null.vmx} (100%) rename tests/vmx2xmldata/{ethernet-dummy.xml => ethernet-null.xml} (95%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.vmx => xml2vmx-ethernet-null.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.xml => xml2vmx-ethernet-null.xml} (90%) diff --git a/NEWS.rst b/NEWS.rst index 468b41c1fd9a..2e0a4a7b945b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -26,7 +26,7 @@ v8.7.0 (unreleased) * esx: Domain XMLs can now be dumped for VMs with two new interface types - One is when the interface is not connected anywhere `type='dummy'` and one + One is when the interface is not connected anywhere `type='null'` and one when it is connected to VMWare Distributed Switch `type='vds'`. * **Bug fixes** diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 212104fe1f96..1c4700ac3736 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5240,7 +5240,7 @@ which the UDP socket packets will originate from the QEMU host. :since:`Since </devices> ... -Dummy network interface +Null network interface ^^^^^^^^^^^^^^^^^^^^^^^ An unconnected network interface sounds pretty pointless, but can show up for @@ -5251,7 +5251,7 @@ example with VMWare without any specified network to be connected to. ... <devices> - <interface type='dummy'> + <interface type='null'> <mac address='52:54:00:22:c9:42'/> </interface> </devices> diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 03f051edf67e..8d8654332f39 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -301,7 +301,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 610bbcfd5831..6950f7ec1d8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -573,7 +573,7 @@ VIR_ENUM_IMPL(virDomainNet, "hostdev", "udp", "vdpa", - "dummy", + "null", "vds", ); @@ -2497,7 +2497,7 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -2629,7 +2629,7 @@ virDomainNetDefFree(virDomainNetDef *def) case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9360,7 +9360,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9539,7 +9539,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_VDPA: break; @@ -23746,7 +23746,7 @@ virDomainNetDefFormat(virBuffer *buf, } case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28362,7 +28362,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -28377,7 +28377,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -29375,7 +29375,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -29638,7 +29638,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unexpected network port type %s"), diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a1f6cf7a6fd0..2b1497d78dd8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -939,7 +939,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_HOSTDEV, VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_VDPA, - VIR_DOMAIN_NET_TYPE_DUMMY, + VIR_DOMAIN_NET_TYPE_NULL, VIR_DOMAIN_NET_TYPE_VDS, VIR_DOMAIN_NET_TYPE_LAST diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index b1ebfea6ddd7..f7d27fb5af6c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -295,7 +295,7 @@ bool virNetDevSupportsBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 7f6ea1d8887d..bb6b1058e6f5 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3435,7 +3435,7 @@ <group> <attribute name="type"> - <value>dummy</value> + <value>null</value> </attribute> <ref name="interface-options"/> </group> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6d7a6c58534c..06f338ef904c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1395,7 +1395,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 10ac8013739f..6918a4b12167 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1677,7 +1677,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type '%s'"), virDomainNetTypeToString(net->type)); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9328f242df6a..9be79fa356af 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -422,7 +422,7 @@ static int virLXCControllerGetNICIndexes(virLXCController *ctrl) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8a7135ff4733..f8e701021003 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3465,7 +3465,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); @@ -3522,7 +3522,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -3966,7 +3966,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only bridged veth devices can be detached")); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6b12bff25cb8..fe5cab3df698 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -596,7 +596,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1609,7 +1609,7 @@ virLXCProcessReconnectNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1523ca704794..a31b8ee438e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3961,7 +3961,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8182,7 +8182,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8281,7 +8281,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ @@ -8321,7 +8321,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d5fef76211aa..fe3ce023a440 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9784,7 +9784,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 751fa84013b0..9b508dc8f04f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1230,7 +1230,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -3387,7 +3387,7 @@ qemuDomainChangeNetFilter(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), @@ -3740,7 +3740,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unable to change config on '%s' network type"), diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 3ec92fdd7d36..4cc76e07a50b 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -118,7 +118,7 @@ qemuInterfaceStartDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ @@ -206,7 +206,7 @@ qemuInterfaceStopDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 68c2f45535df..32f03ff79a02 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3261,7 +3261,7 @@ qemuProcessNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8263,7 +8263,7 @@ void qemuProcessStop(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* No special cleanup procedure for these types. */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 703d9776a96f..640326655929 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1760,7 +1760,7 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 191f0b5e83ff..fa5cc5614683 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2880,7 +2880,7 @@ virVMXParseEthernet(virConf *conf, int controller, virDomainNetDef **def) false) < 0) goto cleanup; } else if (connectionType == NULL && networkName == NULL) { - (*def)->type = VIR_DOMAIN_NET_TYPE_DUMMY; + (*def)->type = VIR_DOMAIN_NET_TYPE_NULL; } else if (connectionType == NULL || STRCASEEQ(connectionType, "bridged")) { (*def)->type = VIR_DOMAIN_NET_TYPE_BRIDGE; (*def)->data.bridge.brname = g_steal_pointer(&networkName); @@ -3991,7 +3991,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int controller, controller); break; - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: break; case VIR_DOMAIN_NET_TYPE_VDS: { diff --git a/tests/vmx2xmldata/ethernet-dummy.vmx b/tests/vmx2xmldata/ethernet-null.vmx similarity index 100% rename from tests/vmx2xmldata/ethernet-dummy.vmx rename to tests/vmx2xmldata/ethernet-null.vmx diff --git a/tests/vmx2xmldata/ethernet-dummy.xml b/tests/vmx2xmldata/ethernet-null.xml similarity index 95% rename from tests/vmx2xmldata/ethernet-dummy.xml rename to tests/vmx2xmldata/ethernet-null.xml index a31243033785..9bc1e492e01d 100644 --- a/tests/vmx2xmldata/ethernet-dummy.xml +++ b/tests/vmx2xmldata/ethernet-null.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43' type='generated'/> <model type='e1000e'/> </interface> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 07d7bf24c2b3..a43cab3108b5 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -236,7 +236,7 @@ mymain(void) DO_TEST("ethernet-static"); DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); - DO_TEST("ethernet-dummy"); + DO_TEST("ethernet-null"); DO_TEST("ethernet-vds"); DO_TEST("serial-file"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-null.vmx similarity index 100% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx rename to tests/xml2vmxdata/xml2vmx-ethernet-null.vmx diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml similarity index 90% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml rename to tests/xml2vmxdata/xml2vmx-ethernet-null.xml index a071b2f21513..777c01d09110 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml @@ -6,7 +6,7 @@ <type>hvm</type> </os> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43'/> </interface> </devices> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index c921c8a3b0eb..1cadb9500a7e 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -225,7 +225,7 @@ mymain(void) DO_TEST("ethernet-other", "ethernet-other", 4); DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4); - DO_TEST("ethernet-dummy", "ethernet-dummy", 4); + DO_TEST("ethernet-null", "ethernet-null", 4); DO_TEST("ethernet-vds", "ethernet-vds", 4); DO_TEST("serial-file", "serial-file", 4); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d2ea4d1c7b44..20aadb59f3ef 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1069,7 +1069,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), -- 2.37.2

2 1

[PATCH 0/3] vmx: Fix new ethernet config seen in the wild
by Martin Kletzander 24 Aug '22

24 Aug '22

Descriptions in second and third patch ought to be enough. Martin Kletzander (3): vmx: Fix indentation conf, docs: Add support for dummy network interface vmx: Add support for dummy network interface docs/formatdomain.rst | 24 ++++++++++ src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 10 ++++ src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 7 +++ src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 ++ src/lxc/lxc_process.c | 4 +- src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_interface.c | 2 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 1 + src/vmx/vmx.c | 46 +++++++++++++------ .../vmx2xmldata/ethernet-unmanaged-nodev.vmx | 7 +++ .../vmx2xmldata/ethernet-unmanaged-nodev.xml | 23 ++++++++++ tests/vmx2xmltest.c | 1 + .../xml2vmx-ethernet-unmanaged-nodev.vmx | 13 ++++++ .../xml2vmx-ethernet-unmanaged-nodev.xml | 13 ++++++ tests/xml2vmxtest.c | 2 + tools/virsh-domain.c | 1 + 25 files changed, 157 insertions(+), 16 deletions(-) create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml -- 2.35.1

3 10

[PATCH] qemu: Do not keep swtmp pidfile around after stopping
by Martin Kletzander 24 Aug '22

24 Aug '22

Just like the socket, remove the pidfile when TPM emulator is being stopped. In order to make this a bit cleaner, try to remove it even if swtpm_ioctl does not exist. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_tpm.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 584c787b700b..50e8c19f3a0b 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -795,28 +795,25 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, g_autofree char *pathname = NULL; g_autofree char *errbuf = NULL; g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl(); + g_autofree char *pidfile = qemuTPMEmulatorPidFileBuildPath(swtpmStateDir, + shortName); + if (swtpm_ioctl && + (pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)) && + virFileExists(pathname) && + (cmd = virCommandNew(swtpm_ioctl))) { - if (!swtpm_ioctl) - return; - - if (!(pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName))) - return; - - if (!virFileExists(pathname)) - return; - - cmd = virCommandNew(swtpm_ioctl); - if (!cmd) - return; + virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); - virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); + virCommandSetErrorBuffer(cmd, &errbuf); - virCommandSetErrorBuffer(cmd, &errbuf); + ignore_value(virCommandRun(cmd, NULL)); - ignore_value(virCommandRun(cmd, NULL)); + /* clean up the socket */ + unlink(pathname); + } - /* clean up the socket */ - unlink(pathname); + if (pidfile) + virPidFileDeletePath(pidfile); } -- 2.37.2

2 4

[PATCH v4 0/8] qemu: Enable SCHED_CORE for domains and helper processes
by Michal Privoznik 24 Aug '22

24 Aug '22

v4 of: https://listman.redhat.com/archives/libvir-list/2022-August/233683.html diff to v3: - Fixed wording in qemu.conf, - Removed dead code in qemuProcessSetupVcpuSchedCoreHelper(), - Made the dummy child process (qemuDomainSchedCoreStart()) exit early, instead of jumping onto error label. Michal Prívozník (8): virprocess: Core Scheduling support virCommand: Introduce APIs for core scheduling qemu_conf: Introduce a knob to set SCHED_CORE qemu_domain: Introduce qemuDomainSchedCoreStart() qemu_process: Enable SCHED_CORE for QEMU process qemu: Enable SCHED_CORE for helper processes qemu: Enable SCHED_CORE for vCPUs qemu: Enable for vCPUs on hotplug src/libvirt_private.syms | 6 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 16 ++++ src/qemu/qemu_conf.c | 38 +++++++++ src/qemu/qemu_conf.h | 13 +++ src/qemu/qemu_domain.c | 105 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 116 ++++++++++++++++++++++++++- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_security.c | 11 +++ src/qemu/qemu_virtiofs.c | 11 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 63 +++++++++++++++ src/util/vircommand.h | 5 ++ src/util/virprocess.c | 124 +++++++++++++++++++++++++++++ src/util/virprocess.h | 8 ++ 17 files changed, 531 insertions(+), 4 deletions(-) -- 2.35.1

1 8

[PATCH v3 0/8] qemu: Enable SCHED_CORE for domains and helper processes
by Michal Privoznik 23 Aug '22

23 Aug '22

v3 of: https://listman.redhat.com/archives/libvir-list/2022-June/232595.html diff to v2: - Instead of opting out, the feature is disabled by default. Until we address CPU pinning (and other points I've raised in v2 cover letter) users might face a performance problems if this was turned on automagically. - Introduced new 'vcpus' state, where only vCPUs are placed into a scheduling group, but not emulator nor any of helper processes. - Reworked how helper processes are placed into scheduling group. Instead of placing them into the group after they were spawned, create a dummy child, let it create new group and then use virCommandRunAmong(). This covers also the case where a helper might have spawned more threads/child processes. - As a result of this rework, we no longer need to expose getXXXPid() functions that I introduced in v2 (never merged them though). Big thanks to Dan and Dario for their review and valuable inputs! Michal Prívozník (8): virprocess: Core Scheduling support virCommand: Introduce APIs for core scheduling qemu_conf: Introduce a knob to set SCHED_CORE qemu_domain: Introduce qemuDomainSchedCoreStart() qemu_process: Enable SCHED_CORE for QEMU process qemu: Enable SCHED_CORE for helper processes qemu: Enable SCHED_CORE for vCPUs qemu: Enable for vCPUs on hotplug src/libvirt_private.syms | 6 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 16 ++++ src/qemu/qemu_conf.c | 38 +++++++++ src/qemu/qemu_conf.h | 13 +++ src/qemu/qemu_domain.c | 105 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 118 ++++++++++++++++++++++++++- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_security.c | 11 +++ src/qemu/qemu_virtiofs.c | 11 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 63 +++++++++++++++ src/util/vircommand.h | 5 ++ src/util/virprocess.c | 124 +++++++++++++++++++++++++++++ src/util/virprocess.h | 8 ++ 17 files changed, 533 insertions(+), 4 deletions(-) -- 2.35.1

2 14

[libvirt PATCH 0/2] ci: Switch from macOS 11 to macOS 12
by Andrea Bolognani 23 Aug '22

23 Aug '22

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/620665364 Now that the test suite issues that were blocking the switch have been addressed, we can finally jump on the current macOS release. Andrea Bolognani (2): ci: Refresh generated files ci: Switch from macOS 11 to macOS 12 ci/cirrus/{macos-11.vars => macos-12.vars} | 0 ci/containers/centos-stream-9.Dockerfile | 5 +++++ ci/containers/opensuse-leap-153.Dockerfile | 2 +- ci/containers/ubuntu-2004.Dockerfile | 2 +- ci/gitlab/builds.yml | 6 +++--- ci/manifest.yml | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) rename ci/cirrus/{macos-11.vars => macos-12.vars} (100%) -- 2.37.2

2 3

[libvirt PATCH] docs: fix syntax errors in IPv6 NAT example XML
by Daniel P. Berrangé 23 Aug '22

23 Aug '22

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatnetwork.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatnetwork.rst b/docs/formatnetwork.rst index 044c239985..b5dc29db07 100644 --- a/docs/formatnetwork.rst +++ b/docs/formatnetwork.rst @@ -930,13 +930,13 @@ routing. <nat ipv6='yes'> <port start='1024' end='65535'/> </nat> - + </forward> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254"/> </dhcp> </ip> - <ip family="ipv6" address="fdXX:XXXX:XXXX:NNNN:: prefix="64"/> + <ip family="ipv6" address="fdXX:XXXX:XXXX:NNNN::" prefix="64"/> </network> IPv6 NAT addressing has some caveats over the more straight forward IPv4 case. -- 2.37.2

2 1

[PATCH] virhostcpu: Fix build with clang and newest kernel headers
by Peter Krempa 23 Aug '22

23 Aug '22

The most recent environment e.g. present in our Fedora Rawhide builds fail to build the tree with clang with the following error: ../src/util/virhostcpu.c:1291:25: error: field 'header' with variable sized type 'struct kvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end] struct kvm_msrs header; ^ The problem seems to be that clang doesn't like the new way the 'entries' field in struct kvm_msrs is declared. To work around the issue we can simply allocate the variable dynamically and use the 'entries' member as it was intended to to access the members. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virhostcpu.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 54d0166b85..c1e8dc8078 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1287,25 +1287,22 @@ virHostCPUGetMSRFromKVM(unsigned long index, uint64_t *result) { VIR_AUTOCLOSE fd = -1; - struct { - struct kvm_msrs header; - struct kvm_msr_entry entry; - } msr = { - .header = { .nmsrs = 1 }, - .entry = { .index = index }, - }; + g_autofree struct kvm_msrs *msr = g_malloc0(sizeof(struct kvm_msrs) + + sizeof(struct kvm_msr_entry)); + msr->nmsrs = 1; + msr->entries[0].index = index; if ((fd = open(KVM_DEVICE, O_RDONLY)) < 0) { virReportSystemError(errno, _("Unable to open %s"), KVM_DEVICE); return -1; } - if (ioctl(fd, KVM_GET_MSRS, &msr) < 0) { + if (ioctl(fd, KVM_GET_MSRS, msr) < 0) { VIR_DEBUG("Cannot get MSR 0x%lx from KVM", index); return 1; } - *result = msr.entry.data; + *result = msr->entries[0].data; return 0; } -- 2.37.1

4 5

[PATCH 0/7] qemu: tpm: Add support for migration across shared storage
by Stefan Berger 23 Aug '22

23 Aug '22

This series of patches adds support for migrating vTPMs across hosts whose storage has been set up to share the directory structure holding the state of the TPM (swtpm). The domain XML is extended with a shared_storage attribute that must be set to 'yes' when shared storage is used. It influences the management of the directory structure holding the TPM state, which for example is only to be removed when a domain is undefined (virsh undefine) and not when a VM is removed on the migration source host. Further, when shared storage is used security labeling on the destination side is skipped assuming that the labeling was already done on the source side. I have tested this with an NFS setup where I had to turn SELinux off on the hosts since the SELinux MLS range labeling is not supported. Share storage migration requires the upcoming swtpm v0.8 with the PR for shared storage merged: https://github.com/stefanberger/swtpm/pull/732 Stefan Stefan Berger (7): qemu: tpm: Pass parameter indicating reason for domain removal util: Add parsing support for swtpm's cmdarg-migration capability qemu: tpm: Conditionally create storage on incoming migration qemu: tpm: Pass --migration option to swtpm when using shared storage qemu: tpm: Avoid security labels on incoming migration with shared storage qemu: tpm: Remove TPM state files and directory only when undefining a VM qemu: config: Extend TPM domain XML with shared storage support docs/formatdomain.rst | 16 ++++++++ src/conf/domain_conf.c | 13 +++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++ src/qemu/qemu_domain.c | 12 +++--- src/qemu/qemu_domain.h | 8 +++- src/qemu/qemu_driver.c | 20 +++++----- src/qemu/qemu_extdevice.c | 5 ++- src/qemu/qemu_extdevice.h | 3 +- src/qemu/qemu_migration.c | 13 ++++--- src/qemu/qemu_process.c | 4 +- src/qemu/qemu_snapshot.c | 4 +- src/qemu/qemu_tpm.c | 61 ++++++++++++++++++++++++++----- src/qemu/qemu_tpm.h | 3 +- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 16 files changed, 131 insertions(+), 39 deletions(-) -- 2.37.1

2 16

[PATCH 0/4] docs: Fix generation of hyperlinks and improve backup/checkpoint docs
by Peter Krempa 23 Aug '22

23 Aug '22

Peter Krempa (4): docs: newapi: Consider also 'https://' links in the API generator XSL virDomainCheckpointCreateXML: Don't use HTML in function docs and fix link virDomainCheckpointCreateXML: Add disclaimer about creating checkpoints virDomainBackupGetXMLDesc: Fix and use full link to XML documentation docs/newapi.xsl | 5 +++++ src/libvirt-domain-checkpoint.c | 12 +++++++++++- src/libvirt-domain.c | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) -- 2.37.1

2 6

[PATCH] lib: Don't check for retval for virCommandNew*()
by Michal Privoznik 23 Aug '22

23 Aug '22

The virCommand module is specifically designed so that no caller has to check for retval of individual virCommand*() APIs except for virCommandRun() where the actual error is reported. Moreover, virCommandNew*() use g_new0() to allocate memory and thus it's not really possible for those APIs to return NULL. Which is why they are even marked as ATTRIBUTE_NONNULL. But there are few places where we do check the retval which is a dead code effectively. Drop those checks. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_slirp.c | 3 +-- src/qemu/qemu_tpm.c | 10 ---------- src/qemu/qemu_vhost_user_gpu.c | 2 -- src/qemu/qemu_virtiofs.c | 3 +-- src/util/virtpm.c | 3 +-- tests/virshtest.c | 3 +-- 6 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index c802ef7fa8..3f83db03bf 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -268,8 +268,7 @@ qemuSlirpStart(virDomainObj *vm, if (!(pidfile = qemuSlirpCreatePidFilename(cfg, vm->def, net->info.alias))) return -1; - if (!(cmd = virCommandNew(cfg->slirpHelperName))) - return -1; + cmd = virCommandNew(cfg->slirpHelperName); virCommandClearCaps(cmd); virCommandSetPidFile(cmd, pidfile); diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 584c787b70..d0aed7fa2e 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -279,8 +279,6 @@ qemuTPMCreateConfigFiles(const char *swtpm_setup) return 0; cmd = virCommandNew(swtpm_setup); - if (!cmd) - return -1; virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); virCommandClearCaps(cmd); @@ -388,8 +386,6 @@ qemuTPMEmulatorRunSetup(const char *storagepath, return -1; cmd = virCommandNew(swtpm_setup); - if (!cmd) - return -1; virUUIDFormat(vmuuid, uuid); vmid = g_strdup_printf("%s:%s", vmname, uuid); @@ -500,8 +496,6 @@ qemuTPMEmulatorReconfigure(const char *storagepath, return 0; cmd = virCommandNew(swtpm_setup); - if (!cmd) - return -1; virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); @@ -592,8 +586,6 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, unlink(tpm->data.emulator.source->data.nix.path); cmd = virCommandNew(swtpm); - if (!cmd) - goto error; virCommandClearCaps(cmd); @@ -806,8 +798,6 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, return; cmd = virCommandNew(swtpm_ioctl); - if (!cmd) - return; virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 7c5be4098e..bc5a1dc3ec 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -133,8 +133,6 @@ int qemuExtVhostUserGPUStart(virQEMUDriver *driver, goto error; cmd = virCommandNew(video->driver->vhost_user_binary); - if (!cmd) - goto error; virCommandClearCaps(cmd); virCommandSetPidFile(cmd, pidfile); diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index ce55286ab5..a04aa08e39 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -132,8 +132,7 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg, g_autoptr(virCommand) cmd = NULL; g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; - if (!(cmd = virCommandNew(fs->binary))) - return NULL; + cmd = virCommandNew(fs->binary); virCommandAddArgFormat(cmd, "--fd=%d", *fd); virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 2f2b061fee..91db0f31eb 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -252,8 +252,7 @@ virTPMGetCaps(virTPMBinaryCapsParse capsParse, { g_autoptr(virCommand) cmd = NULL; - if (!(cmd = virCommandNew(exec))) - return NULL; + cmd = virCommandNew(exec); if (param1) virCommandAddArg(cmd, param1); diff --git a/tests/virshtest.c b/tests/virshtest.c index a53a6273b9..3d297a1db2 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -116,8 +116,7 @@ testCompareOutputLit(const char *expectData, g_autoptr(virCommand) cmd = NULL; g_autofree char *errbuf = NULL; - if (!(cmd = virCommandNewArgs(argv))) - return -1; + cmd = virCommandNewArgs(argv); virCommandAddEnvString(cmd, "LANG=C"); virCommandSetInputBuffer(cmd, empty); -- 2.35.1

2 1

[PATCH v14 00/15] Support query and use SGX
by Michal Privoznik 23 Aug '22

23 Aug '22

As agreed here, I've taken posted patches, did some changes and fixes and posted them: https://listman.redhat.com/archives/libvir-list/2022-July/233164.html The v13 version can be found here: https://listman.redhat.com/archives/libvir-list/2022-July/232679.html diff to v13: - I've worked my comments in (couple of memleaks, naming issues, ...) - Fixed problem with CGroups and namespaces - Fixed a problem with <memoryBacking> <source type='memfd'/>, which prevented domain from starting. Simply because wrong memory-backend was picked for SGX (-memfd was picked instead of -sgx). - Some cleanups, formatted before original patches (more tests, validation, code separation, ...) You can find these patches on my gitlab (among with green pipeline): https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx_rework Haibin Huang (4): domain_capabilities: Define SGX capabilities structs qemu: Get SGX capabilities form QMP Convert QMP capabilities to domain capabilities conf: expose SGX feature in domain capabilities Lin Yang (2): conf: Introduce SGX EPC element into device memory xml qemu: Add command-line to generate SGX EPC memory backend Michal Prívozník (9): qemuxml2argvtest: Switch memory-hotplug-dimm-addr to latest caps qemuxml2xmltest: Test memory-hotplug-dimm-addr conf: Validate virDomainMemoryDef::targetNode qemu_command: Separate domain features building into a helper qemu_command: Separate domain memory building into a helper qemu_cgroup: Don't ignore ENOENT in qemuCgroupAllowDevicesPaths() qemu_cgroup: Allow SGX in devices controller qemu_namespace: Create SGX related nodes in domain's namespace security_dac: Set DAC label on SGX /dev nodes docs/formatdomain.rst | 25 +- docs/formatdomaincaps.rst | 40 +++ src/conf/domain_capabilities.c | 46 +++ src/conf/domain_capabilities.h | 22 ++ src/conf/domain_conf.c | 30 ++ src/conf/domain_conf.h | 1 + src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 22 ++ src/conf/schemas/domaincaps.rng | 40 +++ src/conf/schemas/domaincommon.rng | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 6 +- src/qemu/qemu_capabilities.c | 222 +++++++++++++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_cgroup.c | 82 ++++- src/qemu/qemu_command.c | 293 +++++++++++------- src/qemu/qemu_domain.c | 48 ++- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_domain_address.c | 6 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor.c | 10 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 148 ++++++++- src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_namespace.c | 20 +- src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 8 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 44 ++- src/security/security_selinux.c | 2 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 6 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 6 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 6 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 10 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 10 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 10 + .../caps_6.2.0.x86_64.replies | 24 +- .../caps_6.2.0.x86_64.xml | 7 + .../caps_7.0.0.x86_64.replies | 34 +- .../caps_7.0.0.x86_64.xml | 11 + .../caps_7.1.0.x86_64.replies | 34 +- .../caps_7.1.0.x86_64.xml | 11 + .../aarch64-aavmf-virtio-mmio.args | 2 +- .../aarch64-cpu-passthrough.args | 2 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- .../aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 2 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-traditional-pci.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- .../aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 2 +- .../aarch64-virt-2.6-virtio-pci-default.args | 2 +- .../aarch64-virt-default-nic.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +- .../aarch64-virtio-pci-default.args | 2 +- .../aarch64-virtio-pci-manual-addresses.args | 2 +- .../balloon-mmio-deflate.args | 2 +- .../clock-timer-armvtimer.aarch64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 2 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...firmware-auto-efi-nvram.x86_64-latest.args | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...manual-bios-rw-implicit.x86_64-latest.args | 2 +- ...firmware-manual-bios-rw.x86_64-latest.args | 2 +- .../firmware-manual-efi-acpi-aarch64.args | 2 +- .../firmware-manual-efi-noacpi-aarch64.args | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- .../firmware-manual-noefi-noacpi-aarch64.args | 2 +- .../hvf-aarch64-virt-headless.args | 2 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...nch-security-sev-direct.x86_64-latest.args | 2 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 2 +- .../launch-security-sev.x86_64-6.0.0.args | 2 +- .../mach-virt-console-virtio.args | 2 +- .../mach-virt-serial-native.args | 2 +- .../mach-virt-serial-pci.args | 2 +- .../mach-virt-serial-usb.args | 2 +- .../machine-aeskeywrap-off-cap.args | 2 +- .../machine-aeskeywrap-off-caps.args | 2 +- .../machine-aeskeywrap-on-cap.args | 2 +- .../machine-aeskeywrap-on-caps.args | 2 +- .../machine-deakeywrap-off-cap.args | 2 +- .../machine-deakeywrap-off-caps.args | 2 +- .../machine-deakeywrap-on-cap.args | 2 +- .../machine-deakeywrap-on-caps.args | 2 +- ...emory-hotplug-dimm-addr.x86_64-latest.args | 42 +++ .../memory-hotplug-dimm-addr.xml | 2 +- .../memory-hotplug-invalid-targetnode.err | 1 + .../memory-hotplug-invalid-targetnode.xml | 42 +++ ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...eries-cpu-compat-power10.ppc64-latest.args | 2 +- ...series-cpu-compat-power9.ppc64-latest.args | 2 +- tests/qemuxml2argvdata/pseries-features.args | 2 +- .../sgx-epc-numa.x86_64-latest.args | 40 +++ tests/qemuxml2argvdata/sgx-epc-numa.xml | 64 ++++ ...mm-addr.args => sgx-epc.x86_64-6.2.0.args} | 29 +- tests/qemuxml2argvdata/sgx-epc.xml | 52 ++++ .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- tests/qemuxml2argvtest.c | 7 +- ...memory-hotplug-dimm-addr.x86_64-latest.xml | 63 ++++ .../sgx-epc-numa.x86_64-latest.xml | 1 + .../sgx-epc.x86_64-6.2.0.xml | 1 + tests/qemuxml2xmltest.c | 4 + 189 files changed, 1621 insertions(+), 266 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml rename tests/qemuxml2argvdata/{memory-hotplug-dimm-addr.args => sgx-epc.x86_64-6.2.0.args} (39%) create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml -- 2.35.1

6 41

Plans for the next release
by Jiri Denemark 23 Aug '22

23 Aug '22

We are getting close to the next release of libvirt. To aim for the release on Sep 01 I suggest entering the freeze on Friday Aug 26 and tagging RC2 on Tuesday Aug 30. I hope this works for everyone. Jirka

1 0

[libvirt PATCH] nwfilter: Fix timeout data type reported by coverity
by Erik Skultety 23 Aug '22

23 Aug '22

Coverity reports: virNWFilterSnoopIPLeaseUpdate(virNWFilterSnoopIPLease *ipl, time_t timeout) { if (timeout < ipl->timeout) return; /* no take-backs */ virNWFilterSnoopIPLeaseTimerDel(ipl); >>> CID 396747: High impact quality (Y2K38_SAFETY) >>> A "time_t" value is stored in an integer with too few bits to accommodate it. The expression "timeout" is cast to "unsigned int". ipl->timeout = timeout; virNWFilterSnoopIPLeaseTimerAdd(ipl); } This is a safe fix, since time_t is just long int and scales automatically with platform (more specifically it's 64bit on all platforms we care about). Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index a10a14cfc1..4133d4c672 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -146,7 +146,7 @@ struct _virNWFilterSnoopIPLease { virSocketAddr ipAddress; virSocketAddr ipServer; virNWFilterSnoopReq * snoopReq; - unsigned int timeout; + time_t timeout; /* timer list */ virNWFilterSnoopIPLease *prev; virNWFilterSnoopIPLease *next; @@ -1580,7 +1580,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, return -1; /* time intf ip dhcpserver */ - lbuf = g_strdup_printf("%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); + lbuf = g_strdup_printf("%lu %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); len = strlen(lbuf); if (safewrite(lfd, lbuf, len) != len) { @@ -1739,7 +1739,7 @@ virNWFilterSnoopLeaseFileLoad(void) } ln++; /* key len 54 = "VMUUID"+'-'+"MAC" */ - if (sscanf(line, "%u %54s %15s %15s", &ipl.timeout, + if (sscanf(line, "%lu %54s %15s %15s", &ipl.timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " -- 2.37.2

3 2