[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/15] hw/loongarch64: Use MachineClass->default_nic in the virt m
|
From: |
Thomas Huth |
|
Subject: |
[PULL 04/15] hw/loongarch64: Use MachineClass->default_nic in the virt machine |
|
Date: |
Fri, 26 May 2023 11:08:29 +0200 |
Mark the default NIC via the new MachineClass->default_nic setting
so that the machine-defaults code in vl.c can decide whether the
default NIC is usable or not (for example when compiling with the
"--without-default-devices" configure switch).
Message-Id: <20230523110435.1375774-5-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Tested-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/loongarch/virt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 2b7588e32a..ceddec1b23 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -474,6 +474,7 @@ static DeviceState *create_platform_bus(DeviceState
*pch_pic)
static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState
*lams)
{
+ MachineClass *mc = MACHINE_GET_CLASS(lams);
DeviceState *gpex_dev;
SysBusDevice *d;
PCIBus *pci_bus;
@@ -528,7 +529,7 @@ static void loongarch_devices_init(DeviceState *pch_pic,
LoongArchMachineState *
NICInfo *nd = &nd_table[i];
if (!nd->model) {
- nd->model = g_strdup("virtio");
+ nd->model = g_strdup(mc->default_nic);
}
pci_nic_init_nofail(nd, pci_bus, nd->model, NULL);
@@ -1038,6 +1039,7 @@ static void loongarch_class_init(ObjectClass *oc, void
*data)
mc->default_boot_order = "c";
mc->no_cdrom = 1;
mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
+ mc->default_nic = "virtio-net-pci";
hc->plug = loongarch_machine_device_plug_cb;
hc->pre_plug = virt_machine_device_pre_plug;
hc->unplug_request = virt_machine_device_unplug_request;
--
2.31.1
- [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330, Thomas Huth, 2023/05/26
- [PULL 02/15] hw/alpha: Use MachineClass->default_nic in the alpha machine, Thomas Huth, 2023/05/26
- [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine, Thomas Huth, 2023/05/26
- [PULL 04/15] hw/loongarch64: Use MachineClass->default_nic in the virt machine,
Thomas Huth <=
- [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine, Thomas Huth, 2023/05/26
- [PULL 05/15] hw/xtensa: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available, Thomas Huth, 2023/05/26
- [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available, Thomas Huth, 2023/05/26
- [PULL 07/15] hw/mips: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine, Thomas Huth, 2023/05/26
- [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them, Thomas Huth, 2023/05/26
- [PULL 13/15] machine: do not crash if default RAM backend name has been stolen, Thomas Huth, 2023/05/26
- [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too, Thomas Huth, 2023/05/26