- Devel - libvirt List Archives

[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