[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 07/20] microvm: make virtio irq base runtime configurable
From: |
Igor Mammedov |
Subject: |
Re: [PATCH v5 07/20] microvm: make virtio irq base runtime configurable |
Date: |
Fri, 10 Jul 2020 21:09:04 +0200 |
On Tue, 7 Jul 2020 14:53:43 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> include/hw/i386/microvm.h | 2 +-
> hw/i386/microvm.c | 11 +++++++----
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h
> index fd34b78e0d2a..03e735723726 100644
> --- a/include/hw/i386/microvm.h
> +++ b/include/hw/i386/microvm.h
> @@ -27,7 +27,6 @@
>
> /* Platform virtio definitions */
> #define VIRTIO_MMIO_BASE 0xfeb00000
> -#define VIRTIO_IRQ_BASE 5
> #define VIRTIO_NUM_TRANSPORTS 8
> #define VIRTIO_CMDLINE_MAXLEN 64
>
> @@ -57,6 +56,7 @@ typedef struct {
> bool auto_kernel_cmdline;
>
> /* Machine state */
> + uint32_t virtio_irq_base;
> bool kernel_cmdline_fixed;
> } MicrovmMachineState;
>
> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 1300c396947b..ab6ee6c67b1a 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -121,10 +121,11 @@ static void microvm_devices_init(MicrovmMachineState
> *mms)
>
> kvmclock_create();
>
> + mms->virtio_irq_base = 5;
> 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 */
> @@ -227,7 +228,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;
> @@ -247,7 +248,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;
> @@ -259,6 +260,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;
> @@ -282,7 +284,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);
- [PATCH v5 02/20] seabios: add microvm config, update build rules, (continued)
[PATCH v5 03/20] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/07/07
[PATCH v5 14/20] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/07/07
[PATCH v5 20/20] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/07/07
[PATCH v5 07/20] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/07/07
- Re: [PATCH v5 07/20] microvm: make virtio irq base runtime configurable,
Igor Mammedov <=
[PATCH v5 17/20] tests/acpi: allow microvm test data updates., Gerd Hoffmann, 2020/07/07
[PATCH v5 19/20] tests/acpi: add microvm test, Gerd Hoffmann, 2020/07/07
[PATCH v5 13/20] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/07/07
[PATCH v5 12/20] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/07/07
[PATCH v5 16/20] microvm: wire up hotplug, Gerd Hoffmann, 2020/07/07
[PATCH v5 10/20] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/07/07