motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/loongarch64: Use MachineClass->default_nic in the virt machine

Browse source 
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>
This commit is contained in:
Thomas Huth 2023-05-23 13:04:34 +02:00
parent 50989d04d6
commit 240294cac7
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/loongarch/virt.c
View file

@ -474,6 +474,7 @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams) static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams)
{ {
MachineClass *mc = MACHINE_GET_CLASS(lams);
DeviceState *gpex_dev; DeviceState *gpex_dev;
SysBusDevice *d; SysBusDevice *d;
PCIBus *pci_bus; PCIBus *pci_bus;
@ -528,7 +529,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
NICInfo *nd = &nd_table[i]; NICInfo *nd = &nd_table[i];
if (!nd->model) { 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); 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->default_boot_order = "c";
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->get_hotplug_handler = virt_machine_get_hotplug_handler; mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
mc->default_nic = "virtio-net-pci";
hc->plug = loongarch_machine_device_plug_cb; hc->plug = loongarch_machine_device_plug_cb;
hc->pre_plug = virt_machine_device_pre_plug; hc->pre_plug = virt_machine_device_pre_plug;
hc->unplug_request = virt_machine_device_unplug_request; hc->unplug_request = virt_machine_device_unplug_request;