From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 15 Sep 2020 12:08:58 +0000 (+0200)
Subject: microvm/acpi: use GSI 16-23 for virtio
X-Git-Tag: v5.2.0-rc0~107^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55c4b069973196b1d9089162e31f5bd7d9f17630;p=thirdparty%2Fqemu.git

microvm/acpi: use GSI 16-23 for virtio

With ACPI enabled and IO-APIC being properly declared in the ACPI tables
we can use interrupt lines 16-23 for virtio and avoid shared interrupts.

With acpi disabled we continue to use lines 5-12.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-11-kraxel@redhat.com
---

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index e1b86da8a92..ca0c9983f13 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -125,7 +125,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
 
     kvmclock_create();
 
-    mms->virtio_irq_base = 5;
+    mms->virtio_irq_base = x86_machine_is_acpi_enabled(x86ms) ? 16 : 5;
     for (i = 0; i < VIRTIO_NUM_TRANSPORTS; i++) {
         sysbus_create_simple("virtio-mmio",
                              VIRTIO_MMIO_BASE + i * 512,