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
This commit is contained in:
parent
3d09c00704
commit
e57e9ae799
@ -96,13 +96,6 @@ static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s)
|
|||||||
rtc_set_memory(s, 0x5d, val >> 16);
|
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)
|
static void create_gpex(MicrovmMachineState *mms)
|
||||||
{
|
{
|
||||||
X86MachineState *x86ms = X86_MACHINE(mms);
|
X86MachineState *x86ms = X86_MACHINE(mms);
|
||||||
@ -163,12 +156,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
|
|||||||
/* Core components */
|
/* Core components */
|
||||||
|
|
||||||
gsi_state = g_malloc0(sizeof(*gsi_state));
|
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);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(),
|
isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(),
|
||||||
&error_abort);
|
&error_abort);
|
||||||
|
Loading…
Reference in New Issue
Block a user