From: David Woodhouse <dwmw2@infradead.org>
To: <qemu-devel@nongnu.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Jason Wang" <jasowang@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
qemu-block@nongnu.org, xen-devel@lists.xenproject.org,
kvm@vger.kernel.org
Subject: [PATCH v4 11/17] hw/xen: only remove peers of PCI NICs on unplug
Date: Mon, 6 Nov 2023 14:35:01 +0000 [thread overview]
Message-ID: <20231106143507.1060610-12-dwmw2@infradead.org> (raw)
In-Reply-To: <20231106143507.1060610-1-dwmw2@infradead.org>
From: David Woodhouse <dwmw@amazon.co.uk>
When the Xen guest asks to unplug *emulated* NICs, it's kind of unhelpful
also to unplug the peer of the *Xen* PV NIC.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/xen/xen_platform.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 17457ff3de..e2dd1b536a 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -140,9 +140,14 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
/* Remove the peer of the NIC device. Normally, this would be a tap device. */
static void del_nic_peer(NICState *nic, void *opaque)
{
- NetClientState *nc;
+ NetClientState *nc = qemu_get_queue(nic);
+ ObjectClass *klass = module_object_class_by_name(nc->model);
+
+ /* Only delete peers of PCI NICs that we're about to delete */
+ if (!klass || !object_class_dynamic_cast(klass, TYPE_PCI_DEVICE)) {
+ return;
+ }
- nc = qemu_get_queue(nic);
if (nc->peer)
qemu_del_net_client(nc->peer);
}
--
2.34.1
next prev parent reply other threads:[~2023-11-06 14:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 14:34 [PATCH v4 00/17] Get Xen PV shim running in QEMU, add net and console David Woodhouse
2023-11-06 14:34 ` [PATCH v4 01/17] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer() David Woodhouse
2023-11-06 14:34 ` [PATCH v4 02/17] hw/xen: Clean up event channel 'type_val' handling to use union David Woodhouse
2023-11-06 14:34 ` [PATCH v4 03/17] include: update Xen public headers to Xen 4.17.2 release David Woodhouse
2023-11-06 14:34 ` [PATCH v4 04/17] i386/xen: advertise XEN_HVM_CPUID_UPCALL_VECTOR in CPUID David Woodhouse
2023-11-06 14:34 ` [PATCH v4 05/17] hw/xen: populate store frontend nodes with XenStore PFN/port David Woodhouse
2023-11-06 14:34 ` [PATCH v4 06/17] hw/xen: automatically assign device index to block devices David Woodhouse
2023-11-06 15:58 ` Paul Durrant
2023-11-06 14:34 ` [PATCH v4 07/17] hw/xen: add get_frontend_path() method to XenDeviceClass David Woodhouse
2023-11-06 14:34 ` [PATCH v4 08/17] hw/xen: do not repeatedly try to create a failing backend device David Woodhouse
2023-11-06 14:34 ` [PATCH v4 09/17] hw/xen: update Xen console to XenDevice model David Woodhouse
2023-11-06 14:35 ` [PATCH v4 10/17] hw/xen: add support for Xen primary console in emulated mode David Woodhouse
2023-11-06 14:35 ` David Woodhouse [this message]
2023-11-06 14:35 ` [PATCH v4 12/17] hw/xen: update Xen PV NIC to XenDevice model David Woodhouse
2023-11-06 14:35 ` [PATCH v4 13/17] hw/i386/pc: support '-nic' for xen-net-device David Woodhouse
2023-11-06 16:01 ` Paul Durrant
2023-11-06 14:35 ` [PATCH v4 14/17] net: do not delete nics in net_cleanup() David Woodhouse
2023-11-07 9:26 ` David Woodhouse
2023-11-06 14:35 ` [PATCH v4 15/17] xen-platform: unplug AHCI disks David Woodhouse
2023-11-06 14:35 ` [PATCH v4 16/17] doc/sphinx/hxtool.py: add optional label argument to SRST directive David Woodhouse
2023-11-06 16:06 ` Paul Durrant
2023-11-07 9:25 ` David Woodhouse
2023-11-06 14:35 ` [PATCH v4 17/17] docs: update Xen-on-KVM documentation David Woodhouse
2023-11-06 16:10 ` Paul Durrant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231106143507.1060610-12-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=anthony.perard@citrix.com \
--cc=eduardo@habkost.net \
--cc=hreitz@redhat.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).