From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH 12/13] microvm: make virtio irq base runtime configurable
Date: Thu, 19 Mar 2020 09:01:16 +0100 [thread overview]
Message-ID: <20200319080117.7725-13-kraxel@redhat.com> (raw)
In-Reply-To: <20200319080117.7725-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/i386/microvm.h | 2 +-
hw/i386/acpi-build.c | 6 +++---
hw/i386/microvm.c | 11 +++++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h
index 53b2457db752..87828325ec32 100644
--- a/include/hw/i386/microvm.h
+++ b/include/hw/i386/microvm.h
@@ -28,7 +28,6 @@
/* Platform virtio definitions */
#define VIRTIO_MMIO_BASE 0xc0000000
-#define VIRTIO_IRQ_BASE 5
#define VIRTIO_NUM_TRANSPORTS 8
#define VIRTIO_CMDLINE_MAXLEN 64
@@ -61,6 +60,7 @@ typedef struct {
ISADevice *rtc_state;
/* Machine state */
+ uint32_t virtio_irq_base;
bool kernel_cmdline_fixed;
Notifier machine_done;
AcpiDeviceIf *acpi_dev;
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b765c31c80b0..9bddeb77704d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2755,7 +2755,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
return true;
}
-static void acpi_dsdt_add_virtio(Aml *scope)
+static void acpi_dsdt_add_virtio(Aml *scope, MicrovmMachineState *mms)
{
gchar *separator;
long int index;
@@ -2783,7 +2783,7 @@ static void acpi_dsdt_add_virtio(Aml *scope)
continue;
}
- uint32_t irq = VIRTIO_IRQ_BASE + index;
+ uint32_t irq = mms->virtio_irq_base + index;
hwaddr base = VIRTIO_MMIO_BASE + index * 512;
hwaddr size = 512;
@@ -2825,7 +2825,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
aml_append(sb_scope, build_com_device_aml(1, false));
}
acpi_dsdt_add_fw_cfg(sb_scope, OBJECT(x86ms->fw_cfg));
- acpi_dsdt_add_virtio(sb_scope);
+ acpi_dsdt_add_virtio(sb_scope, mms);
aml_append(dsdt, sb_scope);
scope = aml_scope("\\");
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 748f9826fb0e..834b10aee0a2 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -122,10 +122,11 @@ static void microvm_devices_init(MicrovmMachineState *mms)
kvmclock_create();
+ mms->virtio_irq_base = 8;
for (i = 0; i < VIRTIO_NUM_TRANSPORTS; i++) {
sysbus_create_simple("virtio-mmio",
VIRTIO_MMIO_BASE + i * 512,
- x86ms->gsi[VIRTIO_IRQ_BASE + i]);
+ x86ms->gsi[mms->virtio_irq_base + i]);
}
/* Optional and legacy devices */
@@ -265,7 +266,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
x86ms->ioapic_as = &address_space_memory;
}
-static gchar *microvm_get_mmio_cmdline(gchar *name)
+static gchar *microvm_get_mmio_cmdline(gchar *name, uint32_t virtio_irq_base)
{
gchar *cmdline;
gchar *separator;
@@ -285,7 +286,7 @@ static gchar *microvm_get_mmio_cmdline(gchar *name)
ret = g_snprintf(cmdline, VIRTIO_CMDLINE_MAXLEN,
" virtio_mmio.device=512@0x%lx:%ld",
VIRTIO_MMIO_BASE + index * 512,
- VIRTIO_IRQ_BASE + index);
+ virtio_irq_base + index);
if (ret < 0 || ret >= VIRTIO_CMDLINE_MAXLEN) {
g_free(cmdline);
return NULL;
@@ -297,6 +298,7 @@ static gchar *microvm_get_mmio_cmdline(gchar *name)
static void microvm_fix_kernel_cmdline(MachineState *machine)
{
X86MachineState *x86ms = X86_MACHINE(machine);
+ MicrovmMachineState *mms = MICROVM_MACHINE(machine);
BusState *bus;
BusChild *kid;
char *cmdline;
@@ -320,7 +322,8 @@ static void microvm_fix_kernel_cmdline(MachineState *machine)
BusState *mmio_bus = &mmio_virtio_bus->parent_obj;
if (!QTAILQ_EMPTY(&mmio_bus->children)) {
- gchar *mmio_cmdline = microvm_get_mmio_cmdline(mmio_bus->name);
+ gchar *mmio_cmdline = microvm_get_mmio_cmdline
+ (mmio_bus->name, mms->virtio_irq_base);
if (mmio_cmdline) {
char *newcmd = g_strjoin(NULL, cmdline, mmio_cmdline, NULL);
g_free(mmio_cmdline);
--
2.18.2
next prev parent reply other threads:[~2020-03-19 8:04 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 8:01 [PATCH 00/13] microvm: add acpi support Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 01/13] acpi: make build_madt() more generic Gerd Hoffmann
2020-03-19 9:34 ` Philippe Mathieu-Daudé
2020-03-19 8:01 ` [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg() Gerd Hoffmann
2020-03-19 9:36 ` Philippe Mathieu-Daudé
2020-03-19 12:16 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 03/13] microvm: add isa-acpi device Gerd Hoffmann
2020-03-19 13:42 ` Igor Mammedov
2020-03-20 8:22 ` Gerd Hoffmann
2020-03-20 14:54 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 04/13] microvm: add minimal acpi support Gerd Hoffmann
2020-03-19 14:00 ` Igor Mammedov
2020-03-25 9:04 ` Gerd Hoffmann
2020-03-25 18:59 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 05/13] microvm: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-03-19 14:30 ` Igor Mammedov
2020-03-20 8:19 ` Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 06/13] microvm: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 07/13] [testing] seabios: update submodule to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 08/13] [testing] seabios: update config & build rules Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 09/13] [testing] seabios: update binaries to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 10/13] microvm/acpi: add rtc Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 11/13] microvm/acpi: add serial Gerd Hoffmann
2020-03-19 8:01 ` Gerd Hoffmann [this message]
2020-03-19 8:01 ` [PATCH 13/13] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-03-20 15:30 ` Konrad Rzeszutek Wilk
2020-03-23 10:23 ` Gerd Hoffmann
2020-03-19 8:19 ` [PATCH 00/13] microvm: add acpi support no-reply
2020-03-19 8:23 ` no-reply
2020-03-19 8:24 ` no-reply
2020-03-19 8:49 ` Paolo Bonzini
2020-03-19 9:33 ` Gerd Hoffmann
2020-03-19 9:59 ` Paolo Bonzini
2020-03-19 11:28 ` Gerd Hoffmann
2020-03-19 13:40 ` Gerd Hoffmann
2020-03-19 17:34 ` Paolo Bonzini
2020-03-20 8:32 ` Gerd Hoffmann
2020-03-20 10:41 ` Paolo Bonzini
2020-03-23 10:51 ` Michael S. Tsirkin
2020-03-23 12:09 ` Gerd Hoffmann
2020-03-23 12:16 ` Igor Mammedov
2020-03-25 9:16 ` Gerd Hoffmann
2020-03-25 9:53 ` Igor Mammedov
2020-03-25 18:56 ` Igor Mammedov
2020-03-25 12:32 ` Igor Mammedov
2020-03-25 15:03 ` Gerd Hoffmann
2020-03-25 18:44 ` Igor Mammedov
2020-03-26 7:33 ` Michael S. Tsirkin
2020-03-26 10:59 ` Igor Mammedov
2020-03-27 12:06 ` Gerd Hoffmann
2020-03-27 14:05 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200319080117.7725-13-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=slp@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).