mirror of
https://git.proxmox.com/git/pve-qemu
synced 2025-08-15 22:25:11 +00:00
903a63402e
Includes fixes for VirtIO-net, ARM and x86(_64) emulation, CVEs to harden NBD server against malicious clients, as well as a few others (VNC, physmem, Intel IOMMU, ...). Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: David Woodhouse <dwmw@amazon.co.uk>
|
|
Date: Tue, 6 Aug 2024 18:21:37 +0100
|
|
Subject: [PATCH] net: Fix '-net nic,model=' for non-help arguments
|
|
|
|
Oops, don't *delete* the model option when checking for 'help'.
|
|
|
|
Fixes: 64f75f57f9d2 ("net: Reinstate '-net nic, model=help' output as documented in man page")
|
|
Reported-by: Hans <sungdgdhtryrt@gmail.com>
|
|
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
(cherry picked from commit fa62cb989a9146c82f8f172715042852f5d36200)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
net/net.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/net/net.c b/net/net.c
|
|
index e6ca2529bb..897bb936cf 100644
|
|
--- a/net/net.c
|
|
+++ b/net/net.c
|
|
@@ -1748,7 +1748,7 @@ void net_check_clients(void)
|
|
|
|
static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
|
|
{
|
|
- const char *model = qemu_opt_get_del(opts, "model");
|
|
+ const char *model = qemu_opt_get(opts, "model");
|
|
|
|
if (is_nic_model_help_option(model)) {
|
|
return 0;
|