April 2024 - Devel - libvirt List Archives

[PATCH RFC v2 00/12] Support throttle block filters
by wucf＠linux.ibm.com 12 Jun '24

12 Jun '24

From: Chun Feng Wu <wucf(a)linux.ibm.com> Hi, I am thinking to leverage "throttle block filter" in QEMU to support more flexible I/O limits(e.g. tiered I/O groups), one sample provided by QEMU doc is: https://github.com/qemu/qemu/blob/master/docs/throttle.txt "For example, let's say that we have three different drives and we want to set I/O limits for each one of them and an additional set of limits for the combined I/O of all three drives." The implementation idea is to - Define throttle groups(limit) in domain - Define throttle filter to reference throttle group within disk - Within domain disk, throttle filters references multiple throttle groups to form filter chain to apply multiple limits in QEMU like above sample - Add new virsh cmds for throttle group management: throttlegroupset Add or update a throttling group. throttlegroupdel Delete a throttling group. throttlegroupinfo Get a throttling group. throttlegrouplist list all domain throttlegroups - Update "attach-disk" to add one more option "--throttle-groups" to apply throttle filters e.g. "virsh attach-disk $VM_ID ${DISK_PATH}/vm1_disk_2.qcow2 vdd --driver qemu --subdriver qcow2 --targetbus virtio --throttle-groups limit2,limit012" - I chose above semantics as I felt they're appropriate, if there are better ones please kindly suggest. This patchset includes: - Throttle group and throttle filter definition in patch 1 - New QMP processing to update and get throttle group in patch 2 - New API definition and implementation in patch 3 - QEMU driver implementation in patch 4 - Hotplug and qemuProcessLaunch flow implemenation in patch 5,6 - Domain XML schema and doc(formatdomain.rst) change in patch 7 - Tests in patch 8,9 - Virsh cmd implementation in patch 10 - Other verification implementation in patch 11, 12 v2 changes: - fix failure caused by "check-remote_protocol" between patch 3 and patch 9 in v1 - make sure coding style is consistent about function declaration - patch 3 in v1 is splitted into two commits: "remote: New APIs for ThrottleGroup lifecycle management" and "qemu: Implement qemu driver for throttle API" - replace "// comment" with "/* comment */" - avoid empty 'cleanup' labels - use "virJSONValueObjectAdd(&limits, "P:name", value)" to avoid introducing extra helper, and check return value - preserve spacing between blocks of code which are not related - remove "VSH_OT_ALIAS" section for new cmds in virsh_domain.c From QMP perspective, the sample flow works this way: - Throttle group creation: virsh qemu-monitor-command 1 '{"execute":"object-add", "arguments":{"qom-type":"throttle-group","id":"limit0","limits":{"iops-total":200,"iops-read":0,"iops-total-max":200,"iops-total-max-length":1}}}' virsh qemu-monitor-command 1 '{"execute":"object-add", "arguments":{"qom-type":"throttle-group","id":"limit1","limits":{"iops-total":250,"iops-read":0,"iops-total-max":250,"iops-total-max-length":1}}}' virsh qemu-monitor-command 1 '{"execute":"object-add", "arguments":{"qom-type":"throttle-group","id":"limit2","limits":{"iops-total":300,"iops-read":0,"iops-total-max":300,"iops-total-max-length":1}}}' virsh qemu-monitor-command 1 '{"execute":"object-add", "arguments":{"qom-type":"throttle-group","id":"limit012","limits":{"iops-total":400,"iops-read":0,"iops-total-max":400,"iops-total-max-length":1}}}' - Chain up filters during attaching disk to apply two filters(limit0 and limit012): virsh qemu-monitor-command 1 '{"execute":"blockdev-add", "arguments": {"driver":"file","filename":"/virt/disks/vm1_disk_1.qcow2","node-name":"test-3-storage","auto-read-only":true,"discard":"unmap"}}' virsh qemu-monitor-command 1 '{"execute":"blockdev-add", "arguments":{"node-name":"test-3-format","read-only":false,"driver":"qcow2","file":"test-3-storage","backing":null}}' virsh qemu-monitor-command 1 '{"execute":"blockdev-add", "arguments":{"driver":"throttle","node-name":"libvirt-5-filter","throttle-group": "limit0","file":"test-3-format"}}' virsh qemu-monitor-command 1 '{"execute":"blockdev-add", "arguments": {"driver":"throttle","node-name":"libvirt-6-filter","throttle-group":"limit012","file":"libvirt-5-filter"}}' virsh qemu-monitor-command 1 '{"execute": "device_add", "arguments": {"driver":"virtio-blk-pci","scsi":false,"bus":"pci.0","addr":"0x5","drive":"libvirt-6-filter","id":"virtio-disk1"}}' Any comments/suggestions will be appriciated! Chun Feng Wu (10): config: Introduce ThrottleGroup and ThrottleFilter qemu: monitor: Add support for ThrottleGroup operations remote: New APIs for ThrottleGroup lifecycle management qemu: Implement qemu driver for throttle API qemu: hotplug: Support hot attach block disk along with throttle filters qemu: command: Support throttle groups and filters during qemuProcessLaunch schema: Add new domain elements to support multiple throttle filters test: Test throttle group lifecycle APIs tests: Test qemuMonitorJSONGetThrottleGroup and qemuMonitorJSONUpdateThrottleGroup virsh: Add support for throttle group operations Hao Ning Xin (1): config: validate: Verify throttle group fields Yan Xiu Wu (1): config: validate: Use "iotune" and "throttlefilters" exclusively for specific disk docs/formatdomain.rst | 48 ++ include/libvirt/libvirt-domain.h | 29 + src/conf/domain_conf.c | 386 +++++++++++++ src/conf/domain_conf.h | 54 ++ src/conf/domain_validate.c | 120 ++-- src/conf/schemas/domaincommon.rng | 164 +++++- src/conf/virconftypes.h | 4 + src/driver-hypervisor.h | 22 + src/libvirt-domain.c | 190 +++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 7 + src/qemu/qemu_block.c | 131 +++++ src/qemu/qemu_block.h | 53 ++ src/qemu/qemu_command.c | 158 ++++++ src/qemu/qemu_command.h | 9 + src/qemu/qemu_domain.c | 85 +++ src/qemu/qemu_domain.h | 15 + src/qemu/qemu_driver.c | 529 ++++++++++++++++++ src/qemu/qemu_hotplug.c | 24 + src/qemu/qemu_monitor.c | 34 ++ src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 151 +++++ src/qemu/qemu_monitor_json.h | 14 + src/remote/remote_daemon_dispatch.c | 61 ++ src/remote/remote_driver.c | 49 ++ src/remote/remote_protocol.x | 50 +- src/remote_protocol-structs | 30 + src/test/test_driver.c | 382 +++++++++++++ tests/qemumonitorjsontest.c | 88 +++ .../qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-bitmaps-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tools/virsh-completer-domain.c | 64 +++ tools/virsh-completer-domain.h | 10 + tools/virsh-domain.c | 471 ++++++++++++++++ 43 files changed, 3430 insertions(+), 36 deletions(-) -- 2.34.1

3 39

[PATCH-for-9.1 v2 0/3] rdma: Remove RDMA subsystem and pvrdma device
by Philippe Mathieu-Daudé 07 Jun '24

07 Jun '24

Since v1: - split in 3 (Thomas) - justify gluster removal Philippe Mathieu-Daudé (3): hw/rdma: Remove pvrdma device and rdmacm-mux helper migration: Remove RDMA protocol handling block/gluster: Remove RDMA protocol handling MAINTAINERS | 17 - docs/about/deprecated.rst | 9 - docs/about/removed-features.rst | 4 + docs/devel/migration/main.rst | 6 - docs/pvrdma.txt | 345 -- docs/rdma.txt | 420 -- docs/system/device-url-syntax.rst.inc | 4 +- docs/system/loongarch/virt.rst | 2 +- docs/system/qemu-block-drivers.rst.inc | 1 - meson.build | 59 - qapi/machine.json | 17 - qapi/migration.json | 31 +- qapi/qapi-schema.json | 1 - qapi/rdma.json | 38 - contrib/rdmacm-mux/rdmacm-mux.h | 61 - hw/rdma/rdma_backend.h | 129 - hw/rdma/rdma_backend_defs.h | 76 - hw/rdma/rdma_rm.h | 97 - hw/rdma/rdma_rm_defs.h | 146 - hw/rdma/rdma_utils.h | 63 - hw/rdma/trace.h | 1 - hw/rdma/vmw/pvrdma.h | 144 - hw/rdma/vmw/pvrdma_dev_ring.h | 46 - hw/rdma/vmw/pvrdma_qp_ops.h | 28 - hw/rdma/vmw/trace.h | 1 - include/hw/rdma/rdma.h | 37 - include/monitor/hmp.h | 1 - .../infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 685 --- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 348 -- .../standard-headers/rdma/vmw_pvrdma-abi.h | 310 -- migration/migration-stats.h | 6 +- migration/migration.h | 9 - migration/options.h | 2 - migration/rdma.h | 69 - block/gluster.c | 39 - contrib/rdmacm-mux/main.c | 831 ---- hw/core/machine-qmp-cmds.c | 32 - hw/rdma/rdma.c | 30 - hw/rdma/rdma_backend.c | 1401 ------ hw/rdma/rdma_rm.c | 812 ---- hw/rdma/rdma_utils.c | 126 - hw/rdma/vmw/pvrdma_cmd.c | 815 ---- hw/rdma/vmw/pvrdma_dev_ring.c | 141 - hw/rdma/vmw/pvrdma_main.c | 735 --- hw/rdma/vmw/pvrdma_qp_ops.c | 298 -- migration/migration-stats.c | 5 +- migration/migration.c | 31 - migration/options.c | 16 - migration/qemu-file.c | 1 - migration/ram.c | 86 +- migration/rdma.c | 4184 ----------------- migration/savevm.c | 2 +- monitor/qmp-cmds.c | 1 - Kconfig.host | 3 - contrib/rdmacm-mux/meson.build | 7 - hmp-commands-info.hx | 13 - hw/Kconfig | 1 - hw/meson.build | 1 - hw/rdma/Kconfig | 3 - hw/rdma/meson.build | 12 - hw/rdma/trace-events | 31 - hw/rdma/vmw/trace-events | 17 - meson_options.txt | 4 - migration/meson.build | 1 - migration/trace-events | 68 +- qapi/meson.build | 1 - qemu-options.hx | 6 - .../org.centos/stream/8/build-environment.yml | 1 - .../ci/org.centos/stream/8/x86_64/configure | 3 - scripts/ci/setup/build-environment.yml | 4 - scripts/coverity-scan/run-coverity-scan | 2 +- scripts/meson-buildoptions.sh | 6 - scripts/update-linux-headers.sh | 27 - tests/lcitool/projects/qemu.yml | 3 - tests/migration/guestperf/engine.py | 4 +- 75 files changed, 20 insertions(+), 12997 deletions(-) delete mode 100644 docs/pvrdma.txt delete mode 100644 docs/rdma.txt delete mode 100644 qapi/rdma.json delete mode 100644 contrib/rdmacm-mux/rdmacm-mux.h delete mode 100644 hw/rdma/rdma_backend.h delete mode 100644 hw/rdma/rdma_backend_defs.h delete mode 100644 hw/rdma/rdma_rm.h delete mode 100644 hw/rdma/rdma_rm_defs.h delete mode 100644 hw/rdma/rdma_utils.h delete mode 100644 hw/rdma/trace.h delete mode 100644 hw/rdma/vmw/pvrdma.h delete mode 100644 hw/rdma/vmw/pvrdma_dev_ring.h delete mode 100644 hw/rdma/vmw/pvrdma_qp_ops.h delete mode 100644 hw/rdma/vmw/trace.h delete mode 100644 include/hw/rdma/rdma.h delete mode 100644 include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h delete mode 100644 include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h delete mode 100644 include/standard-headers/rdma/vmw_pvrdma-abi.h delete mode 100644 migration/rdma.h delete mode 100644 contrib/rdmacm-mux/main.c delete mode 100644 hw/rdma/rdma.c delete mode 100644 hw/rdma/rdma_backend.c delete mode 100644 hw/rdma/rdma_rm.c delete mode 100644 hw/rdma/rdma_utils.c delete mode 100644 hw/rdma/vmw/pvrdma_cmd.c delete mode 100644 hw/rdma/vmw/pvrdma_dev_ring.c delete mode 100644 hw/rdma/vmw/pvrdma_main.c delete mode 100644 hw/rdma/vmw/pvrdma_qp_ops.c delete mode 100644 migration/rdma.c delete mode 100644 contrib/rdmacm-mux/meson.build delete mode 100644 hw/rdma/Kconfig delete mode 100644 hw/rdma/meson.build delete mode 100644 hw/rdma/trace-events delete mode 100644 hw/rdma/vmw/trace-events -- 2.41.0

17 80

[PATCH] Сheck snapshot disk is not NULL when searching it in the VM config
by Fima Shevrin 20 May '24

20 May '24

When creating a snapshot of a VM with multiple hard disks, the snapshot takes into account the presence of all disks in the system. If, over time, one of the disks is deleted, the snapshot will continue to store knowledge of the deleted disk. This results in the fact that at the moment of deleting the snapshot, at the validation stage, a disk from the snapshot will be searched which is not in the VM configuration. As a result, vmdisk variable will be equal to NULL. Dereferencing a null pointer at the time of calling virStorageSourceIsSameLocation(vmdisk->src, disk->src) will result in SIGSEGV. Signed-off-by: Fima Shevrin <efim.shevrin(a)virtuozzo.com> --- src/qemu/qemu_snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 09ec959f10..bf93cd485e 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3806,7 +3806,7 @@ qemuSnapshotDeleteValidate(virDomainObj *vm, vmdisk = qemuDomainDiskByName(vm->def, snapDisk->name); disk = qemuDomainDiskByName(snapdef->parent.dom, snapDisk->name); - if (!virStorageSourceIsSameLocation(vmdisk->src, disk->src)) { + if (vmdisk != NULL && !virStorageSourceIsSameLocation(vmdisk->src, disk->src)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("disk image '%1$s' for internal snapshot '%2$s' is not the same as disk image currently used by VM"), snapDisk->name, snap->def->name); -- 2.34.1

4 3

[PATCH] network: add modify-or-add feature to net-update
by Abhiram Tilak 15 May '24

15 May '24

The current way of updating a network configuration uses `virsh net-update` to add, delete or modify entries. But with such a mechansim one should know if an entry with current info already exists. Adding modify-or-add option automatically performs either modify or add depending on the current state. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/363 Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> --- docs/manpages/virsh.rst | 5 +- include/libvirt/libvirt-network.h | 2 + src/conf/network_conf.c | 148 ++++++++++++++++++++++++------ tools/virsh-network.c | 4 +- 4 files changed, 126 insertions(+), 33 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 115b802c45..dc91ba895c 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5908,7 +5908,10 @@ changes optionally taking effect immediately, without needing to destroy and re-start the network. *command* is one of "add-first", "add-last", "add" (a synonym for -add-last), "delete", or "modify". +add-last), "delete", "modify", "modify-or-add" (modify + add-last), +"modify-or-add-first". The 'modify-or-add' commands perform modify or +add operation depending on the given state, and can be useful for +scripting. *section* is one of "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", "forward-pf", diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index 58591be7ac..a6e132f407 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -181,6 +181,8 @@ typedef enum { VIR_NETWORK_UPDATE_COMMAND_DELETE = 2, /* delete an existing element (Since: 0.10.2) */ VIR_NETWORK_UPDATE_COMMAND_ADD_LAST = 3, /* add an element at end of list (Since: 0.10.2) */ VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST = 4, /* add an element at start of list (Since: 0.10.2) */ + VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST = 5, /* if exists modify or add an element at end of list (Since: 0.10.2) */ + VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST = 6, /* if exists modify or add an element at start of list (Since: 0.10.2) */ # ifdef VIR_ENUM_SENTINELS VIR_NETWORK_UPDATE_COMMAND_LAST /* (Since: 0.10.2) */ # endif diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index cc92ed0b03..2835395385 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2721,6 +2721,9 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, virNetworkDHCPHostDef host = { 0 }; bool partialOkay = (command == VIR_NETWORK_UPDATE_COMMAND_DELETE); + /* added for modify-or-add feature */ + bool modified = false; + if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "host") < 0) goto cleanup; @@ -2826,7 +2829,34 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, virNetworkDHCPHostDefClear(&ipdef->hosts[i]); VIR_DELETE_ELEMENT(ipdef->hosts, i, ipdef->nhosts); - } else { + } else if ((command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST)) { + + /* find entries with matching name/address/ip */ + for (i = 0; i < ipdef->nhosts; i++) { + if ((host.mac && ipdef->hosts[i].mac && + !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || + (host.name && + STREQ_NULLABLE(host.name, ipdef->hosts[i].name)) || + (VIR_SOCKET_ADDR_VALID(&host.ip) && + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip))) { + + modified = true; + break; + } + } + + /* if element is found then modify, or else add to beginning/end of list */ + if (modified) { + virNetworkDHCPHostDefClear(&ipdef->hosts[i]); + ipdef->hosts[i] = host; + memset(&host, 0, sizeof(host)); + } else if (VIR_INSERT_ELEMENT(ipdef->hosts, + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST + ? 0 : ipdef->nhosts, + ipdef->nhosts, host) < 0) + goto cleanup; + } else { virNetworkDefUpdateUnknownCommand(command); goto cleanup; } @@ -2885,7 +2915,9 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDef *def, } if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || - (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST)) { if (virNetworkDefUpdateCheckMultiDHCP(def, ipdef) < 0) return -1; @@ -2894,17 +2926,24 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDef *def, g_autofree char *startip = virSocketAddrFormat(&range.addr.start); g_autofree char *endip = virSocketAddrFormat(&range.addr.end); - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing dhcp range entry in network '%1$s' that matches \"<range start='%2$s' end='%3$s'/>\""), - def->name, - startip ? startip : "unknown", - endip ? endip : "unknown"); + + if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is an existing dhcp range entry in network '%1$s' that matches \"<range start='%2$s' end='%3$s'/>\""), + def->name, + startip ? startip : "unknown", + endip ? endip : "unknown"); + else + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("dhcp ranges cannot be modified, only added or deleted")); return -1; } /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(ipdef->ranges, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : ipdef->nranges, ipdef->nranges, range) < 0) return -1; @@ -2981,18 +3020,26 @@ virNetworkDefUpdateForwardInterface(virNetworkDef *def, } if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || - (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST)) { if (i < def->forward.nifs) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing interface entry in network '%1$s' that matches \"<interface dev='%2$s'>\""), - def->name, iface.device.dev); + if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) || + command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is an existing interface entry in network '%1$s' that matches \"<interface dev='%2$s'>\""), + def->name, iface.device.dev); + else + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("forward interface entries cannot be modified, only added or deleted")); goto cleanup; } /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(def->forward.ifs, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : def->forward.nifs, def->forward.nifs, iface) < 0) goto cleanup; @@ -3056,6 +3103,9 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, int ret = -1; virPortGroupDef portgroup = { 0 }; + /* added for modify-or-add feature */ + bool modified = false; + if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "portgroup") < 0) goto cleanup; @@ -3097,6 +3147,17 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, goto cleanup; } + /* modify found entries for modify-or-add command */ + if (foundName >= 0 && (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST)) { + + /* replace existing entry */ + virPortGroupDefClear(&def->portGroups[foundName]); + def->portGroups[foundName] = portgroup; + memset(&portgroup, 0, sizeof(portgroup)); + modified = true; + } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { /* replace existing entry */ @@ -3105,11 +3166,14 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, memset(&portgroup, 0, sizeof(portgroup)); } else if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || - (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) || + (!modified && command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST) || + (!modified && command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST)) { /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(def->portGroups, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : def->nPortGroups, def->nPortGroups, portgroup) < 0) goto cleanup; @@ -3144,7 +3208,9 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def, virNetworkDNSDef *dns = &def->dns; virNetworkDNSHostDef host = { 0 }; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || - command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); + command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST); int foundCt = 0; if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { @@ -3185,15 +3251,21 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def, if (isAdd) { if (foundCt > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already at least one DNS HOST record with a matching field in network %1$s"), - def->name); + if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || + command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is already at least one DNS HOST record with a matching field in network %1$s"), + def->name); + else + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS HOST records cannot be modified, only added or deleted")); goto cleanup; } /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(dns->hosts, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : dns->nhosts, dns->nhosts, host) < 0) goto cleanup; } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { @@ -3240,7 +3312,9 @@ virNetworkDefUpdateDNSSrv(virNetworkDef *def, virNetworkDNSDef *dns = &def->dns; virNetworkDNSSrvDef srv = { 0 }; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || - command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); + command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST); int foundCt = 0; if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { @@ -3268,15 +3342,21 @@ virNetworkDefUpdateDNSSrv(virNetworkDef *def, if (isAdd) { if (foundCt > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already at least one DNS SRV record matching all specified fields in network %1$s"), - def->name); + if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is already at least one DNS SRV record matching all specified fields in network %1$s"), + def->name); + else + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS SRV records cannot be modified, only added or deleted")); goto cleanup; } /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(dns->srvs, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : dns->nsrvs, dns->nsrvs, srv) < 0) goto cleanup; } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { @@ -3322,7 +3402,9 @@ virNetworkDefUpdateDNSTxt(virNetworkDef *def, virNetworkDNSDef *dns = &def->dns; virNetworkDNSTxtDef txt = { 0 }; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || - command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); + command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_LAST); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", @@ -3344,15 +3426,21 @@ virNetworkDefUpdateDNSTxt(virNetworkDef *def, if (isAdd) { if (foundIdx < dns->ntxts) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already a DNS TXT record with name '%1$s' in network %2$s"), - txt.name, def->name); + if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST) || + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST)) + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is already a DNS TXT record with name '%1$s' in network %2$s"), + txt.name, def->name); + else + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS TXT records cannot be modified, only added or deleted")); goto cleanup; } /* add to beginning/end of list */ if (VIR_INSERT_ELEMENT(dns->txts, - command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST + (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_OR_ADD_FIRST) ? 0 : dns->ntxts, dns->ntxts, txt) < 0) goto cleanup; } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 597e3d4530..c30305ac50 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1231,7 +1231,7 @@ static const vshCmdOptDef opts_network_update[] = { .positional = true, .required = true, .completer = virshNetworkUpdateCommandCompleter, - .help = N_("type of update (add-first, add-last (add), delete, or modify)") + .help = N_("type of update (add-first, add-last (add), delete, modify, modify-or-add, or modify-or-add-first)") }, {.name = "section", .type = VSH_OT_STRING, @@ -1260,7 +1260,7 @@ static const vshCmdOptDef opts_network_update[] = { VIR_ENUM_IMPL(virshNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST, - "none", "modify", "delete", "add-last", "add-first"); + "none", "modify", "delete", "add-last", "add-first", "modify-or-add", "modify-or-add-first"); VIR_ENUM_IMPL(virshNetworkSection, VIR_NETWORK_SECTION_LAST, -- 2.44.0

3 3

[PATCH 00/35] vsh: Fix handling of commands and help - part 3 (virsh testing overhaul)
by Peter Krempa 07 May '24

07 May '24

Part 3 was supposed to be the refactor of the command parser but since I wanted to add few tests I've noticed that there's a lot of old cruft and many tests are skipped. This series refactors virshtest and optimizes it to run multiple commands with one virsh instance. Doing this allows us to do more testing in the same run time allowing us to reduce the amount of "expensive" tests. Further down this removes all of the 'shell' test infra which was used for virsh. Peter Krempa (35): virshtest: Prepare for testing against output files virshtest: Allow to test failure of commands virshtest: Filter multiple occurences of string to drop in testFilterLine virshtest: Add support for testing commands read from input file and adapt alias tests virshtest: Adapt 'echo --split' tests to DO_TEST_SCRIPT virshtest: Drop some redundant 'echo' cases virshtest: Adapt some 'escaping' tests via DO_TEST_SCRIPT vrishtest: Prepare for simpler testing - echo tests virshtest: Test against output files ("echo" tests) virshtest: Drop string form of expected output data of "echo" tests virshtest: Replace list and nodeinfo tests by equivalent VIR_TEST_SCRIPT variant virshtest: Adapt tests for domain id lookup and state query to DO_TEST_SCRIPT virshtest: Adapt 'blkiotune' tests to DO_TEST_SCRIPT virshtest: Adapt 'iothread' tests to DO_TEST_SCRIPT virshtest: Drop support for testing against hardcoded strings virshtest: Adapt argument parsing tests from 'virsh-optparse' virshtest: Adapt 'snapshot-create-as' arg handling tests from 'virsh-optparse' virshtest: Adapt numeric option arg handling tests from 'virsh-optparse' virshtest: Adapt 'event' option arg handling tests from 'virsh-optparse' virshtest: Reimplement 'virsh-output' test qemuxmlconftest: Adapt XMLs from 'virsh-cpuset' and 'virsh-define-dev-segfault' cases virshtest: Adapt 'virsh-vcpupin' test virshtest: Adapt 'virsh-int-overflow' virshtest: Adapt 'virsh-schedinfo' virshtest: Adapt 'virsh-start' and 'virsh-undefine' tests as 'lifecycle' case virsh: Fix '--name' and '--parent' used together in '(snapshot|checkpoint)-list' command vsh: Allow non-interactive use of 'cd' command virshtest: Adapt 'virsh-snapshot' test virshtest: Adapt 'virsh-checkpoint' test virshtest: Adapt 'virsh-read-bufsiz' and 'virsh-read-non-seekable' virshtest: Adapt 'libvirtd-pool' tests: Re-implement '(virsh|virt-admin)-self-test' directly in meson tests: Reimplement 'libvirtd-fail' case directly in meson virshtest: Adapt virsh-uriprecedence test case tests: Drop 'test-lib.sh' build-aux/syntax-check.mk | 6 +- docs/manpages/virsh.rst | 17 +- src/meson.build | 5 + tests/libvirtd-fail | 16 - tests/libvirtd-pool | 38 - tests/meson.build | 39 +- .../console-compat-crash.x86_64-latest.args | 46 + .../console-compat-crash.x86_64-latest.xml | 65 ++ .../console-compat-crash.xml} | 36 +- .../cpuset-invalid.x86_64-latest.err | 1 + tests/qemuxmlconfdata/cpuset-invalid.xml | 12 + tests/qemuxmlconftest.c | 2 + tests/test-lib.sh | 280 ------ tests/virsh-checkpoint | 178 ---- tests/virsh-cpuset | 46 - tests/virsh-int-overflow | 18 - tests/virsh-optparse | 292 ------ tests/virsh-output | 29 - tests/virsh-output-commands | 94 -- tests/virsh-output.out | 496 ---------- tests/virsh-read-bufsiz | 49 - tests/virsh-read-non-seekable | 51 - tests/virsh-schedinfo | 40 - tests/virsh-self-test | 48 - tests/virsh-snapshot | 233 ----- tests/virsh-start | 41 - tests/virsh-undefine | 76 -- tests/virsh-uriprecedence | 97 -- tests/virsh-vcpupin | 100 -- tests/virshtest.c | 878 +++++++----------- tests/virshtestdata/argument-assignment.in | 15 + tests/virshtestdata/argument-assignment.out | 91 ++ tests/virshtestdata/attach-disk.in | 79 ++ tests/virshtestdata/attach-disk.out | 343 +++++++ tests/virshtestdata/blkiotune.in | 3 + tests/virshtestdata/blkiotune.out | 15 + tests/virshtestdata/checkpoint-c2.xml | 41 + tests/virshtestdata/checkpoint-c3.xml | 38 + tests/virshtestdata/checkpoint-redefine.out | 13 + tests/virshtestdata/checkpoint.in | 35 + tests/virshtestdata/checkpoint.out | 133 +++ tests/virshtestdata/dash-dash-argument-1.out | 1 + tests/virshtestdata/dash-dash-argument-2.out | 1 + tests/virshtestdata/dash-dash-argument-3.out | 1 + tests/virshtestdata/dash-dash-argument-4.out | 1 + tests/virshtestdata/dash-dash-argument-5.out | 1 + tests/virshtestdata/dash-dash-argument-6.out | 1 + tests/virshtestdata/domain-id-overflow.out | 3 + tests/virshtestdata/domain-id.in | 18 + tests/virshtestdata/domain-id.out | 73 ++ tests/virshtestdata/echo-alias-argv.out | 1 + tests/virshtestdata/echo-alias.in | 3 + tests/virshtestdata/echo-alias.out | 3 + tests/virshtestdata/echo-escaping-1.out | 2 + tests/virshtestdata/echo-escaping-2.out | 2 + tests/virshtestdata/echo-escaping-3.out | 2 + tests/virshtestdata/echo-escaping.in | 11 + tests/virshtestdata/echo-escaping.out | 11 + tests/virshtestdata/echo-quote-removal-1.out | 1 + tests/virshtestdata/echo-quote-removal-2.out | 1 + tests/virshtestdata/echo-quote-removal-3.out | 1 + tests/virshtestdata/echo-quote-removal-4.out | 1 + tests/virshtestdata/echo-quote-removal-5.out | 1 + tests/virshtestdata/echo-quote-removal-6.out | 1 + tests/virshtestdata/echo-quote-removal-7.out | 2 + tests/virshtestdata/echo-quote-removal-8.out | 1 + tests/virshtestdata/echo-split.in | 5 + tests/virshtestdata/echo-split.out | 24 + tests/virshtestdata/info-custom.in | 2 + tests/virshtestdata/info-custom.out | 15 + tests/virshtestdata/info-default.in | 2 + tests/virshtestdata/info-default.out | 13 + tests/virshtestdata/iothreads.in | 14 + tests/virshtestdata/iothreads.out | 51 + tests/virshtestdata/lifecycle.in | 23 + tests/virshtestdata/lifecycle.out | 106 +++ tests/virshtestdata/multiple-commands-1.out | 2 + tests/virshtestdata/multiple-commands-10.out | 1 + tests/virshtestdata/multiple-commands-11.out | 1 + tests/virshtestdata/multiple-commands-12.out | 1 + tests/virshtestdata/multiple-commands-2.out | 2 + tests/virshtestdata/multiple-commands-3.out | 2 + tests/virshtestdata/multiple-commands-4.out | 2 + tests/virshtestdata/multiple-commands-5.out | 3 + tests/virshtestdata/multiple-commands-6.out | 1 + tests/virshtestdata/multiple-commands-7.out | 2 + tests/virshtestdata/multiple-commands-8.out | 2 + tests/virshtestdata/multiple-commands-9.out | 1 + tests/virshtestdata/numeric-parsing-event.in | 26 + tests/virshtestdata/numeric-parsing-event.out | 10 + tests/virshtestdata/numeric-parsing.in | 43 + tests/virshtestdata/numeric-parsing.out | 12 + tests/virshtestdata/pool-define-as.out | 12 + tests/virshtestdata/read-big-pipe.out | 7 + .../schedinfo-invalid-argument.out | 5 + tests/virshtestdata/snapshot-create-args.in | 9 + tests/virshtestdata/snapshot-create-args.out | 82 ++ tests/virshtestdata/snapshot-redefine.out | 17 + tests/virshtestdata/snapshot-s2.xml | 43 + tests/virshtestdata/snapshot-s3.xml | 40 + tests/virshtestdata/snapshot.in | 54 ++ tests/virshtestdata/snapshot.out | 173 ++++ .../uriprecedence-LIBVIRT_DEFAULT_URI.out | 5 + ...riprecedence-VIRSH_DEFAULT_CONNECT_URI.out | 5 + tests/virshtestdata/uriprecedence-param.out | 5 + .../uriprecedence-xdg-config.out | 5 + .../bad/libvirt/libvirt.conf | 1 + .../good/libvirt/libvirt.conf | 1 + tests/virshtestdata/vcpupin.in | 23 + tests/virshtestdata/vcpupin.out | 26 + tests/virt-admin-self-test | 1 - tools/meson.build | 4 +- tools/virsh-checkpoint.c | 18 +- tools/virsh-snapshot.c | 18 +- tools/vsh.c | 5 - 115 files changed, 2352 insertions(+), 2852 deletions(-) delete mode 100755 tests/libvirtd-fail delete mode 100755 tests/libvirtd-pool create mode 100644 tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.xml rename tests/{virsh-define-dev-segfault => qemuxmlconfdata/console-compat-crash.xml} (59%) mode change 100755 => 100644 create mode 100644 tests/qemuxmlconfdata/cpuset-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/cpuset-invalid.xml delete mode 100644 tests/test-lib.sh delete mode 100755 tests/virsh-checkpoint delete mode 100755 tests/virsh-cpuset delete mode 100755 tests/virsh-int-overflow delete mode 100755 tests/virsh-optparse delete mode 100755 tests/virsh-output delete mode 100755 tests/virsh-output-commands delete mode 100644 tests/virsh-output.out delete mode 100755 tests/virsh-read-bufsiz delete mode 100755 tests/virsh-read-non-seekable delete mode 100755 tests/virsh-schedinfo delete mode 100755 tests/virsh-self-test delete mode 100755 tests/virsh-snapshot delete mode 100755 tests/virsh-start delete mode 100755 tests/virsh-undefine delete mode 100755 tests/virsh-uriprecedence delete mode 100755 tests/virsh-vcpupin create mode 100644 tests/virshtestdata/argument-assignment.in create mode 100644 tests/virshtestdata/argument-assignment.out create mode 100755 tests/virshtestdata/attach-disk.in create mode 100644 tests/virshtestdata/attach-disk.out create mode 100644 tests/virshtestdata/blkiotune.in create mode 100644 tests/virshtestdata/blkiotune.out create mode 100644 tests/virshtestdata/checkpoint-c2.xml create mode 100644 tests/virshtestdata/checkpoint-c3.xml create mode 100644 tests/virshtestdata/checkpoint-redefine.out create mode 100755 tests/virshtestdata/checkpoint.in create mode 100644 tests/virshtestdata/checkpoint.out create mode 100644 tests/virshtestdata/dash-dash-argument-1.out create mode 100644 tests/virshtestdata/dash-dash-argument-2.out create mode 100644 tests/virshtestdata/dash-dash-argument-3.out create mode 100644 tests/virshtestdata/dash-dash-argument-4.out create mode 100644 tests/virshtestdata/dash-dash-argument-5.out create mode 100644 tests/virshtestdata/dash-dash-argument-6.out create mode 100644 tests/virshtestdata/domain-id-overflow.out create mode 100644 tests/virshtestdata/domain-id.in create mode 100644 tests/virshtestdata/domain-id.out create mode 100644 tests/virshtestdata/echo-alias-argv.out create mode 100644 tests/virshtestdata/echo-alias.in create mode 100644 tests/virshtestdata/echo-alias.out create mode 100644 tests/virshtestdata/echo-escaping-1.out create mode 100644 tests/virshtestdata/echo-escaping-2.out create mode 100644 tests/virshtestdata/echo-escaping-3.out create mode 100644 tests/virshtestdata/echo-escaping.in create mode 100644 tests/virshtestdata/echo-escaping.out create mode 100644 tests/virshtestdata/echo-quote-removal-1.out create mode 100644 tests/virshtestdata/echo-quote-removal-2.out create mode 100644 tests/virshtestdata/echo-quote-removal-3.out create mode 100644 tests/virshtestdata/echo-quote-removal-4.out create mode 100644 tests/virshtestdata/echo-quote-removal-5.out create mode 100644 tests/virshtestdata/echo-quote-removal-6.out create mode 100644 tests/virshtestdata/echo-quote-removal-7.out create mode 100644 tests/virshtestdata/echo-quote-removal-8.out create mode 100644 tests/virshtestdata/echo-split.in create mode 100644 tests/virshtestdata/echo-split.out create mode 100644 tests/virshtestdata/info-custom.in create mode 100644 tests/virshtestdata/info-custom.out create mode 100644 tests/virshtestdata/info-default.in create mode 100644 tests/virshtestdata/info-default.out create mode 100644 tests/virshtestdata/iothreads.in create mode 100644 tests/virshtestdata/iothreads.out create mode 100644 tests/virshtestdata/lifecycle.in create mode 100644 tests/virshtestdata/lifecycle.out create mode 100644 tests/virshtestdata/multiple-commands-1.out create mode 100644 tests/virshtestdata/multiple-commands-10.out create mode 100644 tests/virshtestdata/multiple-commands-11.out create mode 100644 tests/virshtestdata/multiple-commands-12.out create mode 100644 tests/virshtestdata/multiple-commands-2.out create mode 100644 tests/virshtestdata/multiple-commands-3.out create mode 100644 tests/virshtestdata/multiple-commands-4.out create mode 100644 tests/virshtestdata/multiple-commands-5.out create mode 100644 tests/virshtestdata/multiple-commands-6.out create mode 100644 tests/virshtestdata/multiple-commands-7.out create mode 100644 tests/virshtestdata/multiple-commands-8.out create mode 100644 tests/virshtestdata/multiple-commands-9.out create mode 100644 tests/virshtestdata/numeric-parsing-event.in create mode 100644 tests/virshtestdata/numeric-parsing-event.out create mode 100644 tests/virshtestdata/numeric-parsing.in create mode 100644 tests/virshtestdata/numeric-parsing.out create mode 100644 tests/virshtestdata/pool-define-as.out create mode 100644 tests/virshtestdata/read-big-pipe.out create mode 100644 tests/virshtestdata/schedinfo-invalid-argument.out create mode 100644 tests/virshtestdata/snapshot-create-args.in create mode 100644 tests/virshtestdata/snapshot-create-args.out create mode 100644 tests/virshtestdata/snapshot-redefine.out create mode 100644 tests/virshtestdata/snapshot-s2.xml create mode 100644 tests/virshtestdata/snapshot-s3.xml create mode 100755 tests/virshtestdata/snapshot.in create mode 100644 tests/virshtestdata/snapshot.out create mode 100644 tests/virshtestdata/uriprecedence-LIBVIRT_DEFAULT_URI.out create mode 100644 tests/virshtestdata/uriprecedence-VIRSH_DEFAULT_CONNECT_URI.out create mode 100644 tests/virshtestdata/uriprecedence-param.out create mode 100644 tests/virshtestdata/uriprecedence-xdg-config.out create mode 100644 tests/virshtestdata/uriprecedence-xdg/bad/libvirt/libvirt.conf create mode 100644 tests/virshtestdata/uriprecedence-xdg/good/libvirt/libvirt.conf create mode 100755 tests/virshtestdata/vcpupin.in create mode 100644 tests/virshtestdata/vcpupin.out delete mode 120000 tests/virt-admin-self-test -- 2.44.0

4 42

[PATCH 0/4] Introduce SSH proxy
by Michal Privoznik 07 May '24

07 May '24

*** BLURB HERE *** Michal Prívozník (4): datatypes: Declare g_autoptr cleanup functions for more public objects tools: Introduce SSH proxy docs: Document SSH proxy NEWS: Document SSH proxy feature NEWS.rst | 5 + docs/docs.rst | 3 + docs/meson.build | 1 + docs/nss.rst | 7 + docs/ssh-proxy.rst | 60 +++++ libvirt.spec.in | 27 +++ meson.build | 16 +- meson_options.txt | 2 + po/POTFILES | 1 + src/datatypes.h | 16 ++ tools/meson.build | 2 + tools/ssh-proxy/30-libvirt-ssh-proxy.conf.in | 10 + tools/ssh-proxy/meson.build | 25 ++ tools/ssh-proxy/ssh-proxy.c | 233 +++++++++++++++++++ 14 files changed, 407 insertions(+), 1 deletion(-) create mode 100644 docs/ssh-proxy.rst create mode 100644 tools/ssh-proxy/30-libvirt-ssh-proxy.conf.in create mode 100644 tools/ssh-proxy/meson.build create mode 100644 tools/ssh-proxy/ssh-proxy.c -- 2.43.2

3 8

[PATCH] qemu_saveimage: add zstd to supported compression formats
by Adam Julis 06 May '24

06 May '24

Extend the list of supported formats, update and clarify comment in qemu.conf.in (removed misleading sentence about the order of compression format types). Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- libvirt.spec.in | 1 + src/qemu/qemu.conf.in | 7 +++---- src/qemu/qemu_saveimage.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 64018192b6..88c62f6d92 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -815,6 +815,7 @@ Requires: gzip Requires: bzip2 Requires: lzop Requires: xz +Requires: zstd Requires: systemd-container Requires: swtpm-tools %if %{with_numad} diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index f406df8749..6bc2140dcb 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -582,10 +582,9 @@ # memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite # a bit of space. If you would like to compress the images while they -# are being saved to disk, you can also set "lzop", "gzip", "bzip2", or "xz" -# for save_image_format. Note that this means you slow down the process of -# saving a domain in order to save disk space; the list above is in descending -# order by performance and ascending order by compression ratio. +# are being saved to disk, you can also set "zstd", "lzop", "gzip", "bzip2", +# or "xz" for save_image_format. Note that this means you slow down the process +# of saving a domain in order to save disk space. # # save_image_format is used when you use 'virsh save' or 'virsh managedsave' # at scheduled saving, and it is an error if the specified save_image_format diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 89112e3e44..018ab5a222 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -47,6 +47,7 @@ typedef enum { */ QEMU_SAVE_FORMAT_XZ = 3, QEMU_SAVE_FORMAT_LZOP = 4, + QEMU_SAVE_FORMAT_ZSTD = 5, /* Note: add new members only at the end. These values are used in the on-disk format. Do not change or re-use numbers. */ @@ -62,6 +63,7 @@ VIR_ENUM_IMPL(qemuSaveCompression, "bzip2", "xz", "lzop", + "zstd", ); static inline void -- 2.44.0

2 1

[PATCH v2 0/4] qemu: Substract isolcpus from all online affinity
by Michal Privoznik 06 May '24

06 May '24

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/4V7O… diff to v1: - Don't error out on systems where /sys/devices/system/cpu/isolated is unavailable. - Don't error out on systems where /sys/devices/system/cpu/isolated is empty. Both of these resulted in new patches. Michal Prívozník (4): virbitmap: Introduce virBitmapParseUnlimitedAllowEmpty() virfile: Introduce virFileReadValueBitmapAllowEmpty() virhostcpu: Introduce virHostCPUGetIsolated() qemu: Substract isolcpus from all online affinity src/libvirt_private.syms | 3 ++ src/qemu/qemu_process.c | 9 +++++ src/util/virbitmap.c | 40 +++++++++++++++++--- src/util/virbitmap.h | 3 ++ src/util/virfile.c | 81 ++++++++++++++++++++++++++++++---------- src/util/virfile.h | 2 + src/util/virhostcpu.c | 31 +++++++++++++++ src/util/virhostcpu.h | 1 + tests/virbitmaptest.c | 40 ++++++++++++++++++++ 9 files changed, 186 insertions(+), 24 deletions(-) -- 2.43.2

3 7

[PATCH] libxl: Fix domxml-to-native conversion
by Jim Fehlig 02 May '24

02 May '24

Similar to commit 57d084febe, another case of the libxl driver not adapting to modular daemons. When converting configuration that contains a type='network' interface, the converter calls virNetworkLookupByName, passing the hypervisor connection object instead of a connection to virtnetworkd. E.g. > cat dom.xml ... <interface type='network'> <source network='default'/> </interface> ... > virsh net-info default Name: default UUID: 25a5b089-1e71-4956-99aa-df2213bbb407 Active: yes Persistent: no Autostart: no Bridge: virbr0 > virsh domxml-to-native xen-xl dom.xml error: Network not found: default Acquire a connection to virtnetworkd and use it when calling virNetwork* APIs. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 4 ++-- src/libxl/xen_common.c | 25 +++++++++++++++---------- src/libxl/xen_common.h | 1 - src/libxl/xen_xl.c | 4 ++-- src/libxl/xen_xl.h | 2 +- src/libxl/xen_xm.c | 5 ++--- src/libxl/xen_xm.h | 2 +- tests/xlconfigtest.c | 7 +------ tests/xmconfigtest.c | 7 +------ 9 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e42a3dc0a9..4d5eb920bf 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2709,10 +2709,10 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, goto cleanup; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { - if (!(conf = xenFormatXL(def, conn))) + if (!(conf = xenFormatXL(def))) goto cleanup; } else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) { - if (!(conf = xenFormatXM(conn, def))) + if (!(conf = xenFormatXM(def))) goto cleanup; } else { diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 79eb593432..0b2346d8b5 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -24,6 +24,7 @@ #include <config.h> +#include "driver.h" #include "internal.h" #include "virerror.h" #include "virconf.h" @@ -1586,8 +1587,7 @@ xenMakeIPList(virNetDevIPInfo *guestIP) } static int -xenFormatNet(virConnectPtr conn, - virConfValue *list, +xenFormatNet(virConfValue *list, virDomainNetDef *net, int hvm, const char *vif_typename) @@ -1649,13 +1649,21 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_NETWORK: { - virNetworkPtr network = virNetworkLookupByName(conn, net->data.network.name); + virConnectPtr conn = NULL; + virNetworkPtr network; char *bridge; - if (!network) { + + if (!(conn = virGetConnectNetwork())) + return -1; + + if (!(network = virNetworkLookupByName(conn, net->data.network.name))) { virReportError(VIR_ERR_NO_NETWORK, "%s", net->data.network.name); + virObjectUnref(conn); return -1; } + virObjectUnref(conn); + bridge = virNetworkGetBridgeName(network); virObjectUnref(network); if (!bridge) { @@ -2304,7 +2312,6 @@ xenFormatSound(virConf *conf, virDomainDef *def) static int xenFormatVif(virConf *conf, - virConnectPtr conn, virDomainDef *def, const char *vif_typename) { @@ -2317,8 +2324,7 @@ xenFormatVif(virConf *conf, netVal->list = NULL; for (i = 0; i < def->nnets; i++) { - if (xenFormatNet(conn, netVal, def->nets[i], - hvm, vif_typename) < 0) + if (xenFormatNet(netVal, def->nets[i], hvm, vif_typename) < 0) return -1; } @@ -2336,7 +2342,6 @@ xenFormatVif(virConf *conf, int xenFormatConfigCommon(virConf *conf, virDomainDef *def, - virConnectPtr conn, const char *nativeFormat) { if (xenFormatGeneralMeta(conf, def) < 0) @@ -2364,10 +2369,10 @@ xenFormatConfigCommon(virConf *conf, return -1; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { - if (xenFormatVif(conf, conn, def, "vif") < 0) + if (xenFormatVif(conf, def, "vif") < 0) return -1; } else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) { - if (xenFormatVif(conf, conn, def, "netfront") < 0) + if (xenFormatVif(conf, def, "netfront") < 0) return -1; } else { virReportError(VIR_ERR_INVALID_ARG, diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index b21046e959..95408fa896 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -61,7 +61,6 @@ int xenParseConfigCommon(virConf *conf, int xenFormatConfigCommon(virConf *conf, virDomainDef *def, - virConnectPtr conn, const char *nativeFormat); char *xenMakeIPList(virNetDevIPInfo *guestIP); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..53f6871efc 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -2041,14 +2041,14 @@ xenFormatXLDomainNamespaceData(virConf *conf, virDomainDef *def) } virConf * -xenFormatXL(virDomainDef *def, virConnectPtr conn) +xenFormatXL(virDomainDef *def) { g_autoptr(virConf) conf = NULL; if (!(conf = virConfNew())) return NULL; - if (xenFormatConfigCommon(conf, def, conn, XEN_CONFIG_FORMAT_XL) < 0) + if (xenFormatConfigCommon(conf, def, XEN_CONFIG_FORMAT_XL) < 0) return NULL; if (xenFormatXLOS(conf, def) < 0) diff --git a/src/libxl/xen_xl.h b/src/libxl/xen_xl.h index f8b1ebfde9..028b359b76 100644 --- a/src/libxl/xen_xl.h +++ b/src/libxl/xen_xl.h @@ -29,6 +29,6 @@ virDomainDef *xenParseXL(virConf *conn, virCaps *caps, virDomainXMLOption *xmlopt); -virConf *xenFormatXL(virDomainDef *def, virConnectPtr); +virConf *xenFormatXL(virDomainDef *def); const char *xenTranslateCPUFeature(const char *feature_name, bool from_libxl); diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 5705a5ec0c..274b35153b 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -543,15 +543,14 @@ G_STATIC_ASSERT(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); * Convert a virDomainDef object into an XM config record. */ virConf * -xenFormatXM(virConnectPtr conn, - virDomainDef *def) +xenFormatXM(virDomainDef *def) { g_autoptr(virConf) conf = NULL; if (!(conf = virConfNew())) return NULL; - if (xenFormatConfigCommon(conf, def, conn, XEN_CONFIG_FORMAT_XM) < 0) + if (xenFormatConfigCommon(conf, def, XEN_CONFIG_FORMAT_XM) < 0) return NULL; if (xenFormatXMOS(conf, def) < 0) diff --git a/src/libxl/xen_xm.h b/src/libxl/xen_xm.h index afb4f51ff7..db2ae52581 100644 --- a/src/libxl/xen_xm.h +++ b/src/libxl/xen_xm.h @@ -26,7 +26,7 @@ #include "virconf.h" #include "domain_conf.h" -virConf *xenFormatXM(virConnectPtr conn, virDomainDef *def); +virConf *xenFormatXM(virDomainDef *def); virDomainDef *xenParseXM(virConf *conf, virCaps *caps, virDomainXMLOption *xmlopt); diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 962a1f2c4b..00b6a355eb 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -65,17 +65,12 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) { g_autofree char *gotxlcfgData = NULL; g_autoptr(virConf) conf = NULL; - g_autoptr(virConnect) conn = NULL; int wrote = 4096; g_autoptr(virDomainDef) def = NULL; g_autofree char *replacedXML = NULL; gotxlcfgData = g_new0(char, wrote); - conn = virGetConnect(); - if (!conn) - return -1; - if (replaceVars) { if (!(replacedXML = testReplaceVarsXML(xml))) return -1; @@ -93,7 +88,7 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) return -1; } - if (!(conf = xenFormatXL(def, conn))) + if (!(conf = xenFormatXL(def))) return -1; if (virConfWriteMem(gotxlcfgData, &wrote, conf) < 0) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index dbf9f7a4c7..30ad49f8b1 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -39,16 +39,11 @@ testCompareParseXML(const char *xmcfg, const char *xml) { g_autofree char *gotxmcfgData = NULL; g_autoptr(virConf) conf = NULL; - g_autoptr(virConnect) conn = NULL; int wrote = 4096; g_autoptr(virDomainDef) def = NULL; gotxmcfgData = g_new0(char, wrote); - conn = virGetConnect(); - if (!conn) - return -1; - if (!(def = virDomainDefParseFile(xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) return -1; @@ -58,7 +53,7 @@ testCompareParseXML(const char *xmcfg, const char *xml) return -1; } - if (!(conf = xenFormatXM(conn, def))) + if (!(conf = xenFormatXM(def))) return -1; if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0) -- 2.44.0

2 2

[PATCH v2 0/5] qemu: Introduce shared_filesystems configuration option
by Andrea Bolognani 02 May '24

02 May '24

The need to have something like this in the first place is driven by KubeVirt (see [1] and [2]). A draft version of this series has been integrated into KubeVirt and it has been confirmed that it was effective in removing the need to use LD_PRELOAD hacks in the storage provider. Changes from [v1]: * documented more explicitly that the newly introduced option is intended for very specific scenarios and not general usage; as part of this, the NEWS update has been dropped too; * made a few tweaks and addressed a few oversight based on review feedback; * several preparatory cleanup patches have been pushed. Changes from [v0]: * reworked approach. CC'ing Stefan so he can have a look at the TPM part and shout if I've gotten anything wrong :) [v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XEIS… [v0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MMKV… [1] https://issues.redhat.com/browse/CNV-34322 [2] https://issues.redhat.com/browse/CNV-39370 Andrea Bolognani (5): security: Fix alignment qemu: Introduce shared_filesystems configuration option qemu: Propagate shared_filesystems utils: Use overrides in virFileIsSharedFS() qemu: Always set labels for TPM state src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 +- src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf.in | 23 ++++++++ src/qemu/qemu_conf.c | 17 ++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 7 ++- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.c | 23 ++++---- src/qemu/qemu_security.c | 85 +++++++++++++++++++++++------- src/qemu/qemu_tpm.c | 38 +++++++------ src/qemu/qemu_tpm.h | 10 ++-- src/qemu/test_libvirtd_qemu.aug.in | 5 ++ src/security/security_apparmor.c | 2 + src/security/security_dac.c | 47 +++++++++++++---- src/security/security_driver.h | 8 ++- src/security/security_manager.c | 33 +++++++++--- src/security/security_manager.h | 9 +++- src/security/security_nop.c | 5 ++ src/security/security_selinux.c | 56 +++++++++++++++----- src/security/security_stack.c | 32 ++++++++--- src/util/virfile.c | 53 +++++++++++++++++-- src/util/virfile.h | 3 +- tests/securityselinuxlabeltest.c | 2 +- tests/virfiletest.c | 2 +- 26 files changed, 370 insertions(+), 106 deletions(-) -- 2.44.0

2 13