[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] acpi_piix4: Only allow writes to PCI hotplug ej
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 2/6] acpi_piix4: Only allow writes to PCI hotplug eject register |
Date: |
Tue, 06 Mar 2012 17:14:13 -0700 |
User-agent: |
StGIT/0.14.3 |
This is never read. We can also derive bus from the write handler,
which later makes this easier to call directly. Note that pciej_write
was actually called with (PCIBus *)dev->bus, which is cast as a void*
allowing us to pretend it's a BusState*. Fix this so we don't depend
on the BusState location within PCIBus.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/acpi_piix4.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 5960b7f..4d88e23 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -489,15 +489,11 @@ static uint32_t pci_updown_read(void *opaque, uint32_t
addr)
return val;
}
-static uint32_t pciej_read(void *opaque, uint32_t addr)
-{
- PIIX4_DPRINTF("pciej read %x\n", addr);
- return 0;
-}
-
static void pciej_write(void *opaque, uint32_t addr, uint32_t val)
{
- BusState *bus = opaque;
+ PIIX4PMState *s = opaque;
+ PCIDevice *dev = &s->dev;
+ BusState *bus = qdev_get_parent_bus(&dev->qdev);
DeviceState *qdev, *next;
int slot = ffs(val) - 1;
@@ -548,8 +544,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus,
PIIX4PMState *s)
register_ioport_read(PCI_UP_BASE, 8, 4, pci_updown_read, s);
- register_ioport_write(PCI_EJ_BASE, 4, 4, pciej_write, bus);
- register_ioport_read(PCI_EJ_BASE, 4, 4, pciej_read, bus);
+ register_ioport_write(PCI_EJ_BASE, 4, 4, pciej_write, s);
register_ioport_write(PCI_RMV_BASE, 4, 4, pcirmv_write, s);
register_ioport_read(PCI_RMV_BASE, 4, 4, pcirmv_read, s);
- [Qemu-devel] [PATCH 0/6] PCI hotplug improvements, Alex Williamson, 2012/03/06
- [Qemu-devel] [PATCH 2/6] acpi_piix4: Only allow writes to PCI hotplug eject register,
Alex Williamson <=
- [Qemu-devel] [PATCH 1/6] acpi_piix4: Disallow write to up/down PCI hotplug registers, Alex Williamson, 2012/03/06
- [Qemu-devel] [PATCH 3/6] pci: Add notifier for device probing, Alex Williamson, 2012/03/06
- [Qemu-devel] [PATCH 4/6] acpi_piix4: Track PCI hotplug status and allow non-ACPI remove path, Alex Williamson, 2012/03/06
- [Qemu-devel] [PATCH 5/6] acpi_piix4: Use pci_get/set_byte, Alex Williamson, 2012/03/06
- [Qemu-devel] [PATCH 6/6] api_piix4: Remove PCI_RMV_BASE write code, Alex Williamson, 2012/03/06
- Re: [Qemu-devel] [PATCH 0/6] PCI hotplug improvements, Gleb Natapov, 2012/03/07