xen: Introduce Xen Interrupt Controller

Every set_irq call makes a Xen hypercall.

Signed-off-by: Anthony PERARD <[email protected]>
Signed-off-by: Stefano Stabellini <[email protected]>
Signed-off-by: Alexander Graf <[email protected]>

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 9353b911004525c09902a4de9aafe9107f917461..62cdf71daa94b2557370e8e7dd837ef4661b4f0a 100644 (file)
--- 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 a4096cadfd97d9f54494439e140f25e9cdadbebb..9f00c0bfedfc5c33bc698bb900fc3fc10405e39e 100644 (file)
--- 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);

diff --git a/xen-all.c b/xen-all.c
index acb051cffc4cbe04e93af352d91ce214a1a23c3f..bb809eff16cdf05f309add9dbbe476dc20d2af8f 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -40,6 +40,18 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
     }
 }
 
+/* Xen Interrupt Controller */
+
+static void xen_set_irq(void *opaque, int irq, int level)
+{
+    xc_hvm_set_isa_irq_level(xen_xc, xen_domid, irq, level);
+}
+
+qemu_irq *xen_interrupt_controller_init(void)
+{
+    return qemu_allocate_irqs(xen_set_irq, NULL, 16);
+}
+
 /* VCPU Operations, MMIO, IO ring ... */
 
 static void xen_reset_vcpu(void *opaque)

diff --git a/xen-stub.c b/xen-stub.c
index dc90f108c3b03b3ad5e2052c8e802a309dcefb7d..3a8449c148100eec7e6cb00d8aad807db7162a6c 100644 (file)
--- a/xen-stub.c
+++ b/xen-stub.c
@@ -22,6 +22,11 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
 {
 }
 
+qemu_irq *xen_interrupt_controller_init(void)
+{
+    return NULL;
+}
+
 int xen_init(void)
 {
     return -ENOSYS;