[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 6/9] pc: attach ioapic to the QOM composition tr
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [RFC PATCH 6/9] pc: attach ioapic to the QOM composition tree |
Date: |
Wed, 18 Jan 2012 11:33:11 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/pc_piix.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 2aba89c..3f92bf9 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -54,7 +54,7 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
-static void ioapic_init(GSIState *gsi_state)
+static DeviceState *ioapic_init(GSIState *gsi_state)
{
DeviceState *dev;
SysBusDevice *d;
@@ -68,6 +68,7 @@ static void ioapic_init(GSIState *gsi_state)
for (i = 0; i < IOAPIC_NUM_PINS; i++) {
gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
}
+ return dev;
}
/* PC hardware initialisation */
@@ -168,7 +169,9 @@ static void pc_init1(MemoryRegion *system_memory,
gsi_state->i8259_irq[i] = i8259[i];
}
if (pci_enabled) {
- ioapic_init(gsi_state);
+ dev = ioapic_init(gsi_state);
+ qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL),
+ "ioapic", dev, NULL);
}
pc_register_ferr_irq(gsi[13]);
--
1.7.7.1
- [Qemu-devel] [RFC PATCH 0/9] qtest fixes and alternative IRQ intercept proposal, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 1/9] qtest: always send a response, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 3/9] qtest: fix Makefile, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 2/9] qtest: enable echo, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 4/9] rtc-test: fix set_alarm_time, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 6/9] pc: attach ioapic to the QOM composition tree,
Paolo Bonzini <=
- [Qemu-devel] [RFC PATCH 7/9] qtest: IRQ interception infrastructure, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 5/9] qtest: do not use TCG CPU threads, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 8/9] libqtest: add IRQ intercept commands, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 9/9] rtc-test: add IRQ intercept, Paolo Bonzini, 2012/01/18
- [Qemu-devel] [RFC PATCH 10/9] qtest: add clock management, Paolo Bonzini, 2012/01/18