Anthony PERARD
2012-Sep-19 11:05 UTC
[PATCH] xen: Fix, no unplug of pt device by platform device.
The Xen platform device will unplug any NICs if requested by the guest (PVonHVM)
including a NIC that would have been passthrough. This patch makes sure that a
passthrough device will not be unplug.
Reported-by: "Zhang, Yang Z" <yang.z.zhang@intel.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
hw/xen_platform.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 0d6c2ff..956dbfe 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -85,8 +85,10 @@ static void log_writeb(PCIXenPlatformState *s, char val)
static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
{
+ /* We have to ignore passthrough devices */
if (pci_get_word(d->config + PCI_CLASS_DEVICE) =-
PCI_CLASS_NETWORK_ETHERNET) {
+ PCI_CLASS_NETWORK_ETHERNET
+ && strcmp(d->name, "xen-pci-passthrough") !=
0) {
qdev_free(&d->qdev);
}
}
@@ -98,8 +100,10 @@ static void pci_unplug_nics(PCIBus *bus)
static void unplug_disks(PCIBus *b, PCIDevice *d, void *o)
{
+ /* We have to ignore passthrough devices */
if (pci_get_word(d->config + PCI_CLASS_DEVICE) =-
PCI_CLASS_STORAGE_IDE) {
+ PCI_CLASS_STORAGE_IDE
+ && strcmp(d->name, "xen-pci-passthrough") !=
0) {
qdev_unplug(&(d->qdev), NULL);
}
}
--
Anthony PERARD
Stefano Stabellini
2012-Sep-19 13:06 UTC
Re: [PATCH] xen: Fix, no unplug of pt device by platform device.
On Wed, 19 Sep 2012, Anthony PERARD wrote:> The Xen platform device will unplug any NICs if requested by the guest (PVonHVM) > including a NIC that would have been passthrough. This patch makes sure that a > passthrough device will not be unplug. > > Reported-by: "Zhang, Yang Z" <yang.z.zhang@intel.com> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> >Zhang, does it this patch fix the problem for you?> hw/xen_platform.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/hw/xen_platform.c b/hw/xen_platform.c > index 0d6c2ff..956dbfe 100644 > --- a/hw/xen_platform.c > +++ b/hw/xen_platform.c > @@ -85,8 +85,10 @@ static void log_writeb(PCIXenPlatformState *s, char val) > > static void unplug_nic(PCIBus *b, PCIDevice *d, void *o) > { > + /* We have to ignore passthrough devices */ > if (pci_get_word(d->config + PCI_CLASS_DEVICE) => - PCI_CLASS_NETWORK_ETHERNET) { > + PCI_CLASS_NETWORK_ETHERNET > + && strcmp(d->name, "xen-pci-passthrough") != 0) { > qdev_free(&d->qdev); > } > } > @@ -98,8 +100,10 @@ static void pci_unplug_nics(PCIBus *bus) > > static void unplug_disks(PCIBus *b, PCIDevice *d, void *o) > { > + /* We have to ignore passthrough devices */ > if (pci_get_word(d->config + PCI_CLASS_DEVICE) => - PCI_CLASS_STORAGE_IDE) { > + PCI_CLASS_STORAGE_IDE > + && strcmp(d->name, "xen-pci-passthrough") != 0) { > qdev_unplug(&(d->qdev), NULL); > } > } > -- > Anthony PERARD >