[PATCH v2 0/2] system: Enable the device aliases for or1k, too

[PATCH v2 0/2] system: Enable the device aliases for or1k, too

[Philippe Mathieu-Daudé]

Respin of Thomas' v1 sorting the definition first.

Philippe Mathieu-Daudé (1):
  system: Sort QEMU_ARCH_VIRTIO_PCI definition

Thomas Huth (1):
  system: Enable the device aliases for or1k, too

 system/qdev-monitor.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

-- 
2.41.0

[PATCH v2 1/2] system: Sort QEMU_ARCH_VIRTIO_PCI definition

[Philippe Mathieu-Daudé]

Sort the QEMU_ARCH_VIRTIO_PCI to simplify adding/removing entries.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 system/qdev-monitor.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index 6af6ef7d66..acdc8b73a3 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -55,12 +55,17 @@ typedef struct QDevAlias
 } QDevAlias;
 
 /* default virtio transport per architecture */
-#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \
-                              QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \
-                              QEMU_ARCH_MIPS | QEMU_ARCH_PPC |  \
-                              QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \
-                              QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA | \
-                              QEMU_ARCH_LOONGARCH)
+#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | \
+                              QEMU_ARCH_ARM | \
+                              QEMU_ARCH_HPPA | \
+                              QEMU_ARCH_I386 | \
+                              QEMU_ARCH_LOONGARCH | \
+                              QEMU_ARCH_MIPS | \
+                              QEMU_ARCH_PPC | \
+                              QEMU_ARCH_RISCV | \
+                              QEMU_ARCH_SH4 | \
+                              QEMU_ARCH_SPARC | \
+                              QEMU_ARCH_XTENSA)
 #define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X)
 #define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K)
 
-- 
2.41.0

[PATCH v2 2/2] system: Enable the device aliases for or1k, too

[Philippe Mathieu-Daudé]

From: Thomas Huth <thuth@redhat.com>

Now that we've got a "virt" machine for or1k that supports PCI
too (commit 40fef82c4e "hw/openrisc: Add PCI bus support to virt")
we can also enable the virtio device aliases like we do on other
similar platforms. This will e.g. help to run the iotests with
qemu-system-or1k later.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240705090808.1305765-1-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 system/qdev-monitor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index acdc8b73a3..44994ea0e1 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -61,6 +61,7 @@ typedef struct QDevAlias
                               QEMU_ARCH_I386 | \
                               QEMU_ARCH_LOONGARCH | \
                               QEMU_ARCH_MIPS | \
+                              QEMU_ARCH_OPENRISC | \
                               QEMU_ARCH_PPC | \
                               QEMU_ARCH_RISCV | \
                               QEMU_ARCH_SH4 | \
-- 
2.41.0

Re: [PATCH v2 1/2] system: Sort QEMU_ARCH_VIRTIO_PCI definition

[Pierrick Bouvier]

On 7/5/24 05:45, Philippe Mathieu-Daudé wrote:
> Sort the QEMU_ARCH_VIRTIO_PCI to simplify adding/removing entries.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   system/qdev-monitor.c | 17 +++++++++++------
>   1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
> index 6af6ef7d66..acdc8b73a3 100644
> --- a/system/qdev-monitor.c
> +++ b/system/qdev-monitor.c
> @@ -55,12 +55,17 @@ typedef struct QDevAlias
>   } QDevAlias;
>   
>   /* default virtio transport per architecture */
> -#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \
> -                              QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \
> -                              QEMU_ARCH_MIPS | QEMU_ARCH_PPC |  \
> -                              QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \
> -                              QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA | \
> -                              QEMU_ARCH_LOONGARCH)
> +#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | \
> +                              QEMU_ARCH_ARM | \
> +                              QEMU_ARCH_HPPA | \
> +                              QEMU_ARCH_I386 | \
> +                              QEMU_ARCH_LOONGARCH | \
> +                              QEMU_ARCH_MIPS | \
> +                              QEMU_ARCH_PPC | \
> +                              QEMU_ARCH_RISCV | \
> +                              QEMU_ARCH_SH4 | \
> +                              QEMU_ARCH_SPARC | \
> +                              QEMU_ARCH_XTENSA)
>   #define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X)
>   #define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K)
>   

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 0/2] system: Enable the device aliases for or1k, too

[Philippe Mathieu-Daudé]

> Philippe Mathieu-Daudé (1):
>    system: Sort QEMU_ARCH_VIRTIO_PCI definition
> 
> Thomas Huth (1):
>    system: Enable the device aliases for or1k, too

Thanks, series queued.