ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw: Move the default NIC machine class setting from the x86 to the generic one 

We are going to re-use this setting for other targets, so let's
move this to the main MachineClass.

Message-Id: <20230512124033.502654-4-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-05-10 20:46:21 +02:00
parent d563cc84cd
commit 01ecdaa40e
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/pc.c
View File

@ -1364,12 +1364,13 @@ void pc_basic_device_init(struct PCMachineState *pcms,
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
{ {
MachineClass *mc = MACHINE_CLASS(pcmc);
int i; int i;
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC); rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
for (i = 0; i < nb_nics; i++) { for (i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i]; NICInfo *nd = &nd_table[i];
const char *model = nd->model ? nd->model : pcmc->default_nic_model; const char *model = nd->model ? nd->model : mc->default_nic;
if (g_str_equal(model, "ne2k_isa")) { if (g_str_equal(model, "ne2k_isa")) {
pc_init_ne2k_isa(isa_bus, nd); pc_init_ne2k_isa(isa_bus, nd);

4
hw/i386/pc_piix.c
View File

@ -450,7 +450,6 @@ static void pc_xen_hvm_init(MachineState *machine)
static void pc_i440fx_machine_options(MachineClass *m) static void pc_i440fx_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pcmc->default_nic_model = "e1000";
pcmc->pci_root_uid = 0; pcmc->pci_root_uid = 0;
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
@ -458,6 +457,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->desc = "Standard PC (i440FX + PIIX, 1996)"; m->desc = "Standard PC (i440FX + PIIX, 1996)";
m->default_machine_opts = "firmware=bios-256k.bin"; m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std"; m->default_display = "std";
m->default_nic = "e1000";
machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
} }
@ -884,7 +884,7 @@ static void isapc_machine_options(MachineClass *m)
pcmc->gigabyte_align = false; pcmc->gigabyte_align = false;
pcmc->smbios_legacy_mode = true; pcmc->smbios_legacy_mode = true;
pcmc->has_reserved_memory = false; pcmc->has_reserved_memory = false;
pcmc->default_nic_model = "ne2k_isa"; m->default_nic = "ne2k_isa";
m->default_cpu_type = X86_CPU_TYPE_NAME("486"); m->default_cpu_type = X86_CPU_TYPE_NAME("486");
} }

6
hw/i386/pc_q35.c
View File

@ -356,7 +356,6 @@ static void pc_q35_init(MachineState *machine)
static void pc_q35_machine_options(MachineClass *m) static void pc_q35_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pcmc->default_nic_model = "e1000e";
pcmc->pci_root_uid = 0; pcmc->pci_root_uid = 0;
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
@ -365,6 +364,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->units_per_default_bus = 1; m->units_per_default_bus = 1;
m->default_machine_opts = "firmware=bios-256k.bin"; m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std"; m->default_display = "std";
m->default_nic = "e1000e";
m->default_kernel_irqchip_split = false; m->default_kernel_irqchip_split = false;
m->no_floppy = 1; m->no_floppy = 1;
machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
@ -577,10 +577,8 @@ DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
static void pc_q35_2_11_machine_options(MachineClass *m) static void pc_q35_2_11_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_12_machine_options(m); pc_q35_2_12_machine_options(m);
pcmc->default_nic_model = "e1000"; m->default_nic = "e1000";
compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
} }

1
include/hw/boards.h
View File

@ -253,6 +253,7 @@ struct MachineClass {
const char *default_machine_opts; const char *default_machine_opts;
const char *default_boot_order; const char *default_boot_order;
const char *default_display; const char *default_display;
const char *default_nic;
GPtrArray *compat_props; GPtrArray *compat_props;
const char *hw_version; const char *hw_version;
ram_addr_t default_ram_size; ram_addr_t default_ram_size;

1
include/hw/i386/pc.h
View File

@ -93,7 +93,6 @@ struct PCMachineClass {
/* Device configuration: */ /* Device configuration: */
bool pci_enabled; bool pci_enabled;
bool kvmclock_enabled; bool kvmclock_enabled;
const char *default_nic_model;
/* Compat options: */ /* Compat options: */