[PATCH 0/2] qemuDomainChangeNet: Reflect trustGuestRxFilters change
*** BLURB HERE *** Michal Prívozník (2): qemuMonitorJSONQueryRxFilter: Allow @filter to be NULL qemuDomainChangeNet: Reflect trustGuestRxFilters change src/qemu/qemu_hotplug.c | 51 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 12 +++++++++ src/qemu/qemu_monitor_json.c | 3 ++- 3 files changed, 65 insertions(+), 1 deletion(-) -- 2.41.0
Sometimes it may be handy to just issue the query-rx-filter monitor command without actually parsing the output. Adapt qemuMonitorJSONQueryRxFilter() to this behavior. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_monitor.c | 12 ++++++++++++ src/qemu/qemu_monitor_json.c | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ec586b9036..dfad4ee1ea 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2536,6 +2536,18 @@ qemuMonitorRemoveNetdev(qemuMonitor *mon, } +/** + * qemuMonitorQueryRxFilter: + * @mon: monitor object + * @alias: alias of the network interface + * @filter: where to store the result (can be NULL) + * + * Issues query-rx-filter command for given device (@alias) and stores parsed + * output at @filter (if not NULL). If @filter is NULL, the command is executed + * but nothing is parsed. + * + * Returns 0 on success, -1 otherwise. + */ int qemuMonitorQueryRxFilter(qemuMonitor *mon, const char *alias, virNetDevRxFilter **filter) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a9133793f6..1574723624 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3753,7 +3753,8 @@ qemuMonitorJSONQueryRxFilter(qemuMonitor *mon, const char *alias, if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) return -1; - if (qemuMonitorJSONQueryRxFilterParse(reply, filter) < 0) + if (filter && + qemuMonitorJSONQueryRxFilterParse(reply, filter) < 0) return -1; return 0; -- 2.41.0
On device-update, when user requests change of trustGuestRxFilters we currently do nothing. Nor error out, nor act on the request. While we can just throw an error, implementing this is pretty trivial. Resolves: https://issues.redhat.com/browse/RHEL-735 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_hotplug.c | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4e2fc724c0..75e1d39b60 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3625,6 +3625,43 @@ qemuDomainChangeNetLinkState(virDomainObj *vm, return ret; } +static int +qemuDomainQueryRxFilterDummy(virDomainObj *vm, + virDomainNetDef *dev, + bool trustGuestRxFilters) +{ + qemuDomainObjPrivate *priv = vm->privateData; + + VIR_DEBUG("dev: %s, trustGuestRxFilters: %d", + NULLSTR(dev->info.alias), trustGuestRxFilters); + + /* Transition from "yes" to "no" is simple, just record the new + * setting and processNicRxFilterChangedEvent() will ignore + * NIC_RX_FILTER_CHANGED event. + * Transition from "no" to "yes" requires issuing query-rx-filter + * monitor command to enable the event delivery again. + */ + if (trustGuestRxFilters) { + int rc; + + if (!dev->info.alias) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("can't query rx filters: device alias not found")); + return -1; + } + + qemuDomainObjEnterMonitor(vm); + rc = qemuMonitorQueryRxFilter(priv->mon, dev->info.alias, NULL); + qemuDomainObjExitMonitor(vm); + if (rc < 0) + return -1; + } + + /* modify the device configuration */ + dev->trustGuestRxFilters = trustGuestRxFilters; + return 0; +} + static int qemuDomainChangeNet(virQEMUDriver *driver, virDomainObj *vm, @@ -3644,6 +3681,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, bool needCoalesceChange = false; bool needVlanUpdate = false; bool needIsolatedPortChange = false; + bool needQueryRxFilter = false; int ret = -1; int changeidx = -1; g_autoptr(virConnect) conn = NULL; @@ -3999,6 +4037,11 @@ qemuDomainChangeNet(virQEMUDriver *driver, needIsolatedPortChange = true; } + if (virDomainNetGetActualTrustGuestRxFilters(olddev) != + virDomainNetGetActualTrustGuestRxFilters(newdev)) { + needQueryRxFilter = true; + } + if (olddev->linkstate != newdev->linkstate) needLinkStateChange = true; @@ -4091,6 +4134,14 @@ qemuDomainChangeNet(virQEMUDriver *driver, needReplaceDevDef = true; } + if (needQueryRxFilter) { + if (qemuDomainQueryRxFilterDummy(vm, olddev, + virDomainNetGetActualTrustGuestRxFilters(newdev)) < 0) { + goto cleanup; + } + needReplaceDevDef = true; + } + if (needLinkStateChange && qemuDomainChangeNetLinkState(vm, olddev, newdev->linkstate) < 0) { goto cleanup; -- 2.41.0
On a Tuesday in 2023, Michal Privoznik wrote:
*** BLURB HERE ***
Michal Prívozník (2): qemuMonitorJSONQueryRxFilter: Allow @filter to be NULL qemuDomainChangeNet: Reflect trustGuestRxFilters change
src/qemu/qemu_hotplug.c | 51 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 12 +++++++++ src/qemu/qemu_monitor_json.c | 3 ++- 3 files changed, 65 insertions(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Michal Privoznik