[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocat
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation |
Date: |
Thu, 3 Feb 2011 15:55:34 +0100 |
The registers of real IOAPICs can be relocated during runtime (via
chipset registers). We don't support this yet, but qemu-kvm carries the
current base address in its version 2 vmstate.
To align both implementations for migratability, add the proper
infrastructure to accept initial as well as updated base addresses and
include the current address in the vmstate. This is done in a way that
will also allow multiple IOAPICs in the future.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/ioapic.c | 17 +++++++++++++++++
hw/ioapic.h | 4 ++++
hw/pc_piix.c | 5 ++---
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/hw/ioapic.c b/hw/ioapic.c
index c7019f5..b53d436 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -63,6 +63,8 @@ struct IOAPICState {
uint32_t irr;
uint64_t ioredtbl[IOAPIC_NUM_PINS];
+ uint64_t default_base_address;
+ uint64_t current_base_address;
};
static IOAPICState *ioapics[MAX_IOAPICS];
@@ -237,6 +239,7 @@ static int ioapic_pre_load(void *opaque)
/* in case we are loading version 1, set these to sane values */
s->irr = 0;
+ s->current_base_address = s->default_base_address;
return 0;
}
@@ -249,6 +252,7 @@ static const VMStateDescription vmstate_ioapic = {
.fields = (VMStateField []) {
VMSTATE_UINT8(id, IOAPICState),
VMSTATE_UINT8(ioregsel, IOAPICState),
+ VMSTATE_UINT64_V(current_base_address, IOAPICState, 2),
VMSTATE_UINT32_V(irr, IOAPICState, 2),
VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
VMSTATE_END_OF_LIST()
@@ -260,6 +264,8 @@ static void ioapic_reset(DeviceState *d)
IOAPICState *s = DO_UPCAST(IOAPICState, busdev.qdev, d);
int i;
+ s->current_base_address = s->default_base_address;
+ sysbus_mmio_map(&s->busdev, 0, s->current_base_address);
s->id = 0;
s->ioregsel = 0;
s->irr = 0;
@@ -279,6 +285,17 @@ static CPUWriteMemoryFunc * const ioapic_mem_write[3] = {
ioapic_mem_writel,
};
+void ioapic_set_base_address(DeviceState *d, target_phys_addr_t addr)
+{
+ IOAPICState *s = DO_UPCAST(IOAPICState, busdev.qdev, d);
+
+ s->current_base_address = addr;
+ if (!s->default_base_address) {
+ s->default_base_address = addr;
+ }
+ sysbus_mmio_map(&s->busdev, 0, addr);
+}
+
static int ioapic_init1(SysBusDevice *dev)
{
IOAPICState *s = FROM_SYSBUS(IOAPICState, dev);
diff --git a/hw/ioapic.h b/hw/ioapic.h
index c441567..1130d60 100644
--- a/hw/ioapic.h
+++ b/hw/ioapic.h
@@ -17,4 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#define IOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000
+
void ioapic_eio_broadcast(int vector);
+
+void ioapic_set_base_address(DeviceState *d, target_phys_addr_t addr);
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 7b74473..479334f 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -25,6 +25,7 @@
#include "hw.h"
#include "pc.h"
#include "apic.h"
+#include "ioapic.h"
#include "pci.h"
#include "usb-uhci.h"
#include "usb-ohci.h"
@@ -46,13 +47,11 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
static void ioapic_init(IsaIrqState *isa_irq_state)
{
DeviceState *dev;
- SysBusDevice *d;
unsigned int i;
dev = qdev_create(NULL, "ioapic");
qdev_init_nofail(dev);
- d = sysbus_from_qdev(dev);
- sysbus_mmio_map(d, 0, 0xfec00000);
+ ioapic_set_base_address(dev, IOAPIC_DEFAULT_BASE_ADDRESS);
for (i = 0; i < IOAPIC_NUM_PINS; i++) {
isa_irq_state->ioapic[i] = qdev_get_gpio_in(dev, i);
--
1.7.1
- [Qemu-devel] [0.14?][PATCH 0/4] IOAPIC fixes, Jan Kiszka, 2011/02/03
- [Qemu-devel] [0.14?][PATCH 2/4] ioapic: Save/restore irr, Jan Kiszka, 2011/02/03
- [Qemu-devel] [0.14?][PATCH 1/4] ioapic: Implement EOI handling for level-triggered IRQs, Jan Kiszka, 2011/02/03
- [Qemu-devel] [0.14?][PATCH 4/4] ioapic: Style & magics cleanup, Jan Kiszka, 2011/02/03
- [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation,
Jan Kiszka <=
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Blue Swirl, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Jan Kiszka, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Blue Swirl, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Jan Kiszka, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Blue Swirl, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Jan Kiszka, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Blue Swirl, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Jan Kiszka, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Blue Swirl, 2011/02/03
- Re: [Qemu-devel] [0.14?][PATCH 3/4] ioapic: Prepare for base address relocation, Jan Kiszka, 2011/02/03