[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/18] acpi.c: make qemu_system_device_hot_add piix
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 01/18] acpi.c: make qemu_system_device_hot_add piix independent. |
Date: |
Thu, 18 Jun 2009 19:57:00 +0900 |
introruce piix4_device_hot_add() for piix4 specific code
and make qemu_system_device_hot_add() generic.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/acpi.c | 20 ++++++++++++++++++--
hw/pc.c | 2 +-
hw/pc.h | 7 +++++--
sysemu.h | 3 ++-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index fccae69..5928fe7 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -714,7 +714,9 @@ static void pciej_write(void *opaque, uint32_t addr,
uint32_t val)
#endif
}
-void qemu_system_hot_add_init(void)
+static void piix4_device_hot_add(int bus, int slot, int state);
+
+void piix4_acpi_system_hot_add_init(void)
{
register_ioport_write(GPE_BASE, 4, 1, gpe_writeb, &gpe);
register_ioport_read(GPE_BASE, 4, 1, gpe_readb, &gpe);
@@ -724,6 +726,8 @@ void qemu_system_hot_add_init(void)
register_ioport_write(PCI_EJ_BASE, 4, 4, pciej_write, NULL);
register_ioport_read(PCI_EJ_BASE, 4, 4, pciej_read, NULL);
+
+ qemu_system_device_hot_add_register(piix4_device_hot_add);
}
static void enable_device(struct pci_status *p, struct gpe_regs *g, int slot)
@@ -738,7 +742,7 @@ static void disable_device(struct pci_status *p, struct
gpe_regs *g, int slot)
p->down |= (1 << slot);
}
-void qemu_system_device_hot_add(int bus, int slot, int state)
+static void piix4_device_hot_add(int bus, int slot, int state)
{
pci0_status.up = 0;
pci0_status.down = 0;
@@ -752,6 +756,18 @@ void qemu_system_device_hot_add(int bus, int slot, int
state)
}
}
+static qemu_system_device_hot_add_t device_hot_add_callback;
+void qemu_system_device_hot_add_register(qemu_system_device_hot_add_t callback)
+{
+ device_hot_add_callback = callback;
+}
+
+void qemu_system_device_hot_add(int pcibus, int slot, int state)
+{
+ if (device_hot_add_callback)
+ device_hot_add_callback(pcibus, slot, state);
+}
+
struct acpi_table_header
{
char signature [4]; /* ACPI signature (4 ASCII characters) */
diff --git a/hw/pc.c b/hw/pc.c
index 143b697..a848d8d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1066,7 +1066,7 @@ static void pc_init1(ram_addr_t ram_size,
pci_nic_init(pci_bus, nd, -1, "ne2k_pci");
}
- qemu_system_hot_add_init();
+ piix4_acpi_system_hot_add_init();
if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
fprintf(stderr, "qemu: too many IDE bus\n");
diff --git a/hw/pc.h b/hw/pc.h
index 0afffa2..9fbae20 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -108,11 +108,14 @@ extern int acpi_enabled;
extern char *acpi_tables;
extern size_t acpi_tables_len;
+void acpi_bios_init(void);
+int acpi_table_add(const char *table_desc);
+
+/* acpi_piix.c */
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq);
void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
-void acpi_bios_init(void);
-int acpi_table_add(const char *table_desc);
+void piix4_acpi_system_hot_add_init(void);
/* hpet.c */
extern int no_hpet;
diff --git a/sysemu.h b/sysemu.h
index fe24415..403b35e 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -194,7 +194,8 @@ extern int drive_add(const char *file, const char *fmt,
...);
extern int drive_init(struct drive_opt *arg, int snapshot, void *machine);
/* acpi */
-void qemu_system_hot_add_init(void);
+typedef void (*qemu_system_device_hot_add_t)(int pcibus, int slot, int state);
+void qemu_system_device_hot_add_register(qemu_system_device_hot_add_t
callback);
void qemu_system_device_hot_add(int pcibus, int slot, int state);
/* device-hotplug */
--
1.6.0.2
- [Qemu-devel] [PATCH 00/18] split out piix specific part from pc emulator., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 07/18] pc.c: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 08/18] pc.c: remove unnecessary global variables, pit and ioapic.., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 04/18] acpi.c: make qemu_system_powerdown() piix independent., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 02/18] acpi.c: split out pc smbus routines from acpi.c into pc_smbus.c, Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 01/18] acpi.c: make qemu_system_device_hot_add piix independent.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH 05/18] acpi: add acpi constants from linux header files and use them., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 03/18] acpi.c: split out apm register emulation., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 09/18] pc.c: remove a global variable, floppy_controller., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 13/18] pc.c: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 11/18] pc.c: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 14/18] pc.c: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 06/18] acpi.c: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 10/18] pc.c: remove a global variable, RTCState *rtc_state., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 18/18] pc.c: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/06/18