1. Patchew
  2. QEMU
  3. View series

[PATCH] tests/libqos: Add loongarch virt machine node

Bibo Mao posted 1 patch 6 months, 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240514115149.3266369-1-maobibo@loongson.cn
Maintainers: Song Gao <gaosong@loongson.cn>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
There is a newer version of this series
hw/loongarch/virt.c                         |   2 +
tests/qtest/libqos/loongarch-virt-machine.c | 114 ++++++++++++++++++++
tests/qtest/libqos/meson.build              |   1 +
3 files changed, 117 insertions(+)
create mode 100644 tests/qtest/libqos/loongarch-virt-machine.c
[PATCH] tests/libqos: Add loongarch virt machine node
Posted by Bibo Mao 6 months, 2 weeks ago 
Add loongarch virt machine to the graph. It is a modified copy of
the existing riscv virtmachine in riscv-virt-machine.c

It contains a generic-pcihost controller, and an extra function
loongarch_config_qpci_bus() to configure GPEX pci host controller
information, such as ecam and pio_base addresses.

Also hotplug handle checking about TYPE_VIRTIO_IOMMU_PCI device is
added on loongarch virt machine, since virtio_mmu_pci device requires
it.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c                         |   2 +
 tests/qtest/libqos/loongarch-virt-machine.c | 114 ++++++++++++++++++++
 tests/qtest/libqos/meson.build              |   1 +
 3 files changed, 117 insertions(+)
 create mode 100644 tests/qtest/libqos/loongarch-virt-machine.c

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index db43b2fe4b..7f5ef87be4 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -45,6 +45,7 @@
 #include "sysemu/tpm.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/flash.h"
+#include "hw/virtio/virtio-iommu.h"
 #include "qemu/error-report.h"
 
 static PFlashCFI01 *virt_flash_create1(LoongArchVirtMachineState *lvms,
@@ -1212,6 +1213,7 @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
     MachineClass *mc = MACHINE_GET_CLASS(machine);
 
     if (device_is_dynamic_sysbus(mc, dev) ||
+        object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
         memhp_type_supported(dev)) {
         return HOTPLUG_HANDLER(machine);
     }
diff --git a/tests/qtest/libqos/loongarch-virt-machine.c b/tests/qtest/libqos/loongarch-virt-machine.c
new file mode 100644
index 0000000000..c12089c015
--- /dev/null
+++ b/tests/qtest/libqos/loongarch-virt-machine.c
@@ -0,0 +1,114 @@
+/*
+ * libqos driver framework
+ *
+ * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "qemu/osdep.h"
+#include "../libqtest.h"
+#include "qemu/module.h"
+#include "libqos-malloc.h"
+#include "qgraph.h"
+#include "virtio-mmio.h"
+#include "generic-pcihost.h"
+#include "hw/pci/pci_regs.h"
+
+#define LOONGARCH_PAGE_SIZE               0x1000
+#define LOONGARCH_VIRT_RAM_ADDR           0x100000
+#define LOONGARCH_VIRT_RAM_SIZE           0xFF00000
+
+#define LOONGARCH_VIRT_PIO_BASE           0x18000000
+#define LOONGARCH_VIRT_PCIE_PIO_OFFSET    0x4000
+#define LOONGARCH_VIRT_PCIE_PIO_LIMIT     0x10000
+#define LOONGARCH_VIRT_PCIE_ECAM_BASE     0x20000000
+#define LOONGARCH_VIRT_PCIE_MMIO32_BASE   0x40000000
+#define LOONGARCH_VIRT_PCIE_MMIO32_LIMIT  0x80000000
+
+typedef struct QVirtMachine QVirtMachine;
+
+struct QVirtMachine {
+    QOSGraphObject obj;
+    QGuestAllocator alloc;
+    QVirtioMMIODevice virtio_mmio;
+    QGenericPCIHost bridge;
+};
+
+static void virt_destructor(QOSGraphObject *obj)
+{
+    QVirtMachine *machine = (QVirtMachine *) obj;
+    alloc_destroy(&machine->alloc);
+}
+
+static void *virt_get_driver(void *object, const char *interface)
+{
+    QVirtMachine *machine = object;
+    if (!g_strcmp0(interface, "memory")) {
+        return &machine->alloc;
+    }
+
+    fprintf(stderr, "%s not present in loongarch/virtio\n", interface);
+    g_assert_not_reached();
+}
+
+static QOSGraphObject *virt_get_device(void *obj, const char *device)
+{
+    QVirtMachine *machine = obj;
+    if (!g_strcmp0(device, "generic-pcihost")) {
+        return &machine->bridge.obj;
+    } else if (!g_strcmp0(device, "virtio-mmio")) {
+        return &machine->virtio_mmio.obj;
+    }
+
+    fprintf(stderr, "%s not present in loongarch/virt\n", device);
+    g_assert_not_reached();
+}
+
+static void loongarch_config_qpci_bus(QGenericPCIBus *qpci)
+{
+    qpci->gpex_pio_base = LOONGARCH_VIRT_PIO_BASE;
+    qpci->bus.pio_alloc_ptr = LOONGARCH_VIRT_PCIE_PIO_OFFSET;
+    qpci->bus.pio_limit = LOONGARCH_VIRT_PCIE_PIO_LIMIT;
+    qpci->bus.mmio_alloc_ptr = LOONGARCH_VIRT_PCIE_MMIO32_BASE;
+    qpci->bus.mmio_limit = LOONGARCH_VIRT_PCIE_MMIO32_LIMIT;
+    qpci->ecam_alloc_ptr = LOONGARCH_VIRT_PCIE_ECAM_BASE;
+}
+
+static void *qos_create_machine_loongarch_virt(QTestState *qts)
+{
+    QVirtMachine *machine = g_new0(QVirtMachine, 1);
+
+    alloc_init(&machine->alloc, 0,
+               LOONGARCH_VIRT_RAM_ADDR,
+               LOONGARCH_VIRT_RAM_ADDR + LOONGARCH_VIRT_RAM_SIZE,
+               LOONGARCH_PAGE_SIZE);
+
+    qos_create_generic_pcihost(&machine->bridge, qts, &machine->alloc);
+    loongarch_config_qpci_bus(&machine->bridge.pci);
+
+    machine->obj.get_device = virt_get_device;
+    machine->obj.get_driver = virt_get_driver;
+    machine->obj.destructor = virt_destructor;
+    return machine;
+}
+
+static void virt_machine_register_nodes(void)
+{
+    qos_node_create_machine_args("loongarch64/virt",
+                                 qos_create_machine_loongarch_virt,
+                                 " -cpu la464");
+    qos_node_contains("loongarch64/virt", "generic-pcihost", NULL);
+}
+
+libqos_init(virt_machine_register_nodes);
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
index 3aed6efcb8..558eb4c24b 100644
--- a/tests/qtest/libqos/meson.build
+++ b/tests/qtest/libqos/meson.build
@@ -61,6 +61,7 @@ libqos_srcs = files(
         'ppc64_pseries-machine.c',
         'x86_64_pc-machine.c',
         'riscv-virt-machine.c',
+        'loongarch-virt-machine.c',
 )
 
 if have_virtfs

base-commit: dafec285bdbfe415ac6823abdc510e0b92c3f094
-- 
2.39.3
Re: [PATCH] tests/libqos: Add loongarch virt machine node
Posted by gaosong 6 months, 1 week ago 
在 2024/5/14 下午7:51, Bibo Mao 写道:
> Add loongarch virt machine to the graph. It is a modified copy of
> the existing riscv virtmachine in riscv-virt-machine.c
>
> It contains a generic-pcihost controller, and an extra function
> loongarch_config_qpci_bus() to configure GPEX pci host controller
> information, such as ecam and pio_base addresses.
>
> Also hotplug handle checking about TYPE_VIRTIO_IOMMU_PCI device is
> added on loongarch virt machine, since virtio_mmu_pci device requires
> it.
>
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> ---
qos-test failed.

  6/14 qemu:qtest+qtest-loongarch64 / 
qtest-loongarch64/qos-test                       TIMEOUT 120.01s   
killed by signal 11 SIGSEGV
 >>> QTEST_QEMU_IMG=./qemu-img 
PYTHON=/root/work/code/clean/github/qemu/build/pyvenv/bin/python3 
QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon 
MALLOC_PERTURB_=47 
G_TEST_DBUS_DAEMON=/root/work/code/clean/github/qemu/tests/dbus-vmstate-daemon.sh 
QTEST_QEMU_BINARY=./qemu-system-loongarch64 
/root/work/code/clean/github/qemu/build/tests/qtest/qos-test --tap -k
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ 
―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
stderr:
qemu-system-loongarch64: ram_size must be greater than 1G.
Broken pipe
../tests/qtest/libqtest.c:195: kill_qemu() tried to terminate QEMU 
process but encountered exit status 1 (expected 0)

TAP parsing error: Too few tests run (expected 128, got 60)

I think this patch depends on your numa series and migration series patches.

Thanks.
Song Gao
>   hw/loongarch/virt.c                         |   2 +
>   tests/qtest/libqos/loongarch-virt-machine.c | 114 ++++++++++++++++++++
>   tests/qtest/libqos/meson.build              |   1 +
>   3 files changed, 117 insertions(+)
>   create mode 100644 tests/qtest/libqos/loongarch-virt-machine.c
>
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index db43b2fe4b..7f5ef87be4 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -45,6 +45,7 @@
>   #include "sysemu/tpm.h"
>   #include "sysemu/block-backend.h"
>   #include "hw/block/flash.h"
> +#include "hw/virtio/virtio-iommu.h"
>   #include "qemu/error-report.h"
>   
>   static PFlashCFI01 *virt_flash_create1(LoongArchVirtMachineState *lvms,
> @@ -1212,6 +1213,7 @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
>       MachineClass *mc = MACHINE_GET_CLASS(machine);
>   
>       if (device_is_dynamic_sysbus(mc, dev) ||
> +        object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
>           memhp_type_supported(dev)) {
>           return HOTPLUG_HANDLER(machine);
>       }
> diff --git a/tests/qtest/libqos/loongarch-virt-machine.c b/tests/qtest/libqos/loongarch-virt-machine.c
> new file mode 100644
> index 0000000000..c12089c015
> --- /dev/null
> +++ b/tests/qtest/libqos/loongarch-virt-machine.c
> @@ -0,0 +1,114 @@
> +/*
> + * libqos driver framework
> + *
> + * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License version 2.1 as published by the Free Software Foundation.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>
> + */
> +
> +#include "qemu/osdep.h"
> +#include "../libqtest.h"
> +#include "qemu/module.h"
> +#include "libqos-malloc.h"
> +#include "qgraph.h"
> +#include "virtio-mmio.h"
> +#include "generic-pcihost.h"
> +#include "hw/pci/pci_regs.h"
> +
> +#define LOONGARCH_PAGE_SIZE               0x1000
> +#define LOONGARCH_VIRT_RAM_ADDR           0x100000
> +#define LOONGARCH_VIRT_RAM_SIZE           0xFF00000
> +
> +#define LOONGARCH_VIRT_PIO_BASE           0x18000000
> +#define LOONGARCH_VIRT_PCIE_PIO_OFFSET    0x4000
> +#define LOONGARCH_VIRT_PCIE_PIO_LIMIT     0x10000
> +#define LOONGARCH_VIRT_PCIE_ECAM_BASE     0x20000000
> +#define LOONGARCH_VIRT_PCIE_MMIO32_BASE   0x40000000
> +#define LOONGARCH_VIRT_PCIE_MMIO32_LIMIT  0x80000000
> +
> +typedef struct QVirtMachine QVirtMachine;
> +
> +struct QVirtMachine {
> +    QOSGraphObject obj;
> +    QGuestAllocator alloc;
> +    QVirtioMMIODevice virtio_mmio;
> +    QGenericPCIHost bridge;
> +};
> +
> +static void virt_destructor(QOSGraphObject *obj)
> +{
> +    QVirtMachine *machine = (QVirtMachine *) obj;
> +    alloc_destroy(&machine->alloc);
> +}
> +
> +static void *virt_get_driver(void *object, const char *interface)
> +{
> +    QVirtMachine *machine = object;
> +    if (!g_strcmp0(interface, "memory")) {
> +        return &machine->alloc;
> +    }
> +
> +    fprintf(stderr, "%s not present in loongarch/virtio\n", interface);
> +    g_assert_not_reached();
> +}
> +
> +static QOSGraphObject *virt_get_device(void *obj, const char *device)
> +{
> +    QVirtMachine *machine = obj;
> +    if (!g_strcmp0(device, "generic-pcihost")) {
> +        return &machine->bridge.obj;
> +    } else if (!g_strcmp0(device, "virtio-mmio")) {
> +        return &machine->virtio_mmio.obj;
> +    }
> +
> +    fprintf(stderr, "%s not present in loongarch/virt\n", device);
> +    g_assert_not_reached();
> +}
> +
> +static void loongarch_config_qpci_bus(QGenericPCIBus *qpci)
> +{
> +    qpci->gpex_pio_base = LOONGARCH_VIRT_PIO_BASE;
> +    qpci->bus.pio_alloc_ptr = LOONGARCH_VIRT_PCIE_PIO_OFFSET;
> +    qpci->bus.pio_limit = LOONGARCH_VIRT_PCIE_PIO_LIMIT;
> +    qpci->bus.mmio_alloc_ptr = LOONGARCH_VIRT_PCIE_MMIO32_BASE;
> +    qpci->bus.mmio_limit = LOONGARCH_VIRT_PCIE_MMIO32_LIMIT;
> +    qpci->ecam_alloc_ptr = LOONGARCH_VIRT_PCIE_ECAM_BASE;
> +}
> +
> +static void *qos_create_machine_loongarch_virt(QTestState *qts)
> +{
> +    QVirtMachine *machine = g_new0(QVirtMachine, 1);
> +
> +    alloc_init(&machine->alloc, 0,
> +               LOONGARCH_VIRT_RAM_ADDR,
> +               LOONGARCH_VIRT_RAM_ADDR + LOONGARCH_VIRT_RAM_SIZE,
> +               LOONGARCH_PAGE_SIZE);
> +
> +    qos_create_generic_pcihost(&machine->bridge, qts, &machine->alloc);
> +    loongarch_config_qpci_bus(&machine->bridge.pci);
> +
> +    machine->obj.get_device = virt_get_device;
> +    machine->obj.get_driver = virt_get_driver;
> +    machine->obj.destructor = virt_destructor;
> +    return machine;
> +}
> +
> +static void virt_machine_register_nodes(void)
> +{
> +    qos_node_create_machine_args("loongarch64/virt",
> +                                 qos_create_machine_loongarch_virt,
> +                                 " -cpu la464");
> +    qos_node_contains("loongarch64/virt", "generic-pcihost", NULL);
> +}
> +
> +libqos_init(virt_machine_register_nodes);
> diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
> index 3aed6efcb8..558eb4c24b 100644
> --- a/tests/qtest/libqos/meson.build
> +++ b/tests/qtest/libqos/meson.build
> @@ -61,6 +61,7 @@ libqos_srcs = files(
>           'ppc64_pseries-machine.c',
>           'x86_64_pc-machine.c',
>           'riscv-virt-machine.c',
> +        'loongarch-virt-machine.c',
>   )
>   
>   if have_virtfs
>
> base-commit: dafec285bdbfe415ac6823abdc510e0b92c3f094
Re: [PATCH] tests/libqos: Add loongarch virt machine node
Posted by maobibo 6 months, 1 week ago 

On 2024/5/15 下午5:01, gaosong wrote:
> 在 2024/5/14 下午7:51, Bibo Mao 写道:
>> Add loongarch virt machine to the graph. It is a modified copy of
>> the existing riscv virtmachine in riscv-virt-machine.c
>>
>> It contains a generic-pcihost controller, and an extra function
>> loongarch_config_qpci_bus() to configure GPEX pci host controller
>> information, such as ecam and pio_base addresses.
>>
>> Also hotplug handle checking about TYPE_VIRTIO_IOMMU_PCI device is
>> added on loongarch virt machine, since virtio_mmu_pci device requires
>> it.
>>
>> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
>> ---
> qos-test failed.
> 
>   6/14 qemu:qtest+qtest-loongarch64 / 
> qtest-loongarch64/qos-test                       TIMEOUT 120.01s killed 
> by signal 11 SIGSEGV
>  >>> QTEST_QEMU_IMG=./qemu-img 
> PYTHON=/root/work/code/clean/github/qemu/build/pyvenv/bin/python3 
> QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon 
> MALLOC_PERTURB_=47 
> G_TEST_DBUS_DAEMON=/root/work/code/clean/github/qemu/tests/dbus-vmstate-daemon.sh 
> QTEST_QEMU_BINARY=./qemu-system-loongarch64 
> /root/work/code/clean/github/qemu/build/tests/qtest/qos-test --tap -k
> ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ 
> ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> stderr:
> qemu-system-loongarch64: ram_size must be greater than 1G.
> Broken pipe
> ../tests/qtest/libqtest.c:195: kill_qemu() tried to terminate QEMU 
> process but encountered exit status 1 (expected 0)
> 
> TAP parsing error: Too few tests run (expected 128, got 60)
> 
> I think this patch depends on your numa series and migration series 
> patches.
Yes, it depends on numa/migration testcase patchset.

Regards
Bibo Mao
> 
> Thanks.
> Song Gao
>>   hw/loongarch/virt.c                         |   2 +
>>   tests/qtest/libqos/loongarch-virt-machine.c | 114 ++++++++++++++++++++
>>   tests/qtest/libqos/meson.build              |   1 +
>>   3 files changed, 117 insertions(+)
>>   create mode 100644 tests/qtest/libqos/loongarch-virt-machine.c
>>
>> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
>> index db43b2fe4b..7f5ef87be4 100644
>> --- a/hw/loongarch/virt.c
>> +++ b/hw/loongarch/virt.c
>> @@ -45,6 +45,7 @@
>>   #include "sysemu/tpm.h"
>>   #include "sysemu/block-backend.h"
>>   #include "hw/block/flash.h"
>> +#include "hw/virtio/virtio-iommu.h"
>>   #include "qemu/error-report.h"
>>   static PFlashCFI01 *virt_flash_create1(LoongArchVirtMachineState *lvms,
>> @@ -1212,6 +1213,7 @@ static HotplugHandler 
>> *virt_get_hotplug_handler(MachineState *machine,
>>       MachineClass *mc = MACHINE_GET_CLASS(machine);
>>       if (device_is_dynamic_sysbus(mc, dev) ||
>> +        object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
>>           memhp_type_supported(dev)) {
>>           return HOTPLUG_HANDLER(machine);
>>       }
>> diff --git a/tests/qtest/libqos/loongarch-virt-machine.c 
>> b/tests/qtest/libqos/loongarch-virt-machine.c
>> new file mode 100644
>> index 0000000000..c12089c015
>> --- /dev/null
>> +++ b/tests/qtest/libqos/loongarch-virt-machine.c
>> @@ -0,0 +1,114 @@
>> +/*
>> + * libqos driver framework
>> + *
>> + * Copyright (c) 2018 Emanuele Giuseppe Esposito 
>> <e.emanuelegiuseppe@gmail.com>
>> + *
>> + * This library is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License version 2.1 as published by the Free Software Foundation.
>> + *
>> + * This library is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with this library; if not, see 
>> <http://www.gnu.org/licenses/>
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "../libqtest.h"
>> +#include "qemu/module.h"
>> +#include "libqos-malloc.h"
>> +#include "qgraph.h"
>> +#include "virtio-mmio.h"
>> +#include "generic-pcihost.h"
>> +#include "hw/pci/pci_regs.h"
>> +
>> +#define LOONGARCH_PAGE_SIZE               0x1000
>> +#define LOONGARCH_VIRT_RAM_ADDR           0x100000
>> +#define LOONGARCH_VIRT_RAM_SIZE           0xFF00000
>> +
>> +#define LOONGARCH_VIRT_PIO_BASE           0x18000000
>> +#define LOONGARCH_VIRT_PCIE_PIO_OFFSET    0x4000
>> +#define LOONGARCH_VIRT_PCIE_PIO_LIMIT     0x10000
>> +#define LOONGARCH_VIRT_PCIE_ECAM_BASE     0x20000000
>> +#define LOONGARCH_VIRT_PCIE_MMIO32_BASE   0x40000000
>> +#define LOONGARCH_VIRT_PCIE_MMIO32_LIMIT  0x80000000
>> +
>> +typedef struct QVirtMachine QVirtMachine;
>> +
>> +struct QVirtMachine {
>> +    QOSGraphObject obj;
>> +    QGuestAllocator alloc;
>> +    QVirtioMMIODevice virtio_mmio;
>> +    QGenericPCIHost bridge;
>> +};
>> +
>> +static void virt_destructor(QOSGraphObject *obj)
>> +{
>> +    QVirtMachine *machine = (QVirtMachine *) obj;
>> +    alloc_destroy(&machine->alloc);
>> +}
>> +
>> +static void *virt_get_driver(void *object, const char *interface)
>> +{
>> +    QVirtMachine *machine = object;
>> +    if (!g_strcmp0(interface, "memory")) {
>> +        return &machine->alloc;
>> +    }
>> +
>> +    fprintf(stderr, "%s not present in loongarch/virtio\n", interface);
>> +    g_assert_not_reached();
>> +}
>> +
>> +static QOSGraphObject *virt_get_device(void *obj, const char *device)
>> +{
>> +    QVirtMachine *machine = obj;
>> +    if (!g_strcmp0(device, "generic-pcihost")) {
>> +        return &machine->bridge.obj;
>> +    } else if (!g_strcmp0(device, "virtio-mmio")) {
>> +        return &machine->virtio_mmio.obj;
>> +    }
>> +
>> +    fprintf(stderr, "%s not present in loongarch/virt\n", device);
>> +    g_assert_not_reached();
>> +}
>> +
>> +static void loongarch_config_qpci_bus(QGenericPCIBus *qpci)
>> +{
>> +    qpci->gpex_pio_base = LOONGARCH_VIRT_PIO_BASE;
>> +    qpci->bus.pio_alloc_ptr = LOONGARCH_VIRT_PCIE_PIO_OFFSET;
>> +    qpci->bus.pio_limit = LOONGARCH_VIRT_PCIE_PIO_LIMIT;
>> +    qpci->bus.mmio_alloc_ptr = LOONGARCH_VIRT_PCIE_MMIO32_BASE;
>> +    qpci->bus.mmio_limit = LOONGARCH_VIRT_PCIE_MMIO32_LIMIT;
>> +    qpci->ecam_alloc_ptr = LOONGARCH_VIRT_PCIE_ECAM_BASE;
>> +}
>> +
>> +static void *qos_create_machine_loongarch_virt(QTestState *qts)
>> +{
>> +    QVirtMachine *machine = g_new0(QVirtMachine, 1);
>> +
>> +    alloc_init(&machine->alloc, 0,
>> +               LOONGARCH_VIRT_RAM_ADDR,
>> +               LOONGARCH_VIRT_RAM_ADDR + LOONGARCH_VIRT_RAM_SIZE,
>> +               LOONGARCH_PAGE_SIZE);
>> +
>> +    qos_create_generic_pcihost(&machine->bridge, qts, &machine->alloc);
>> +    loongarch_config_qpci_bus(&machine->bridge.pci);
>> +
>> +    machine->obj.get_device = virt_get_device;
>> +    machine->obj.get_driver = virt_get_driver;
>> +    machine->obj.destructor = virt_destructor;
>> +    return machine;
>> +}
>> +
>> +static void virt_machine_register_nodes(void)
>> +{
>> +    qos_node_create_machine_args("loongarch64/virt",
>> +                                 qos_create_machine_loongarch_virt,
>> +                                 " -cpu la464");
>> +    qos_node_contains("loongarch64/virt", "generic-pcihost", NULL);
>> +}
>> +
>> +libqos_init(virt_machine_register_nodes);
>> diff --git a/tests/qtest/libqos/meson.build 
>> b/tests/qtest/libqos/meson.build
>> index 3aed6efcb8..558eb4c24b 100644
>> --- a/tests/qtest/libqos/meson.build
>> +++ b/tests/qtest/libqos/meson.build
>> @@ -61,6 +61,7 @@ libqos_srcs = files(
>>           'ppc64_pseries-machine.c',
>>           'x86_64_pc-machine.c',
>>           'riscv-virt-machine.c',
>> +        'loongarch-virt-machine.c',
>>   )
>>   if have_virtfs
>>
>> base-commit: dafec285bdbfe415ac6823abdc510e0b92c3f094

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.