Skip to contentSkip to conversation

system: Enable the device aliases for or1k, too

PATCH In review Philippe Mathieu-Daudé 2 participants 5 messages Jul 5, 2024 – Jul 17, 2024

lore
Share & tools
lore
#0 lore raw

v2 cover system: Enable the device aliases for or1k, too

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(-)
Signature · 1 line
2.41.0
#1 lore raw

PATCH v2 1/2 system: Sort QEMU_ARCH_VIRTIO_PCI definition

Sort the QEMU_ARCH_VIRTIO_PCI to simplify adding/removing entries.

---
 system/qdev-monitor.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
system/qdev-monitor.c +11 -6
index 6af6ef7d66..acdc8b73a3 100644
@@ -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)
 
Signature · 1 line
2.41.0
Reviewed-by on v2 1/2
#2 lore raw

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

Quoted 25 lines · Philippe Mathieu-Daudé

Sort the QEMU_ARCH_VIRTIO_PCI to simplify adding/removing entries.

---
  system/qdev-monitor.c | 17 +++++++++++------
  1 file changed, 11 insertions(+), 6 deletions(-)
system/qdev-monitor.c +4 -6
index 6af6ef7d66..acdc8b73a3 100644
@@ -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 | \

system/qdev-monitor.c typedef struct QDevAlias · line 71

Quoted 10 lines
system/qdev-monitor.c +7 -0
+                              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)
 
#3 lore raw

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

In reply to Philippe Mathieu-Daudé

From: Thomas Huth <[email protected]>

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.

Message-ID: <[email protected]>

---
 system/qdev-monitor.c | 1 +
 1 file changed, 1 insertion(+)
system/qdev-monitor.c +1 -0
index acdc8b73a3..44994ea0e1 100644
@@ -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 | \
Signature · 1 line
2.41.0