aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony PERARD <anthony.perard@citrix.com>2010-06-30 17:50:10 +0100
committerAlexander Graf <agraf@suse.de>2011-05-08 10:10:01 +0200
commit9c11a8ac886ccbb5f8e1b08e8ae12f045d783031 (patch)
treebd5add34e3c080354452b94f8cc281756d3f1dae /hw
parent4144530012793e6cd479eaa90cceb1aef0de8158 (diff)
downloadqemu-9c11a8ac886ccbb5f8e1b08e8ae12f045d783031.zip
qemu-9c11a8ac886ccbb5f8e1b08e8ae12f045d783031.tar.gz
qemu-9c11a8ac886ccbb5f8e1b08e8ae12f045d783031.tar.bz2
xen: Introduce Xen Interrupt Controller
Every set_irq call makes a Xen hypercall. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw')
-rw-r--r--hw/pc_piix.c8
-rw-r--r--hw/xen.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 9353b91..62cdf71 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -110,8 +110,12 @@ static void pc_init1(ram_addr_t ram_size,
below_4g_mem_size, above_4g_mem_size);
}
- cpu_irq = pc_allocate_cpu_irq();
- i8259 = i8259_init(cpu_irq[0]);
+ if (!xen_enabled()) {
+ cpu_irq = pc_allocate_cpu_irq();
+ i8259 = i8259_init(cpu_irq[0]);
+ } else {
+ i8259 = xen_interrupt_controller_init();
+ }
isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state));
isa_irq_state->i8259 = i8259;
if (pci_enabled) {
diff --git a/hw/xen.h b/hw/xen.h
index a4096ca..9f00c0b 100644
--- a/hw/xen.h
+++ b/hw/xen.h
@@ -35,6 +35,8 @@ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num);
void xen_piix3_set_irq(void *opaque, int irq_num, int level);
void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len);
+qemu_irq *xen_interrupt_controller_init(void);
+
int xen_init(void);
int xen_hvm_init(void);
void xen_vcpu_init(void);