ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xen-platform: re-structure unplug_disks 

The current code is poorly structured and potentially leads to multiple
config space reads when one is sufficient. Also the UNPLUG_ALL_IDE_DISKS
flag is mis-named since it also results in SCSI disks being unplugged.

This patch renames the flag and re-structures the code to be more
efficient, and readable.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Paul Durrant 2017-01-24 14:05:45 +00:00 committed by Stefano Stabellini
parent 3aca12f841
commit 3d89e3f7e8
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/i386/xen/xen_platform.c
View File

@ -88,7 +88,7 @@ static void log_writeb(PCIXenPlatformState *s, char val)
} }
/* Xen Platform, Fixed IOPort */ /* Xen Platform, Fixed IOPort */
#define UNPLUG_ALL_IDE_DISKS 1 #define UNPLUG_ALL_DISKS 1
#define UNPLUG_ALL_NICS 2 #define UNPLUG_ALL_NICS 2
#define UNPLUG_AUX_IDE_DISKS 4 #define UNPLUG_AUX_IDE_DISKS 4
@ -110,14 +110,21 @@ static void pci_unplug_nics(PCIBus *bus)
static void unplug_disks(PCIBus *b, PCIDevice *d, void *o) static void unplug_disks(PCIBus *b, PCIDevice *d, void *o)
{ {
/* We have to ignore passthrough devices */ /* We have to ignore passthrough devices */
if (pci_get_word(d->config + PCI_CLASS_DEVICE) == if (!strcmp(d->name, "xen-pci-passthrough")) {
PCI_CLASS_STORAGE_IDE return;
&& strcmp(d->name, "xen-pci-passthrough") != 0) { }
switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
case PCI_CLASS_STORAGE_IDE:
pci_piix3_xen_ide_unplug(DEVICE(d)); pci_piix3_xen_ide_unplug(DEVICE(d));
} else if (pci_get_word(d->config + PCI_CLASS_DEVICE) == break;
PCI_CLASS_STORAGE_SCSI
&& strcmp(d->name, "xen-pci-passthrough") != 0) { case PCI_CLASS_STORAGE_SCSI:
object_unparent(OBJECT(d)); object_unparent(OBJECT(d));
break;
default:
break;
} }
} }
@ -134,9 +141,9 @@ static void platform_fixed_ioport_writew(void *opaque, uint32_t addr, uint32_t v
case 0: { case 0: {
PCIDevice *pci_dev = PCI_DEVICE(s); PCIDevice *pci_dev = PCI_DEVICE(s);
/* Unplug devices. Value is a bitmask of which devices to /* Unplug devices. Value is a bitmask of which devices to
unplug, with bit 0 the IDE devices, bit 1 the network unplug, with bit 0 the disk devices, bit 1 the network
devices, and bit 2 the non-primary-master IDE devices. */ devices, and bit 2 the non-primary-master IDE devices. */
if (val & UNPLUG_ALL_IDE_DISKS) { if (val & UNPLUG_ALL_DISKS) {
DPRINTF("unplug disks\n"); DPRINTF("unplug disks\n");
pci_unplug_disks(pci_dev->bus); pci_unplug_disks(pci_dev->bus);
} }