[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 1/8] sii3112: Remove unneeded exit function
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 1/8] sii3112: Remove unneeded exit function |
Date: |
Mon, 19 Mar 2018 11:35:17 +1100 |
From: BALATON Zoltan <address@hidden>
An exit function was mistakenly left here but it's not needed because
the PCI bars are organised differently in this device. Calling this
exit function during device_del was causing an abort with
memory_region_del_subregion: `Assertion subregion->container == mr' failed.
Reported-by: Thomas Huth <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ide/sii3112.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index e3896c65b4..743a50ed51 100644
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -327,17 +327,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error
**errp)
qemu_register_reset(sii3112_reset, s);
}
-static void sii3112_pci_exitfn(PCIDevice *dev)
-{
- PCIIDEState *d = PCI_IDE(dev);
- int i;
-
- for (i = 0; i < 2; ++i) {
- memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].extra_io);
- memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].addr_ioport);
- }
-}
-
static void sii3112_pci_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -348,7 +337,6 @@ static void sii3112_pci_class_init(ObjectClass *klass, void
*data)
pd->class_id = PCI_CLASS_STORAGE_RAID;
pd->revision = 1;
pd->realize = sii3112_pci_realize;
- pd->exit = sii3112_pci_exitfn;
dc->desc = "SiI3112A SATA controller";
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
--
2.14.3
- [Qemu-ppc] [PULL 0/8] ppc-for-2.12 queue 20180319, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 6/8] hw/ppc/spapr: Allow "spapr-vlan" as NIC model name beside "ibmveth", David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 3/8] hw/ppc/prep: Fix implicit creation of "-drive if=scsi" devices, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 4/8] hw/misc/macio: Mark the macio devices with user_creatable = false, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 2/8] tests/boot-serial: Check the 40p machine, too, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 7/8] ppc440_pcix: Change some error_report to qemu_log_mask(LOG_UNIMP, ...), David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 8/8] target/ppc: fix tlbsync to check privilege level depending on GTSE, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 5/8] PPC e500: Fix gap between u-boot and kernel, David Gibson, 2018/03/18
- [Qemu-ppc] [PULL 1/8] sii3112: Remove unneeded exit function,
David Gibson <=
- Re: [Qemu-ppc] [PULL 0/8] ppc-for-2.12 queue 20180319, Peter Maydell, 2018/03/19