May 2024 - Devel - Libvirt List Archives

[PATCH] qemu: fix qemu command for pci hostdevs and ramfb='off'

by Jonathon Jongsma

There was no test for this and we mistakenly used 'B' rather than 'T' when constructing the json value for this parameter. Thus, a value of 'off' was VIR_TRISTATE_SWITCH_OFF=2, which was translated to a boolean value of 'true'. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- .../hostdev-pci-display-ramfb.x86_64-latest.args | 1 + .../hostdev-pci-display-ramfb.x86_64-latest.xml | 6 +++++… [View More]+ tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63bfeb790e..2d0eddc79e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4798,7 +4798,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, "p:bootindex", dev->info->effectiveBootIndex, "S:failover_pair_id", failover_pair_id, "S:display", qemuOnOffAuto(pcisrc->display), - "B:ramfb", pcisrc->ramfb, + "T:ramfb", pcisrc->ramfb, NULL) < 0) return NULL; diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args index 6a3bfbe6fb..e6e538ef1c 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args @@ -29,5 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -device '{"driver":"vfio-pci-nohotplug","host":"0000:06:12.5","id":"hostdev0","display":"on","ramfb":true,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:13.6","id":"hostdev1","display":"off","ramfb":false,"bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml index 16e8a1dee2..18b9bfb5bf 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml @@ -39,6 +39,12 @@ </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </hostdev> + <hostdev mode='subsystem' type='pci' managed='no' display='off' ramfb='off'> + <source> + <address domain='0x0000' bus='0x06' slot='0x13' function='0x6'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </hostdev> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml index 39c84da7e1..d263342b1d 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml +++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml @@ -25,6 +25,11 @@ <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> </source> </hostdev> + <hostdev mode='subsystem' type='pci' display='off' ramfb='off'> + <source> + <address domain='0x0000' bus='0x06' slot='0x13' function='0x6'/> + </source> + </hostdev> <video> <model type='none'/> </video> -- 2.45.0 [View Less]

11 months, 1 week

2
1
0 / 0

[PATCH 0/2] Add support for hotplugging evdev input devices

by Rayhan Faizel

This patch series extends the current evdev device implementation to allow hotplugging, including live attachment and detachment. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/529 Rayhan Faizel (2): qemu: Implement support for hotplugging evdev input devices qemuhotplugtest: Add testcases for hotplugging evdev input devices src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 3 + src/qemu/qemu_hotplug.c | … [View More]

11 months, 1 week

2
3
0 / 0

[PATCH 0/4] rpm: Some ssh-proxy improvements

by Andrea Bolognani

CI pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1292193155 Andrea Bolognani (4): rpm: Drop weak dependency on ssh-proxy from client rpm: Only Recommend ssh-proxy rpm: Move dependency on ssh-proxy to QEMU driver rpm: Drop with_ssh_proxy define libvirt.spec.in | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) -- 2.45.0

11 months, 1 week

3
12
0 / 0

[PATCH 0/2] hw/core: revert deprecation of 'parameter=1' for SMP topology

by Daniel P. Berrangé

Since QEMU 9.0, users are complaining that depecation messages are shown for every VM libvirt starts. This is due to the newly introduced deprecation of 'parameter=1' for -smp. This proposes reverting that, see the 1st patch for further commentary. Daniel P. Berrangé (2): hw/core: allow parameter=1 for CPU topology on any machine tests: add testing of parameter=1 for SMP topology docs/about/deprecated.rst | 14 ------- hw/core/machine-smp.c | 82 ++++++++++++-----------------------… [View More]

11 months, 1 week

4
11
0 / 0

[PATCH v2] network: add modify-or-add feature to net-update

by Abhiram Tilak

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. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/363 Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> --- Changes in v2: - Removed the modify-or-add functionality for sections … [View More]where modify is not applicable. - Changed the existing implementation of `UpdateIPDHCPHost`, to avoid code duplication. - Changed the implementation of modify-or-delete to reassign the `command` variable instead of using multiple nested conditions. docs/manpages/virsh.rst | 5 +- include/libvirt/libvirt-network.h | 12 +-- src/conf/network_conf.c | 134 +++++++++++++++++++++--------- tools/virsh-network.c | 6 +- 4 files changed, 110 insertions(+), 47 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 115b802c45..0da3827f6b 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), or +"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..bb4468b160 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -176,11 +176,13 @@ int virNetworkUndefine (virNetworkPtr network); * Since: 0.10.2 */ typedef enum { - VIR_NETWORK_UPDATE_COMMAND_NONE = 0, /* invalid (Since: 0.10.2) */ - VIR_NETWORK_UPDATE_COMMAND_MODIFY = 1, /* modify an existing element (Since: 0.10.2) */ - 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_NONE = 0, /* invalid (Since: 0.10.2) */ + VIR_NETWORK_UPDATE_COMMAND_MODIFY = 1, /* modify an existing element (Since: 0.10.2) */ + 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_ADD_LAST = 5, /* conditionally modify or add an element at end (Since: 10.4.0) */ + VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST = 6, /* conditionally modify or add an element at start (Since: 10.4.0) */ # 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..a7c3dea163 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2720,6 +2720,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, virNetworkIPDef *ipdef = virNetworkIPDefByIndex(def, parentIndex); virNetworkDHCPHostDef host = { 0 }; bool partialOkay = (command == VIR_NETWORK_UPDATE_COMMAND_DELETE); + int foundMatchedEntry = -1, foundExactEntry = -1; if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "host") < 0) goto cleanup; @@ -2740,22 +2741,47 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, goto cleanup; } - if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { + /* check if the entry already exsits */ + for (i = 0; i < ipdef->nhosts; i++) { - /* search for the entry with this (ip|mac|name), - * and update the IP+(mac|name) */ - for (i = 0; i < ipdef->nhosts; i++) { - if ((host.mac && ipdef->hosts[i].mac && - !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || - (VIR_SOCKET_ADDR_VALID(&host.ip) && - virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip)) || - (host.name && - STREQ_NULLABLE(host.name, ipdef->hosts[i].name))) { - break; - } + /* try to match any of (ip|mac|name) attributes */ + if ((host.mac && ipdef->hosts[i].mac && + !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || + (VIR_SOCKET_ADDR_VALID(&host.ip) && + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip)) || + (host.name && + STREQ_NULLABLE(host.name, ipdef->hosts[i].name))) { + foundMatchedEntry = i; + } + + /* find exact entry - all specified attributes must match */ + 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))) { + foundExactEntry = i; + break; } + } + + /* modify-or-add: convert command to add or modify based on foundEntry */ + if (foundEntry == -1) { + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST) + command = VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST; + else if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) + command = VIR_NETWORK_UPDATE_COMMAND_ADD_LAST; + } else if (foundEntry >= 0) { + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) + command = VIR_NETWORK_UPDATE_COMMAND_MODIFY; + } + + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - if (i == ipdef->nhosts) { + /* log error if no such entry exists to be modified */ + if (foundMatchedEntry == -1) { g_autofree char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate an existing dhcp host entry with \"mac='%1$s'\" \"name='%2$s'\" \"ip='%3$s'\" in network '%4$s'"), @@ -2779,21 +2805,13 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, goto cleanup; /* log error if an entry with same name/address/ip already exists */ - 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))) { - g_autofree char *ip = virSocketAddrFormat(&host.ip); + if (foundMatchedEntry >= 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is an existing dhcp host entry in network '%1$s' that matches \"<host mac='%2$s' name='%3$s' ip='%4$s'/>\""), + def->name, host.mac ? host.mac : _("unknown"), + host.name, ip ? ip : _("unknown")); + goto cleanup; - virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing dhcp host entry in network '%1$s' that matches \"<host mac='%2$s' name='%3$s' ip='%4$s'/>\""), - def->name, host.mac ? host.mac : _("unknown"), - host.name, ip ? ip : _("unknown")); - goto cleanup; - } } /* add to beginning/end of list */ @@ -2804,18 +2822,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, goto cleanup; } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { - /* find matching entry - all specified attributes must match */ - 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))) { - break; - } - } - if (i == ipdef->nhosts) { + /* log error if there is no entry with exact match*/ + if (foundExactEntry == -1) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate a matching dhcp host entry in network '%1$s'"), def->name); @@ -2865,6 +2873,14 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDef *def, return -1; } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) { + + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("dhcp ranges cannot be modified, use add command instead of modify-or-add")); + return -1; + } + if (virNetworkDHCPRangeDefParseXML(def->name, ipdef, ctxt->node, &range) < 0) return -1; @@ -2964,6 +2980,13 @@ virNetworkDefUpdateForwardInterface(virNetworkDef *def, goto cleanup; } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("forward interface entries cannot be modified, use add command instead of modify-or-add")); + goto cleanup; + } + /* parsing this is so simple that it doesn't have its own function */ iface.type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; if (!(iface.device.dev = virXMLPropString(ctxt->node, "dev"))) { @@ -3085,6 +3108,18 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, goto cleanup; } + /* modify-or-add: convert command to add or modify based on foundName */ + if (foundName == -1) { + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST) + command = VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST; + else if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) + command = VIR_NETWORK_UPDATE_COMMAND_ADD_LAST; + } else if (foundName >= 0) { + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) + command = VIR_NETWORK_UPDATE_COMMAND_MODIFY; + } + /* if there is already a different default, we can't make this * one the default. */ @@ -3153,6 +3188,13 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def, goto cleanup; } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS HOST records cannot be modified, use add instead of modify-or-add")); + goto cleanup; + } + if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "host") < 0) goto cleanup; @@ -3249,6 +3291,13 @@ virNetworkDefUpdateDNSSrv(virNetworkDef *def, goto cleanup; } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS SRV records cannot be modified, use add command instead of modify-or-add")); + goto cleanup; + } + if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "srv") < 0) goto cleanup; @@ -3330,6 +3379,13 @@ virNetworkDefUpdateDNSTxt(virNetworkDef *def, goto cleanup; } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_FIRST || + command == VIR_NETWORK_UPDATE_COMMAND_MODIFY_ADD_LAST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("DNS TXT records cannot be modified, use add command instead of modify-or-add")); + goto cleanup; + } + if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "txt") < 0) goto cleanup; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 597e3d4530..d7dc5df5a8 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1231,7 +1231,8 @@ 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 +1261,8 @@ 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.42.1 [View Less]

11 months, 1 week

2
1
0 / 0

[PATCH] network: add modify-or-add feature to net-update

by Abhiram Tilak

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 | … [View More] 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 [View Less]

11 months, 1 week

3
3
0 / 0

[PATCH v2] docs: formatsnapshot: add docs for snapshotDeleteInProgress

by Abhiram Tilak

Adds documentation for the <snapshotDeleteInProgress/> element to the libvirt snapshot format XML reference. The <snapshotDeleteInProgress/> element, introduced at commit 565bcb5d79, ensures the consistency of qcow2 images during snapshot deletion operations by marking disks in snapshot metadata as invalid until deletion is successfully completed. The commit was merged but the related documentation was missing. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/609 Signed-off-… [View More]

11 months, 1 week

3
2
0 / 0

[PATCH] tests: Link some mocks with libtest_qemu_driver.so

by Michal Privoznik

I've noticed some tests fail to run under valgrind with the following error: $ valgrind --leak-check=full --trace-children=yes ./qemuxmlconftest valgrind: symbol lookup error: libvirt.git/_build/tests/libdomaincapsmock.so: undefined symbol: virQEMUCapsGet But without valgrind the test passes just fine. While we usually don't want to change our code just to adhere to random tools, in this case we ought to make an exception because valgrind helps us to detect memory leaks. NB, the --trace-… [View More]children=yes is needed whenever a test re-executes itself, i.e. when it uses mocks. Otherwise we'd just get (boring) result for the first invocation of main() which does nothing more than sets up the environment and calls exec(). When running the test binary without valgrind I can see the libtest_qemu_driver.so being loaded even after exec: $ LD_DEBUG=libs ./qemuxmlconftest 2>&1 | grep -e libtest_qemu_driver.so -e virQEMUCapsGet 6439: find library=libtest_qemu_driver.so [0]; searching 6439: trying file=libvirt.git/_build/tests/../src/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v3/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v2/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6439: find library=libtest_qemu_driver.so [0]; searching 6439: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling fini: libvirt.git/_build/tests/libtest_qemu_driver.so [0] But running the same under valgrind: $ LD_DEBUG=libs valgrind --leak-check=full --trace-children=yes ./qemuxmlconftest 2>&1 | grep -e libtest_qemu_driver.so -e virQEMUCapsGet 6515: find library=libtest_qemu_driver.so [0]; searching 6515: trying file=libvirt.git/_build/tests/../src/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v3/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v2/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6515: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6515: libvirt.git/_build/tests/libdomaincapsmock.so: error: symbol lookup error: undefined symbol: virQEMUCapsGet (fatal) valgrind: symbol lookup error: libvirt.git/_build/tests/libdomaincapsmock.so: undefined symbol: virQEMUCapsGet To me, it looks like valgrind forced linker to lookup symbols "sooner", as individual libraries are loaded. But I must admit I have no idea how valgrind does that (or if that's even valgrind's 'fault'). But fix is pretty simple: link mocks that rely on symbols from the QEMU driver with the QEMU driver, well, its test suite suitable version (libtest_qemu_driver.so). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This obsoletes some patches I've sent earlier: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/R... https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/Z... My initial fix was bothering me as I did not understand what was happening nor why it made the valgrind happy. I still don't quite understand what is going on, but at least this fix seems 'more correct'. tests/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index ba2d319347..2f1eda1f95 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -73,7 +73,6 @@ endif # * deps - additional dependencies (optional, default []) mock_libs = [ - { 'name': 'domaincapsmock' }, { 'name': 'vircgroupmock' }, { 'name': 'virdnsmasqmock' }, { 'name': 'virfilecachemock' }, @@ -175,7 +174,7 @@ if conf.has('WITH_QEMU') { 'name': 'qemucaps2xmlmock' }, { 'name': 'qemucapsprobemock', 'link_with': [ test_qemu_driver_lib ] }, { 'name': 'qemucpumock' }, - { 'name': 'qemuhotplugmock', 'link_with': [ test_utils_qemu_lib, test_utils_lib ] }, + { 'name': 'qemuhotplugmock', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_lib, test_utils_lib ] }, { 'name': 'qemuxml2argvmock' }, { 'name': 'virhostidmock' }, ] @@ -185,6 +184,11 @@ else test_utils_qemu_monitor_lib = [] endif +mock_libs += [ + # domaincapsmock has some code guarded with WITH_QEMU + { 'name': 'domaincapsmock', 'link_with': [ test_qemu_driver_lib ] }, +] + test_file_wrapper_lib = static_library( 'test_file_wrapper', [ 'virfilewrapper.c' ], -- 2.43.2 [View Less]

11 months, 1 week

2
1
0 / 0

[PATCH] github: Update lockdown message when openin a PR

by Michal Privoznik

The message that's thrown at users when they try to open a pull request on github suggests opening the MR on gitlab instead. While this works for other libvirt subprojects, for the main libvirt.git we still use e-mail workflow. Update the message to reflect this fact. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .github/workflows/lockdown.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lockdown.yml b/.github/workflows/… [View More]

11 months, 1 week

2
1
0 / 0

[PATCH 0/3] vsh: Fix handling of '--help' for all commands

by Peter Krempa

Brown paper box was applied due to lack of paper bags. Peter Krempa (3): vsh: Fix '--help' option for virsh/virt-admin virshtest: Add tests for '--help' NEWS: Mention '--help' bug in virsh and virt-admin NEWS.rst | 15 +++++++ tests/virshtest.c | 3 ++ tests/virshtestdata/help-option.in | 4 ++ tests/virshtestdata/help-option.out | 64 +++++++++++++++++++++++++++++ tools/vsh.c | 5 ++- 5 files changed, 90 … [View More]

11 months, 1 week

2
4
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Devel May 2024