diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-12-03 11:54:17 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-12-10 08:47:44 +0100 |
| commit | e57e9ae7992bde44d7938ca9a2ec0aa9c5f0bbb6 (patch) | |
| tree | 273596874d73ec22d7d24f9d6a31d1d082319ec8 /hw/i386/microvm.c | |
| parent | 3d09c00704adc1db4769cfa6291d96842f9674f1 (diff) | |
| download | focaccia-qemu-e57e9ae7992bde44d7938ca9a2ec0aa9c5f0bbb6.tar.gz focaccia-qemu-e57e9ae7992bde44d7938ca9a2ec0aa9c5f0bbb6.zip | |
microvm: drop microvm_gsi_handler()
With the improved gsi_handler() we don't need our private version any more. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Sergio Lopez <slp@redhat.com> Message-id: 20201203105423.10431-7-kraxel@redhat.com
Diffstat (limited to 'hw/i386/microvm.c')
| -rw-r--r-- | hw/i386/microvm.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 5e4182b474..829b376a12 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -96,13 +96,6 @@ static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s) rtc_set_memory(s, 0x5d, val >> 16); } -static void microvm_gsi_handler(void *opaque, int n, int level) -{ - GSIState *s = opaque; - - qemu_set_irq(s->ioapic_irq[n], level); -} - static void create_gpex(MicrovmMachineState *mms) { X86MachineState *x86ms = X86_MACHINE(mms); @@ -163,12 +156,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) /* Core components */ gsi_state = g_malloc0(sizeof(*gsi_state)); - if (mms->pic == ON_OFF_AUTO_ON || mms->pic == ON_OFF_AUTO_AUTO) { - x86ms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); - } else { - x86ms->gsi = qemu_allocate_irqs(microvm_gsi_handler, - gsi_state, GSI_NUM_PINS); - } + x86ms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(), &error_abort); |