[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] microvm: make number of virtio transports runtime changeabl
From: |
Gerd Hoffmann |
Subject: |
[PULL 03/11] microvm: make number of virtio transports runtime changeable |
Date: |
Thu, 10 Dec 2020 13:13:51 +0100 |
This will allow to increase the number of transports in
case we have enough irq lines available for them all.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-5-kraxel@redhat.com
---
include/hw/i386/microvm.h | 2 +-
hw/i386/microvm.c | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h
index 0fc216007777..c5d60bacb5e8 100644
--- a/include/hw/i386/microvm.h
+++ b/include/hw/i386/microvm.h
@@ -52,7 +52,6 @@
/* Platform virtio definitions */
#define VIRTIO_MMIO_BASE 0xfeb00000
-#define VIRTIO_NUM_TRANSPORTS 8
#define VIRTIO_CMDLINE_MAXLEN 64
#define GED_MMIO_BASE 0xfea00000
@@ -98,6 +97,7 @@ struct MicrovmMachineState {
/* Machine state */
uint32_t virtio_irq_base;
+ uint32_t virtio_num_transports;
bool kernel_cmdline_fixed;
Notifier machine_done;
Notifier powerdown_req;
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 5428448b7059..e92f236bf442 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -178,8 +178,13 @@ static void microvm_devices_init(MicrovmMachineState *mms)
kvmclock_create(true);
- mms->virtio_irq_base = x86_machine_is_acpi_enabled(x86ms) ? 16 : 5;
- for (i = 0; i < VIRTIO_NUM_TRANSPORTS; i++) {
+ mms->virtio_irq_base = 5;
+ mms->virtio_num_transports = 8;
+ if (x86_machine_is_acpi_enabled(x86ms)) {
+ mms->virtio_irq_base = 16;
+ }
+
+ for (i = 0; i < mms->virtio_num_transports; i++) {
sysbus_create_simple("virtio-mmio",
VIRTIO_MMIO_BASE + i * 512,
x86ms->gsi[mms->virtio_irq_base + i]);
--
2.27.0
- [PULL 00/11] Microvm 20201210 patches, Gerd Hoffmann, 2020/12/10
- [PULL 03/11] microvm: make number of virtio transports runtime changeable,
Gerd Hoffmann <=
- [PULL 10/11] tests/acpi: update expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 07/11] tests/acpi: allow updates for expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 01/11] x86: rewrite gsi_handler(), Gerd Hoffmann, 2020/12/10
- [PULL 02/11] x86: add support for second ioapic, Gerd Hoffmann, 2020/12/10
- [PULL 04/11] microvm: make pcie irq base runtime changeable, Gerd Hoffmann, 2020/12/10
- [PULL 11/11] tests/acpi: disallow updates for expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 06/11] microvm: add second ioapic, Gerd Hoffmann, 2020/12/10
- [PULL 09/11] tests/acpi: add ioapic2=on test for microvm, Gerd Hoffmann, 2020/12/10
- [PULL 05/11] microvm: drop microvm_gsi_handler(), Gerd Hoffmann, 2020/12/10
- [PULL 08/11] tests/acpi: add data files for ioapic2 test variant, Gerd Hoffmann, 2020/12/10