SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rework matching of network devices to -nic options (v2)

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEMUsIrNDeSBEzpfKGm+mA/QrAFUQFAmW9F9oSHGR3bXdAYW1h
 em9uLmNvLnVrAAoJEJvpgP0KwBVEVwsQAIIDTYb3R/vxpf6w9n+n6FWCbFt/ihPC
 RbQ/Zrnoj6K3dCj6U3zJDpa5qpJ27/AiFfVv/gU13d+ELf72uHKE50GkQa2r/Fl8
 cPoW1LRinGFGxQS+WY5OnRYJ2mBaVx6THUd5DCgb5wpkBgVe21XsZLr6pfAapNCG
 c22HBaIb8sHPeIV2wf1xZKEswNGlkXuylBnS4wayncRKa2vOYPAAO7P4PvwNuMnb
 j0pLyLfD6Zx+6D53ema4zpcDh7d1Qn5eDGHQmy55Ml5AleC05gsDzrCEeiT4vU9T
 9fj6w8NlyLkPYLqTodAEeaUpUCFhMO312VPSM163iYOUDtjqz10bBZncgbRrsR5I
 30bKqQvEQ8PAQZWILNhfyHrYw4/O2Y88sUf/lE8lGmHvVYda+yqq5lgEyPFHbJwh
 ZCEJQalc6tRATIWUqI/Lw+X7hqnJ29c14hkEVG8L0KW0fIB/cqXUStzcUt87VkA2
 wwQI4aAGWZE1pvFvhmeM2rTDXfg1uD8SoFDTj4ORJl/7PEemf1yraKUYb8YdRE0z
 dQWfLmSnl1JkTa0yVF5MtnoTJUP8PX+hhJROfdwvfd1sU5s98O5pivYf7arUybVl
 j4g4qwm8IUBiAznZzbhdp38Q91RFvBKjjLsx/+Ts9avZTL0xCUcCvt21wzqWhbkc
 X7KdrU/XxVry
 =4PuR
 -----END PGP SIGNATURE-----

Merge tag 'pull-nic-config-2-20240202' of git://git.infradead.org/users/dwmw2/qemu into staging

Rework matching of network devices to -nic options (v2)

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEMUsIrNDeSBEzpfKGm+mA/QrAFUQFAmW9F9oSHGR3bXdAYW1h
# em9uLmNvLnVrAAoJEJvpgP0KwBVEVwsQAIIDTYb3R/vxpf6w9n+n6FWCbFt/ihPC
# RbQ/Zrnoj6K3dCj6U3zJDpa5qpJ27/AiFfVv/gU13d+ELf72uHKE50GkQa2r/Fl8
# cPoW1LRinGFGxQS+WY5OnRYJ2mBaVx6THUd5DCgb5wpkBgVe21XsZLr6pfAapNCG
# c22HBaIb8sHPeIV2wf1xZKEswNGlkXuylBnS4wayncRKa2vOYPAAO7P4PvwNuMnb
# j0pLyLfD6Zx+6D53ema4zpcDh7d1Qn5eDGHQmy55Ml5AleC05gsDzrCEeiT4vU9T
# 9fj6w8NlyLkPYLqTodAEeaUpUCFhMO312VPSM163iYOUDtjqz10bBZncgbRrsR5I
# 30bKqQvEQ8PAQZWILNhfyHrYw4/O2Y88sUf/lE8lGmHvVYda+yqq5lgEyPFHbJwh
# ZCEJQalc6tRATIWUqI/Lw+X7hqnJ29c14hkEVG8L0KW0fIB/cqXUStzcUt87VkA2
# wwQI4aAGWZE1pvFvhmeM2rTDXfg1uD8SoFDTj4ORJl/7PEemf1yraKUYb8YdRE0z
# dQWfLmSnl1JkTa0yVF5MtnoTJUP8PX+hhJROfdwvfd1sU5s98O5pivYf7arUybVl
# j4g4qwm8IUBiAznZzbhdp38Q91RFvBKjjLsx/+Ts9avZTL0xCUcCvt21wzqWhbkc
# X7KdrU/XxVry
# =4PuR
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 02 Feb 2024 16:27:06 GMT
# gpg:                using RSA key 314B08ACD0DE481133A5F2869BE980FD0AC01544
# gpg:                issuer "dwmw@amazon.co.uk"
# gpg: Good signature from "David Woodhouse <dwmw@amazon.co.uk>" [unknown]
# gpg:                 aka "David Woodhouse <dwmw@amazon.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 314B 08AC D0DE 4811 33A5  F286 9BE9 80FD 0AC0 1544

* tag 'pull-nic-config-2-20240202' of git://git.infradead.org/users/dwmw2/qemu: (47 commits)
  net: make nb_nics and nd_table[] static in net/net.c
  net: remove qemu_show_nic_models(), qemu_find_nic_model()
  hw/pci: remove pci_nic_init_nofail()
  net: remove qemu_check_nic_model()
  hw/xtensa/xtfpga: use qemu_create_nic_device()
  hw/sparc/sun4m: use qemu_find_nic_info()
  hw/s390x/s390-virtio-ccw: use qemu_create_nic_device()
  hw/riscv: use qemu_configure_nic_device()
  hw/openrisc/openrisc_sim: use qemu_create_nic_device()
  hw/net/lasi_i82596: use qemu_create_nic_device()
  hw/net/lasi_i82596: Re-enable build
  hw/mips/jazz: use qemu_find_nic_info()
  hw/mips/mipssim: use qemu_create_nic_device()
  hw/microblaze: use qemu_configure_nic_device()
  hw/m68k/q800: use qemu_find_nic_info()
  hw/m68k/mcf5208: use qemu_create_nic_device()
  hw/net/etraxfs-eth: use qemu_configure_nic_device()
  hw/arm: use qemu_configure_nic_device()
  hw/arm/stellaris: use qemu_find_nic_info()
  hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-02-02 16:47:36 +00:00
commit 29b008927e
81 changed files with 545 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/alpha/dp264.c
View File

@ -124,9 +124,7 @@ static void clipper_init(MachineState *machine)
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
/* Network setup. e1000 is good enough, failing Tulip support. */ /* Network setup. e1000 is good enough, failing Tulip support. */
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
/* Super I/O */ /* Super I/O */
isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO);

6
hw/arm/allwinner-a10.c
View File

@ -138,11 +138,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
sysbus_realize(SYS_BUS_DEVICE(&s->dramc), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->dramc), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, AW_A10_DRAMC_BASE); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, AW_A10_DRAMC_BASE);
/* FIXME use qdev NIC properties instead of nd_table[] */ qemu_configure_nic_device(DEVICE(&s->emac), true, NULL);
if (nd_table[0].used) {
qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);
qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
}
if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) {
return; return;
} }

6
hw/arm/allwinner-h3.c
View File

@ -371,11 +371,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)
"sd-bus"); "sd-bus");
/* EMAC */ /* EMAC */
/* FIXME use qdev NIC properties instead of nd_table[] */ qemu_configure_nic_device(DEVICE(&s->emac), true, NULL);
if (nd_table[0].used) {
qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC);
qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
}
object_property_set_link(OBJECT(&s->emac), "dma-memory", object_property_set_link(OBJECT(&s->emac), "dma-memory",
OBJECT(get_system_memory()), &error_fatal); OBJECT(get_system_memory()), &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal);

27
hw/arm/allwinner-r40.c
View File

@ -318,7 +318,6 @@ static void allwinner_r40_init(Object *obj)
static void allwinner_r40_realize(DeviceState *dev, Error **errp) static void allwinner_r40_realize(DeviceState *dev, Error **errp)
{ {
const char *r40_nic_models[] = { "gmac", "emac", NULL };
AwR40State *s = AW_R40(dev); AwR40State *s = AW_R40(dev);
/* CPUs */ /* CPUs */
@ -512,31 +511,8 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2,
s->memmap[AW_R40_DEV_DRAMPHY]); s->memmap[AW_R40_DEV_DRAMPHY]);
/* nic support gmac and emac */
for (int i = 0; i < ARRAY_SIZE(r40_nic_models) - 1; i++) {
NICInfo *nic = &nd_table[i];
if (!nic->used) {
continue;
}
if (qemu_show_nic_models(nic->model, r40_nic_models)) {
exit(0);
}
switch (qemu_find_nic_model(nic, r40_nic_models, r40_nic_models[0])) {
case 0: /* gmac */
qdev_set_nic_properties(DEVICE(&s->gmac), nic);
break;
case 1: /* emac */
qdev_set_nic_properties(DEVICE(&s->emac), nic);
break;
default:
exit(1);
break;
}
}
/* GMAC */ /* GMAC */
qemu_configure_nic_device(DEVICE(&s->gmac), true, "gmac");
object_property_set_link(OBJECT(&s->gmac), "dma-memory", object_property_set_link(OBJECT(&s->gmac), "dma-memory",
OBJECT(get_system_memory()), &error_fatal); OBJECT(get_system_memory()), &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->gmac), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->gmac), &error_fatal);
@ -545,6 +521,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in(DEVICE(&s->gic), AW_R40_GIC_SPI_GMAC)); qdev_get_gpio_in(DEVICE(&s->gic), AW_R40_GIC_SPI_GMAC));
/* EMAC */ /* EMAC */
qemu_configure_nic_device(DEVICE(&s->emac), true, "emac");
sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_R40_DEV_EMAC]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_R40_DEV_EMAC]);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0, sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0,

9
hw/arm/aspeed.c
View File

@ -356,7 +356,6 @@ static void aspeed_machine_init(MachineState *machine)
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
AspeedSoCClass *sc; AspeedSoCClass *sc;
int i; int i;
NICInfo *nd = &nd_table[0];
bmc->soc = ASPEED_SOC(object_new(amc->soc_name)); bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc)); object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
@ -371,10 +370,10 @@ static void aspeed_machine_init(MachineState *machine)
&error_fatal); &error_fatal);
for (i = 0; i < sc->macs_num; i++) { for (i = 0; i < sc->macs_num; i++) {
if ((amc->macs_mask & (1 << i)) && nd->used) { if ((amc->macs_mask & (1 << i)) &&
qemu_check_nic_model(nd, TYPE_FTGMAC100); !qemu_configure_nic_device(DEVICE(&bmc->soc->ftgmac100[i]),
qdev_set_nic_properties(DEVICE(&bmc->soc->ftgmac100[i]), nd); true, NULL)) {
nd++; break; /* No configs left; stop asking */
} }
} }

6
hw/arm/exynos4_boards.c
View File

@ -76,10 +76,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq)
SysBusDevice *s; SysBusDevice *s;
/* This should be a 9215 but the 9118 is close enough */ /* This should be a 9215 but the 9118 is close enough */
if (nd_table[0].used) { dev = qemu_create_nic_device(TYPE_LAN9118, true, NULL);
qemu_check_nic_model(&nd_table[0], "lan9118"); if (dev) {
dev = qdev_new(TYPE_LAN9118);
qdev_set_nic_properties(dev, &nd_table[0]);
qdev_prop_set_uint32(dev, "mode_16bit", 1); qdev_prop_set_uint32(dev, "mode_16bit", 1);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);

2
hw/arm/fsl-imx25.c
View File

@ -171,7 +171,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num,
&error_abort); &error_abort);
qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]); qemu_configure_nic_device(DEVICE(&s->fec), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) {
return; return;

2
hw/arm/fsl-imx6.c
View File

@ -388,7 +388,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num,
&error_abort); &error_abort);
qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]); qemu_configure_nic_device(DEVICE(&s->eth), true, NULL);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) {
return; return;
} }

2
hw/arm/fsl-imx6ul.c
View File

@ -473,7 +473,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
s->phy_num[i], &error_abort); s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num", object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX6UL_ETH_NUM_TX_RINGS, &error_abort); FSL_IMX6UL_ETH_NUM_TX_RINGS, &error_abort);
qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]); qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0, sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0,

2
hw/arm/fsl-imx7.c
View File

@ -447,7 +447,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
s->phy_num[i], &error_abort); s->phy_num[i], &error_abort);
object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num", object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",
FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort); FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort);
qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]); qemu_configure_nic_device(DEVICE(&s->eth[i]), true, NULL);
sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->eth[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0, FSL_IMX7_ENETn_ADDR[i]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth[i]), 0, FSL_IMX7_ENETn_ADDR[i]);

6
hw/arm/gumstix.c
View File

@ -73,8 +73,7 @@ static void connex_init(MachineState *machine)
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0); FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
/* Interrupt line of NIC is connected to GPIO line 36 */ /* Interrupt line of NIC is connected to GPIO line 36 */
smc91c111_init(&nd_table[0], 0x04000300, smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 36));
qdev_get_gpio_in(cpu->gpio, 36));
} }
static void verdex_init(MachineState *machine) static void verdex_init(MachineState *machine)
@ -97,8 +96,7 @@ static void verdex_init(MachineState *machine)
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0); FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
/* Interrupt line of NIC is connected to GPIO line 99 */ /* Interrupt line of NIC is connected to GPIO line 99 */
smc91c111_init(&nd_table[0], 0x04000300, smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 99));
qdev_get_gpio_in(cpu->gpio, 99));
} }
static void connex_class_init(ObjectClass *oc, void *data) static void connex_class_init(ObjectClass *oc, void *data)

12
hw/arm/highbank.c
View File

@ -297,19 +297,17 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
sysbus_create_simple(TYPE_SYSBUS_AHCI, 0xffe08000, pic[83]); sysbus_create_simple(TYPE_SYSBUS_AHCI, 0xffe08000, pic[83]);
if (nd_table[0].used) { dev = qemu_create_nic_device("xgmac", true, NULL);
qemu_check_nic_model(&nd_table[0], "xgmac"); if (dev) {
dev = qdev_new("xgmac");
qdev_set_nic_properties(dev, &nd_table[0]);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff50000); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff50000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[77]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[77]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[78]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[78]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[79]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[79]);
}
qemu_check_nic_model(&nd_table[1], "xgmac"); dev = qemu_create_nic_device("xgmac", true, NULL);
dev = qdev_new("xgmac"); if (dev) {
qdev_set_nic_properties(dev, &nd_table[1]);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff51000); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff51000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[80]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[80]);

5
hw/arm/integratorcp.c
View File

@ -666,8 +666,9 @@ static void integratorcp_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x1d000000); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x1d000000);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[25]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[25]);
if (nd_table[0].used) if (qemu_find_nic_info("smc91c111", true, NULL)) {
smc91c111_init(&nd_table[0], 0xc8000000, pic[27]); smc91c111_init(0xc8000000, pic[27]);
}
sysbus_create_simple("pl110", 0xc0000000, pic[22]); sysbus_create_simple("pl110", 0xc0000000, pic[22]);

4
hw/arm/kzm.c
View File

@ -113,8 +113,8 @@ static void kzm_init(MachineState *machine)
alias_offset += ram[i].size; alias_offset += ram[i].size;
} }
if (nd_table[0].used) { if (qemu_find_nic_info("lan9118", true, NULL)) {
lan9118_init(&nd_table[0], KZM_LAN9118_ADDR, lan9118_init(KZM_LAN9118_ADDR,
qdev_get_gpio_in(DEVICE(&s->soc.avic), 52)); qdev_get_gpio_in(DEVICE(&s->soc.avic), 52));
} }

3
hw/arm/mainstone.c
View File

@ -152,8 +152,7 @@ static void mainstone_common_init(MachineState *machine,
qdev_get_gpio_in(mst_irq, S1_IRQ), qdev_get_gpio_in(mst_irq, S1_IRQ),
qdev_get_gpio_in(mst_irq, S1_CD_IRQ)); qdev_get_gpio_in(mst_irq, S1_CD_IRQ));
smc91c111_init(&nd_table[0], MST_ETH_PHYS, smc91c111_init(MST_ETH_PHYS, qdev_get_gpio_in(mst_irq, ETHERNET_IRQ));
qdev_get_gpio_in(mst_irq, ETHERNET_IRQ));
mainstone_binfo.board_id = arm_id; mainstone_binfo.board_id = arm_id;
arm_load_kernel(mpu->cpu, machine, &mainstone_binfo); arm_load_kernel(mpu->cpu, machine, &mainstone_binfo);

8
hw/arm/mps2-tz.c
View File

@ -503,14 +503,12 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,
const PPCExtraData *extradata) const PPCExtraData *extradata)
{ {
SysBusDevice *s; SysBusDevice *s;
NICInfo *nd = &nd_table[0];
/* In hardware this is a LAN9220; the LAN9118 is software compatible /* In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature. * except that it doesn't support the checksum-offload feature.
*/ */
qemu_check_nic_model(nd, "lan9118");
mms->lan9118 = qdev_new(TYPE_LAN9118); mms->lan9118 = qdev_new(TYPE_LAN9118);
qdev_set_nic_properties(mms->lan9118, nd); qemu_configure_nic_device(mms->lan9118, true, NULL);
s = SYS_BUS_DEVICE(mms->lan9118); s = SYS_BUS_DEVICE(mms->lan9118);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -528,7 +526,6 @@ static MemoryRegion *make_eth_usb(MPS2TZMachineState *mms, void *opaque,
* irqs[] is the ethernet IRQ. * irqs[] is the ethernet IRQ.
*/ */
SysBusDevice *s; SysBusDevice *s;
NICInfo *nd = &nd_table[0];
memory_region_init(&mms->eth_usb_container, OBJECT(mms), memory_region_init(&mms->eth_usb_container, OBJECT(mms),
"mps2-tz-eth-usb-container", 0x200000); "mps2-tz-eth-usb-container", 0x200000);
@ -537,9 +534,8 @@ static MemoryRegion *make_eth_usb(MPS2TZMachineState *mms, void *opaque,
* In hardware this is a LAN9220; the LAN9118 is software compatible * In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature. * except that it doesn't support the checksum-offload feature.
*/ */
qemu_check_nic_model(nd, "lan9118");
mms->lan9118 = qdev_new(TYPE_LAN9118); mms->lan9118 = qdev_new(TYPE_LAN9118);
qdev_set_nic_properties(mms->lan9118, nd); qemu_configure_nic_device(mms->lan9118, true, NULL);
s = SYS_BUS_DEVICE(mms->lan9118); s = SYS_BUS_DEVICE(mms->lan9118);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);

2
hw/arm/mps2.c
View File

@ -456,7 +456,7 @@ static void mps2_common_init(MachineState *machine)
/* In hardware this is a LAN9220; the LAN9118 is software compatible /* In hardware this is a LAN9220; the LAN9118 is software compatible
* except that it doesn't support the checksum-offload feature. * except that it doesn't support the checksum-offload feature.
*/ */
lan9118_init(&nd_table[0], mmc->ethernet_base, lan9118_init(mmc->ethernet_base,
qdev_get_gpio_in(armv7m, qdev_get_gpio_in(armv7m,
mmc->fpga_type == FPGA_AN511 ? 47 : 13)); mmc->fpga_type == FPGA_AN511 ? 47 : 13));

6
hw/arm/msf2-soc.c
View File

@ -197,12 +197,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
g_free(bus_name); g_free(bus_name);
} }
/* FIXME use qdev NIC properties instead of nd_table[] */
if (nd_table[0].used) {
qemu_check_nic_model(&nd_table[0], TYPE_MSS_EMAC);
qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
}
dev = DEVICE(&s->emac); dev = DEVICE(&s->emac);
qemu_configure_nic_device(dev, true, NULL);
object_property_set_link(OBJECT(&s->emac), "ahb-bus", object_property_set_link(OBJECT(&s->emac), "ahb-bus",
OBJECT(get_system_memory()), &error_abort); OBJECT(get_system_memory()), &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->emac), errp)) {

3
hw/arm/musicpal.c
View File

@ -1277,9 +1277,8 @@ static void musicpal_init(MachineState *machine)
} }
sysbus_create_simple(TYPE_MV88W8618_FLASHCFG, MP_FLASHCFG_BASE, NULL); sysbus_create_simple(TYPE_MV88W8618_FLASHCFG, MP_FLASHCFG_BASE, NULL);
qemu_check_nic_model(&nd_table[0], "mv88w8618");
dev = qdev_new(TYPE_MV88W8618_ETH); dev = qdev_new(TYPE_MV88W8618_ETH);
qdev_set_nic_properties(dev, &nd_table[0]); qemu_configure_nic_device(dev, true, "mv88w8618");
object_property_set_link(OBJECT(dev), "dma-memory", object_property_set_link(OBJECT(dev), "dma-memory",
OBJECT(get_system_memory()), &error_fatal); OBJECT(get_system_memory()), &error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

16
hw/arm/npcm7xx.c
View File

@ -656,8 +656,9 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
/* /*
* EMC Modules. Cannot fail. * EMC Modules. Cannot fail.
* The mapping of the device to its netdev backend works as follows: * Use the available NIC configurations in order, allowing 'emc0' and
* emc[i] = nd_table[i] * 'emc1' to by used as aliases for the model= parameter to override.
*
* This works around the inability to specify the netdev property for the * This works around the inability to specify the netdev property for the
* emc device: it's not pluggable and thus the -device option can't be * emc device: it's not pluggable and thus the -device option can't be
* used. * used.
@ -665,12 +666,13 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
QEMU_BUILD_BUG_ON(ARRAY_SIZE(npcm7xx_emc_addr) != ARRAY_SIZE(s->emc)); QEMU_BUILD_BUG_ON(ARRAY_SIZE(npcm7xx_emc_addr) != ARRAY_SIZE(s->emc));
QEMU_BUILD_BUG_ON(ARRAY_SIZE(s->emc) != 2); QEMU_BUILD_BUG_ON(ARRAY_SIZE(s->emc) != 2);
for (i = 0; i < ARRAY_SIZE(s->emc); i++) { for (i = 0; i < ARRAY_SIZE(s->emc); i++) {
s->emc[i].emc_num = i;
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->emc[i]); SysBusDevice *sbd = SYS_BUS_DEVICE(&s->emc[i]);
if (nd_table[i].used) { char alias[6];
qemu_check_nic_model(&nd_table[i], TYPE_NPCM7XX_EMC);
qdev_set_nic_properties(DEVICE(sbd), &nd_table[i]); s->emc[i].emc_num = i;
} snprintf(alias, sizeof(alias), "emc%u", i);
qemu_configure_nic_device(DEVICE(sbd), true, alias);
/* /*
* The device exists regardless of whether it's connected to a QEMU * The device exists regardless of whether it's connected to a QEMU
* netdev backend. So always instantiate it even if there is no * netdev backend. So always instantiate it even if there is no

23
hw/arm/realview.c
View File

@ -85,12 +85,10 @@ static void realview_init(MachineState *machine,
SysBusDevice *busdev; SysBusDevice *busdev;
qemu_irq pic[64]; qemu_irq pic[64];
PCIBus *pci_bus = NULL; PCIBus *pci_bus = NULL;
NICInfo *nd;
DriveInfo *dinfo; DriveInfo *dinfo;
I2CBus *i2c; I2CBus *i2c;
int n; int n;
unsigned int smp_cpus = machine->smp.cpus; unsigned int smp_cpus = machine->smp.cpus;
int done_nic = 0;
qemu_irq cpu_irq[4]; qemu_irq cpu_irq[4];
int is_mpcore = 0; int is_mpcore = 0;
int is_pb = 0; int is_pb = 0;
@ -296,24 +294,19 @@ static void realview_init(MachineState *machine,
n--; n--;
} }
} }
for(n = 0; n < nb_nics; n++) {
nd = &nd_table[n];
if (!done_nic && (!nd->model || if (qemu_find_nic_info(is_pb ? "lan9118" : "smc91c111", true, NULL)) {
strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) { if (is_pb) {
if (is_pb) { lan9118_init(0x4e000000, pic[28]);
lan9118_init(nd, 0x4e000000, pic[28]);
} else {
smc91c111_init(nd, 0x4e000000, pic[28]);
}
done_nic = 1;
} else { } else {
if (pci_bus) { smc91c111_init(0x4e000000, pic[28]);
pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
}
} }
} }
if (pci_bus) {
pci_init_nic_devices(pci_bus, "rtl8139");
}
dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, 0x10002000, NULL); dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, 0x10002000, NULL);
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c"); i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
i2c_slave_create_simple(i2c, "ds1338", 0x68); i2c_slave_create_simple(i2c, "ds1338", 0x68);

4
hw/arm/sbsa-ref.c
View File

@ -673,9 +673,7 @@ static void create_pcie(SBSAMachineState *sms)
pci = PCI_HOST_BRIDGE(dev); pci = PCI_HOST_BRIDGE(dev);
if (pci->bus) { if (pci->bus) {
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci->bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
}
} }
pci_create_simple(pci->bus, -1, "bochs-display"); pci_create_simple(pci->bus, -1, "bochs-display");

30
hw/arm/stellaris.c
View File

@ -1028,7 +1028,8 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
DeviceState *ssys_dev; DeviceState *ssys_dev;
int i; int i;
int j; int j;
const uint8_t *macaddr; NICInfo *nd;
MACAddr mac;
MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1);
MemoryRegion *flash = g_new(MemoryRegion, 1); MemoryRegion *flash = g_new(MemoryRegion, 1);
@ -1051,12 +1052,22 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
* need its sysclk output. * need its sysclk output.
*/ */
ssys_dev = qdev_new(TYPE_STELLARIS_SYS); ssys_dev = qdev_new(TYPE_STELLARIS_SYS);
/* Most devices come preprogrammed with a MAC address in the user data. */
macaddr = nd_table[0].macaddr.a; /*
* Most devices come preprogrammed with a MAC address in the user data.
* Generate a MAC address now, if there isn't a matching -nic for it.
*/
nd = qemu_find_nic_info("stellaris_enet", true, "stellaris");
if (nd) {
memcpy(mac.a, nd->macaddr.a, sizeof(mac.a));
} else {
qemu_macaddr_default_if_unset(&mac);
}
qdev_prop_set_uint32(ssys_dev, "user0", qdev_prop_set_uint32(ssys_dev, "user0",
macaddr[0] | (macaddr[1] << 8) | (macaddr[2] << 16)); mac.a[0] | (mac.a[1] << 8) | (mac.a[2] << 16));
qdev_prop_set_uint32(ssys_dev, "user1", qdev_prop_set_uint32(ssys_dev, "user1",
macaddr[3] | (macaddr[4] << 8) | (macaddr[5] << 16)); mac.a[3] | (mac.a[4] << 8) | (mac.a[5] << 16));
qdev_prop_set_uint32(ssys_dev, "did0", board->did0); qdev_prop_set_uint32(ssys_dev, "did0", board->did0);
qdev_prop_set_uint32(ssys_dev, "did1", board->did1); qdev_prop_set_uint32(ssys_dev, "did1", board->did1);
qdev_prop_set_uint32(ssys_dev, "dc0", board->dc0); qdev_prop_set_uint32(ssys_dev, "dc0", board->dc0);
@ -1269,10 +1280,13 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
if (board->dc4 & (1 << 28)) { if (board->dc4 & (1 << 28)) {
DeviceState *enet; DeviceState *enet;
qemu_check_nic_model(&nd_table[0], "stellaris");
enet = qdev_new("stellaris_enet"); enet = qdev_new("stellaris_enet");
qdev_set_nic_properties(enet, &nd_table[0]); if (nd) {
qdev_set_nic_properties(enet, nd);
} else {
qdev_prop_set_macaddr(enet, "mac", mac.a);
}
sysbus_realize_and_unref(SYS_BUS_DEVICE(enet), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(enet), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(enet), 0, 0x40048000); sysbus_mmio_map(SYS_BUS_DEVICE(enet), 0, 0x40048000);
sysbus_connect_irq(SYS_BUS_DEVICE(enet), 0, qdev_get_gpio_in(nvic, 42)); sysbus_connect_irq(SYS_BUS_DEVICE(enet), 0, qdev_get_gpio_in(nvic, 42));

15
hw/arm/versatilepb.c
View File

@ -192,10 +192,8 @@ static void versatile_init(MachineState *machine, int board_id)
SysBusDevice *busdev; SysBusDevice *busdev;
DeviceState *pl041; DeviceState *pl041;
PCIBus *pci_bus; PCIBus *pci_bus;
NICInfo *nd;
I2CBus *i2c; I2CBus *i2c;
int n; int n;
int done_smc = 0;
DriveInfo *dinfo; DriveInfo *dinfo;
if (machine->ram_size > 0x10000000) { if (machine->ram_size > 0x10000000) {
@ -263,16 +261,11 @@ static void versatile_init(MachineState *machine, int board_id)
sysbus_connect_irq(busdev, 3, sic[30]); sysbus_connect_irq(busdev, 3, sic[30]);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci"); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
for(n = 0; n < nb_nics; n++) { if (qemu_find_nic_info("smc91c111", true, NULL)) {
nd = &nd_table[n]; smc91c111_init(0x10010000, sic[25]);
if (!done_smc && (!nd->model || strcmp(nd->model, "smc91c111") == 0)) {
smc91c111_init(nd, 0x10010000, sic[25]);
done_smc = 1;
} else {
pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
}
} }
pci_init_nic_devices(pci_bus, "rtl8139");
if (machine_usb(machine)) { if (machine_usb(machine)) {
pci_create_simple(pci_bus, -1, "pci-ohci"); pci_create_simple(pci_bus, -1, "pci-ohci");
} }

4
hw/arm/vexpress.c
View File

@ -679,8 +679,8 @@ static void vexpress_common_init(MachineState *machine)
memory_region_add_subregion(sysmem, map[VE_VIDEORAM], &vms->vram); memory_region_add_subregion(sysmem, map[VE_VIDEORAM], &vms->vram);
/* 0x4e000000 LAN9118 Ethernet */ /* 0x4e000000 LAN9118 Ethernet */
if (nd_table[0].used) { if (qemu_find_nic_info("lan9118", true, NULL)) {
lan9118_init(&nd_table[0], map[VE_ETHERNET], pic[15]); lan9118_init(map[VE_ETHERNET], pic[15]);
} }
/* VE_USB: not modelled */ /* VE_USB: not modelled */

4
hw/arm/virt.c
View File

@ -1457,9 +1457,7 @@ static void create_pcie(VirtMachineState *vms)
pci->bypass_iommu = vms->default_bus_bypass_iommu; pci->bypass_iommu = vms->default_bus_bypass_iommu;
vms->bus = pci->bus; vms->bus = pci->bus;
if (vms->bus) { if (vms->bus) {
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci->bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
}
} }
nodename = vms->pciehb_nodename = g_strdup_printf("/pcie@%" PRIx64, base); nodename = vms->pciehb_nodename = g_strdup_printf("/pcie@%" PRIx64, base);

11
hw/arm/xilinx_zynq.c
View File

@ -109,16 +109,13 @@ static void zynq_write_board_setup(ARMCPU *cpu,
static struct arm_boot_info zynq_binfo = {}; static struct arm_boot_info zynq_binfo = {};
static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq) static void gem_init(uint32_t base, qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
dev = qdev_new(TYPE_CADENCE_GEM); dev = qdev_new(TYPE_CADENCE_GEM);
if (nd->used) { qemu_configure_nic_device(dev, true, NULL);
qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
qdev_set_nic_properties(dev, nd);
}
object_property_set_int(OBJECT(dev), "phy-addr", 7, &error_abort); object_property_set_int(OBJECT(dev), "phy-addr", 7, &error_abort);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -280,8 +277,8 @@ static void zynq_init(MachineState *machine)
sysbus_create_varargs("cadence_ttc", 0xF8002000, sysbus_create_varargs("cadence_ttc", 0xF8002000,
pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET], NULL); pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET], NULL);
gem_init(&nd_table[0], 0xE000B000, pic[54-IRQ_OFFSET]); gem_init(0xE000B000, pic[54 - IRQ_OFFSET]);
gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]); gem_init(0xE000C000, pic[77 - IRQ_OFFSET]);
for (n = 0; n < 2; n++) { for (n = 0; n < 2; n++) {
int hci_irq = n ? 79 : 56; int hci_irq = n ? 79 : 56;

7
hw/arm/xlnx-versal.c
View File

@ -256,18 +256,13 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)
static const int irqs[] = { VERSAL_GEM0_IRQ_0, VERSAL_GEM1_IRQ_0}; static const int irqs[] = { VERSAL_GEM0_IRQ_0, VERSAL_GEM1_IRQ_0};
static const uint64_t addrs[] = { MM_GEM0, MM_GEM1 }; static const uint64_t addrs[] = { MM_GEM0, MM_GEM1 };
char *name = g_strdup_printf("gem%d", i); char *name = g_strdup_printf("gem%d", i);
NICInfo *nd = &nd_table[i];
DeviceState *dev; DeviceState *dev;
MemoryRegion *mr; MemoryRegion *mr;
object_initialize_child(OBJECT(s), name, &s->lpd.iou.gem[i], object_initialize_child(OBJECT(s), name, &s->lpd.iou.gem[i],
TYPE_CADENCE_GEM); TYPE_CADENCE_GEM);
dev = DEVICE(&s->lpd.iou.gem[i]); dev = DEVICE(&s->lpd.iou.gem[i]);
/* FIXME use qdev NIC properties instead of nd_table[] */ qemu_configure_nic_device(dev, true, NULL);
if (nd->used) {
qemu_check_nic_model(nd, "cadence_gem");
qdev_set_nic_properties(dev, nd);
}
object_property_set_int(OBJECT(dev), "phy-addr", 23, &error_abort); object_property_set_int(OBJECT(dev), "phy-addr", 23, &error_abort);
object_property_set_int(OBJECT(dev), "num-priority-queues", 2, object_property_set_int(OBJECT(dev), "num-priority-queues", 2,
&error_abort); &error_abort);

8
hw/arm/xlnx-zynqmp.c
View File

@ -618,13 +618,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
} }
for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
NICInfo *nd = &nd_table[i]; qemu_configure_nic_device(DEVICE(&s->gem[i]), true, NULL);
/* FIXME use qdev NIC properties instead of nd_table[] */
if (nd->used) {
qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
qdev_set_nic_properties(DEVICE(&s->gem[i]), nd);
}
object_property_set_int(OBJECT(&s->gem[i]), "revision", GEM_REVISION, object_property_set_int(OBJECT(&s->gem[i]), "revision", GEM_REVISION,
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->gem[i]), "phy-addr", 23, object_property_set_int(OBJECT(&s->gem[i]), "phy-addr", 23,

9
hw/cris/axis_dev88.c
View File

@ -308,15 +308,14 @@ void axisdev88_init(MachineState *machine)
/* Add the two ethernet blocks. */ /* Add the two ethernet blocks. */
dma_eth = g_malloc0(sizeof dma_eth[0] * 4); /* Allocate 4 channels. */ dma_eth = g_malloc0(sizeof dma_eth[0] * 4); /* Allocate 4 channels. */
etraxfs_eth_init(&nd_table[0], 0x30034000, 1, &dma_eth[0], &dma_eth[1]);
if (nb_nics > 1) {
etraxfs_eth_init(&nd_table[1], 0x30036000, 2, &dma_eth[2], &dma_eth[3]);
}
etraxfs_eth_init(0x30034000, 1, &dma_eth[0], &dma_eth[1]);
/* The DMA Connector block is missing, hardwire things for now. */ /* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, &dma_eth[0]); etraxfs_dmac_connect_client(etraxfs_dmac, 0, &dma_eth[0]);
etraxfs_dmac_connect_client(etraxfs_dmac, 1, &dma_eth[1]); etraxfs_dmac_connect_client(etraxfs_dmac, 1, &dma_eth[1]);
if (nb_nics > 1) {
if (qemu_find_nic_info("etraxfs-eth", true, "fseth")) {
etraxfs_eth_init(0x30036000, 2, &dma_eth[2], &dma_eth[3]);
etraxfs_dmac_connect_client(etraxfs_dmac, 6, &dma_eth[2]); etraxfs_dmac_connect_client(etraxfs_dmac, 6, &dma_eth[2]);
etraxfs_dmac_connect_client(etraxfs_dmac, 7, &dma_eth[3]); etraxfs_dmac_connect_client(etraxfs_dmac, 7, &dma_eth[3]);
} }

12
hw/hppa/machine.c
View File

@ -342,7 +342,6 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
uint64_t kernel_entry = 0, kernel_low, kernel_high; uint64_t kernel_entry = 0, kernel_low, kernel_high;
MemoryRegion *addr_space = get_system_memory(); MemoryRegion *addr_space = get_system_memory();
MemoryRegion *rom_region; MemoryRegion *rom_region;
long i;
unsigned int smp_cpus = machine->smp.cpus; unsigned int smp_cpus = machine->smp.cpus;
SysBusDevice *s; SysBusDevice *s;
@ -363,16 +362,13 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
} }
/* Network setup. */ /* Network setup. */
if (nd_table[0].used && enable_lasi_lan()) { if (lasi_dev) {
lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA), lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA)); qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
enable_lasi_lan());
} }
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
if (!enable_lasi_lan()) {
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
}
/* BMC board: HP Powerbar SP2 Diva (with console only) */ /* BMC board: HP Powerbar SP2 Diva (with console only) */
pci_dev = pci_new(-1, "pci-serial"); pci_dev = pci_new(-1, "pci-serial");

36
hw/i386/pc.c
View File

@ -654,15 +654,19 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
0x280, 0x380 }; 0x280, 0x380 };
static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd) static gboolean pc_init_ne2k_isa(ISABus *bus, NICInfo *nd, Error **errp)
{ {
static int nb_ne2k = 0; static int nb_ne2k = 0;
if (nb_ne2k == NE2000_NB_MAX) if (nb_ne2k == NE2000_NB_MAX) {
return; error_setg(errp,
"maximum number of ISA NE2000 devices exceeded");
return false;
}
isa_ne2000_init(bus, ne2000_io[nb_ne2k], isa_ne2000_init(bus, ne2000_io[nb_ne2k],
ne2000_irq[nb_ne2k], nd); ne2000_irq[nb_ne2k], nd);
nb_ne2k++; nb_ne2k++;
return true;
} }
void pc_acpi_smi_interrupt(void *opaque, int irq, int level) void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
@ -1265,7 +1269,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
if (pcms->bus) { if (pcms->bus) {
pci_create_simple(pcms->bus, -1, "xen-platform"); pci_create_simple(pcms->bus, -1, "xen-platform");
} }
pcms->xenbus = xen_bus_init(); xen_bus_init();
xen_be_init(); xen_be_init();
} }
#endif #endif
@ -1293,27 +1297,21 @@ void pc_basic_device_init(struct PCMachineState *pcms,
pcms->vmport != ON_OFF_AUTO_ON); pcms->vmport != ON_OFF_AUTO_ON);
} }
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus, void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
BusState *xen_bus)
{ {
MachineClass *mc = MACHINE_CLASS(pcmc); MachineClass *mc = MACHINE_CLASS(pcmc);
int i; bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000);
NICInfo *nd;
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++) {
NICInfo *nd = &nd_table[i];
const char *model = nd->model ? nd->model : mc->default_nic;
if (xen_bus && (!nd->model || g_str_equal(model, "xen-net-device"))) { while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) {
DeviceState *dev = qdev_new("xen-net-device"); pc_init_ne2k_isa(isa_bus, nd, &error_fatal);
qdev_set_nic_properties(dev, nd);
qdev_realize_and_unref(dev, xen_bus, &error_fatal);
} else if (g_str_equal(model, "ne2k_isa")) {
pc_init_ne2k_isa(isa_bus, nd);
} else {
pci_nic_init_nofail(nd, pci_bus, model, NULL);
}
} }
/* Anything remaining should be a PCI NIC */
pci_init_nic_devices(pci_bus, mc->default_nic);
rom_reset_order_override(); rom_reset_order_override();
} }

2
hw/i386/pc_piix.c
View File

@ -339,7 +339,7 @@ static void pc_init1(MachineState *machine,
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, rtc_state, true, pc_basic_device_init(pcms, isa_bus, x86ms->gsi, rtc_state, true,
0x4); 0x4);
pc_nic_init(pcmc, isa_bus, pci_bus, pcms->xenbus); pc_nic_init(pcmc, isa_bus, pci_bus);
if (pcmc->pci_enabled) { if (pcmc->pci_enabled) {
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);

2
hw/i386/pc_q35.c
View File

@ -340,7 +340,7 @@ static void pc_q35_init(MachineState *machine)
/* the rest devices to which pci devfn is automatically assigned */ /* the rest devices to which pci devfn is automatically assigned */
pc_vga_init(isa_bus, host_bus); pc_vga_init(isa_bus, host_bus);
pc_nic_init(pcmc, isa_bus, host_bus, pcms->xenbus); pc_nic_init(pcmc, isa_bus, host_bus);
if (machine->nvdimms_state->is_enabled) { if (machine->nvdimms_state->is_enabled) {
nvdimm_init_acpi_state(machine->nvdimms_state, system_io, nvdimm_init_acpi_state(machine->nvdimms_state, system_io,

4
hw/loongarch/virt.c
View File

@ -504,9 +504,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
fdt_add_uart_node(lams); fdt_add_uart_node(lams);
/* Network init */ /* Network init */
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
/* /*
* There are some invalid guest memory access. * There are some invalid guest memory access.

19
hw/m68k/mcf5208.c
View File

@ -206,16 +206,16 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
} }
} }
static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base, static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, qemu_irq *irqs)
qemu_irq *irqs)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
int i; int i;
qemu_check_nic_model(nd, TYPE_MCF_FEC_NET); dev = qemu_create_nic_device(TYPE_MCF_FEC_NET, true, NULL);
dev = qdev_new(TYPE_MCF_FEC_NET); if (!dev) {
qdev_set_nic_properties(dev, nd); return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -267,14 +267,7 @@ static void mcf5208evb_init(MachineState *machine)
mcf5208_sys_init(address_space_mem, pic); mcf5208_sys_init(address_space_mem, pic);
if (nb_nics > 1) { mcf_fec_init(address_space_mem, 0xfc030000, pic + 36);
error_report("Too many NICs");
exit(1);
}
if (nd_table[0].used) {
mcf_fec_init(address_space_mem, &nd_table[0],
0xfc030000, pic + 36);
}
g_free(pic); g_free(pic);

29
hw/m68k/q800.c
View File

@ -48,6 +48,7 @@
#include "hw/display/macfb.h" #include "hw/display/macfb.h"
#include "hw/block/swim.h" #include "hw/block/swim.h"
#include "net/net.h" #include "net/net.h"
#include "net/util.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
@ -270,6 +271,8 @@ static void q800_machine_init(MachineState *machine)
BusState *adb_bus; BusState *adb_bus;
NubusBus *nubus; NubusBus *nubus;
DriveInfo *dinfo; DriveInfo *dinfo;
NICInfo *nd;
MACAddr mac;
uint8_t rng_seed[32]; uint8_t rng_seed[32];
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
@ -370,13 +373,6 @@ static void q800_machine_init(MachineState *machine)
/* MACSONIC */ /* MACSONIC */
if (nb_nics > 1) {
error_report("q800 can only have one ethernet interface");
exit(1);
}
qemu_check_nic_model(&nd_table[0], "dp83932");
/* /*
* MacSonic driver needs an Apple MAC address * MacSonic driver needs an Apple MAC address
* Valid prefix are: * Valid prefix are:
@ -386,14 +382,21 @@ static void q800_machine_init(MachineState *machine)
* 08:00:07 Apple * 08:00:07 Apple
* (Q800 use the last one) * (Q800 use the last one)
*/ */
nd_table[0].macaddr.a[0] = 0x08;
nd_table[0].macaddr.a[1] = 0x00;
nd_table[0].macaddr.a[2] = 0x07;
object_initialize_child(OBJECT(machine), "dp8393x", &m->dp8393x, object_initialize_child(OBJECT(machine), "dp8393x", &m->dp8393x,
TYPE_DP8393X); TYPE_DP8393X);
dev = DEVICE(&m->dp8393x); dev = DEVICE(&m->dp8393x);
qdev_set_nic_properties(dev, &nd_table[0]); nd = qemu_find_nic_info(TYPE_DP8393X, true, "dp83932");
if (nd) {
qdev_set_nic_properties(dev, nd);
memcpy(mac.a, nd->macaddr.a, sizeof(mac.a));
} else {
qemu_macaddr_default_if_unset(&mac);
}
mac.a[0] = 0x08;
mac.a[1] = 0x00;
mac.a[2] = 0x07;
qdev_prop_set_macaddr(dev, "mac", mac.a);
qdev_prop_set_uint8(dev, "it_shift", 2); qdev_prop_set_uint8(dev, "it_shift", 2);
qdev_prop_set_bit(dev, "big_endian", true); qdev_prop_set_bit(dev, "big_endian", true);
object_property_set_link(OBJECT(dev), "dma_mr", object_property_set_link(OBJECT(dev), "dma_mr",
@ -414,7 +417,7 @@ static void q800_machine_init(MachineState *machine)
prom = memory_region_get_ram_ptr(&m->dp8393x_prom); prom = memory_region_get_ram_ptr(&m->dp8393x_prom);
checksum = 0; checksum = 0;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
prom[i] = revbit8(nd_table[0].macaddr.a[i]); prom[i] = revbit8(mac.a[i]);
checksum ^= prom[i]; checksum ^= prom[i];
} }
prom[7] = 0xff - checksum; prom[7] = 0xff - checksum;

3
hw/microblaze/petalogix_ml605_mmu.c
View File

@ -133,7 +133,6 @@ petalogix_ml605_init(MachineState *machine)
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
/* axi ethernet and dma initialization. */ /* axi ethernet and dma initialization. */
qemu_check_nic_model(&nd_table[0], "xlnx.axi-ethernet");
eth0 = qdev_new("xlnx.axi-ethernet"); eth0 = qdev_new("xlnx.axi-ethernet");
dma = qdev_new("xlnx.axi-dma"); dma = qdev_new("xlnx.axi-dma");
@ -145,7 +144,7 @@ petalogix_ml605_init(MachineState *machine)
"axistream-connected-target", NULL); "axistream-connected-target", NULL);
cs = object_property_get_link(OBJECT(dma), cs = object_property_get_link(OBJECT(dma),
"axistream-control-connected-target", NULL); "axistream-control-connected-target", NULL);
qdev_set_nic_properties(eth0, &nd_table[0]); qemu_configure_nic_device(eth0, true, NULL);
qdev_prop_set_uint32(eth0, "rxmem", 0x1000); qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
qdev_prop_set_uint32(eth0, "txmem", 0x1000); qdev_prop_set_uint32(eth0, "txmem", 0x1000);
object_property_set_link(OBJECT(eth0), "axistream-connected", ds, object_property_set_link(OBJECT(eth0), "axistream-connected", ds,

3
hw/microblaze/petalogix_s3adsp1800_mmu.c
View File

@ -114,9 +114,8 @@ petalogix_s3adsp1800_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
qemu_check_nic_model(&nd_table[0], "xlnx.xps-ethernetlite");
dev = qdev_new("xlnx.xps-ethernetlite"); dev = qdev_new("xlnx.xps-ethernetlite");
qdev_set_nic_properties(dev, &nd_table[0]); qemu_configure_nic_device(dev, true, NULL);
qdev_prop_set_uint32(dev, "tx-ping-pong", 0); qdev_prop_set_uint32(dev, "tx-ping-pong", 0);
qdev_prop_set_uint32(dev, "rx-ping-pong", 0); qdev_prop_set_uint32(dev, "rx-ping-pong", 0);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

16
hw/mips/fuloong2e.c
View File

@ -201,19 +201,9 @@ static void main_cpu_reset(void *opaque)
/* Network support */ /* Network support */
static void network_init(PCIBus *pci_bus) static void network_init(PCIBus *pci_bus)
{ {
int i; /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
pci_init_nic_in_slot(pci_bus, "rtl8139", NULL, "07");
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, "rtl8139");
NICInfo *nd = &nd_table[i];
const char *default_devaddr = NULL;
if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) {
/* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
default_devaddr = "07";
}
pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
}
} }
static void mips_fuloong2e_init(MachineState *machine) static void mips_fuloong2e_init(MachineState *machine)

15
hw/mips/jazz.c
View File

@ -119,15 +119,19 @@ static const MemoryRegionOps dma_dummy_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void mips_jazz_init_net(NICInfo *nd, IOMMUMemoryRegion *rc4030_dma_mr, static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr,
DeviceState *rc4030, MemoryRegion *dp8393x_prom) DeviceState *rc4030, MemoryRegion *dp8393x_prom)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *sysbus; SysBusDevice *sysbus;
int checksum, i; int checksum, i;
uint8_t *prom; uint8_t *prom;
NICInfo *nd;
qemu_check_nic_model(nd, "dp83932"); nd = qemu_find_nic_info("dp8393x", true, "dp82932");
if (!nd) {
return;
}
dev = qdev_new("dp8393x"); dev = qdev_new("dp8393x");
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
@ -324,12 +328,7 @@ static void mips_jazz_init(MachineState *machine,
} }
/* Network controller */ /* Network controller */
if (nb_nics == 1) { mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom);
mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_prom);
} else if (nb_nics > 1) {
error_report("This machine only supports one NIC");
exit(1);
}
/* SCSI adapter */ /* SCSI adapter */
dev = qdev_new(TYPE_SYSBUS_ESP); dev = qdev_new(TYPE_SYSBUS_ESP);

4
hw/mips/loongson3_virt.c
View File

@ -451,9 +451,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine,
usb_create_simple(usb_bus_find(-1), "usb-tablet"); usb_create_simple(usb_bus_find(-1), "usb-tablet");
} }
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
} }
static void mips_loongson3_virt_init(MachineState *machine) static void mips_loongson3_virt_init(MachineState *machine)

15
hw/mips/malta.c
View File

@ -612,18 +612,9 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *address_space,
/* Network support */ /* Network support */
static void network_init(PCIBus *pci_bus) static void network_init(PCIBus *pci_bus)
{ {
int i; /* The malta board has a PCNet card using PCI SLOT 11 */
pci_init_nic_in_slot(pci_bus, "pcnet", NULL, "0b");
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, "pcnet");
NICInfo *nd = &nd_table[i];
const char *default_devaddr = NULL;
if (i == 0 && (!nd->model || strcmp(nd->model, "pcnet") == 0))
/* The malta board has a PCNet card using PCI SLOT 11 */
default_devaddr = "0b";
pci_nic_init_nofail(nd, pci_bus, "pcnet", default_devaddr);
}
} }
static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr, static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr,

13
hw/mips/mipssim.c
View File

@ -118,13 +118,15 @@ static void main_cpu_reset(void *opaque)
} }
} }
static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd) static void mipsnet_init(int base, qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
dev = qdev_new("mipsnet"); dev = qemu_create_nic_device("mipsnet", true, NULL);
qdev_set_nic_properties(dev, nd); if (!dev) {
return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -225,9 +227,8 @@ mips_mipssim_init(MachineState *machine)
sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
} }
if (nd_table[0].used) /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
/* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ mipsnet_init(0x4200, env->irq[2]);
mipsnet_init(0x4200, env->irq[2], &nd_table[0]);
} }
static void mips_mipssim_machine_init(MachineClass *mc) static void mips_mipssim_machine_init(MachineClass *mc)

5
hw/net/etraxfs_eth.c
View File

@ -647,15 +647,14 @@ static void etraxfs_eth_class_init(ObjectClass *klass, void *data)
/* Instantiate an ETRAXFS Ethernet MAC. */ /* Instantiate an ETRAXFS Ethernet MAC. */
DeviceState * DeviceState *
etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, etraxfs_eth_init(hwaddr base, int phyaddr,
struct etraxfs_dma_client *dma_out, struct etraxfs_dma_client *dma_out,
struct etraxfs_dma_client *dma_in) struct etraxfs_dma_client *dma_in)
{ {
DeviceState *dev; DeviceState *dev;
qemu_check_nic_model(nd, "fseth");
dev = qdev_new("etraxfs-eth"); dev = qdev_new("etraxfs-eth");
qdev_set_nic_properties(dev, nd); qemu_configure_nic_device(dev, true, "fseth");
qdev_prop_set_uint32(dev, "phyaddr", phyaddr); qdev_prop_set_uint32(dev, "phyaddr", phyaddr);
/* /*

5
hw/net/lan9118.c
View File

@ -1408,14 +1408,13 @@ static void lan9118_register_types(void)
/* Legacy helper function. Should go away when machine config files are /* Legacy helper function. Should go away when machine config files are
implemented. */ implemented. */
void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq) void lan9118_init(uint32_t base, qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
qemu_check_nic_model(nd, "lan9118");
dev = qdev_new(TYPE_LAN9118); dev = qdev_new(TYPE_LAN9118);
qdev_set_nic_properties(dev, nd); qemu_configure_nic_device(dev, true, NULL);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, base); sysbus_mmio_map(s, 0, base);

13
hw/net/lasi_i82596.c
View File

@ -14,6 +14,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "net/eth.h" #include "net/eth.h"
#include "hw/net/lasi_82596.h" #include "hw/net/lasi_82596.h"
#include "hw/net/i82596.h" #include "hw/net/i82596.h"
@ -117,19 +118,21 @@ static void lasi_82596_realize(DeviceState *dev, Error **errp)
i82596_common_init(dev, s, &net_lasi_82596_info); i82596_common_init(dev, s, &net_lasi_82596_info);
} }
SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, hwaddr hpa,
hwaddr hpa, qemu_irq lan_irq) qemu_irq lan_irq, gboolean match_default)
{ {
DeviceState *dev; DeviceState *dev;
SysBusI82596State *s; SysBusI82596State *s;
static const MACAddr HP_MAC = { static const MACAddr HP_MAC = {
.a = { 0x08, 0x00, 0x09, 0xef, 0x34, 0xf6 } }; .a = { 0x08, 0x00, 0x09, 0xef, 0x34, 0xf6 } };
qemu_check_nic_model(&nd_table[0], TYPE_LASI_82596); dev = qemu_create_nic_device(TYPE_LASI_82596, match_default, "lasi");
dev = qdev_new(TYPE_LASI_82596); if (!dev) {
return NULL;
}
s = SYSBUS_I82596(dev); s = SYSBUS_I82596(dev);
s->state.irq = lan_irq; s->state.irq = lan_irq;
qdev_set_nic_properties(dev, &nd_table[0]);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s->state.conf.macaddr = HP_MAC; /* set HP MAC prefix */ s->state.conf.macaddr = HP_MAC; /* set HP MAC prefix */

2
hw/net/meson.build
View File

@ -33,7 +33,7 @@ system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c')) system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c')) system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c')) system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c')) system_ss.add(when: 'CONFIG_LASI_82596', if_true: files('lasi_i82596.c'))
system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c')) system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c')) system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c')) system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))

5
hw/net/smc91c111.c
View File

@ -818,14 +818,13 @@ static void smc91c111_register_types(void)
/* Legacy helper function. Should go away when machine config files are /* Legacy helper function. Should go away when machine config files are
implemented. */ implemented. */
void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq) void smc91c111_init(uint32_t base, qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
qemu_check_nic_model(nd, "smc91c111");
dev = qdev_new(TYPE_SMC91C111); dev = qdev_new(TYPE_SMC91C111);
qdev_set_nic_properties(dev, nd); qemu_configure_nic_device(dev, true, NULL);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, base); sysbus_mmio_map(s, 0, base);

18
hw/openrisc/openrisc_sim.c
View File

@ -170,7 +170,7 @@ static void openrisc_create_fdt(Or1ksimState *state,
static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size, static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
int num_cpus, OpenRISCCPU *cpus[], int num_cpus, OpenRISCCPU *cpus[],
int irq_pin, NICInfo *nd) int irq_pin)
{ {
void *fdt = state->fdt; void *fdt = state->fdt;
DeviceState *dev; DeviceState *dev;
@ -178,8 +178,10 @@ static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
char *nodename; char *nodename;
int i; int i;
dev = qdev_new("open_eth"); dev = qemu_create_nic_device("open_eth", true, NULL);
qdev_set_nic_properties(dev, nd); if (!dev) {
return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -313,12 +315,10 @@ static void openrisc_sim_init(MachineState *machine)
openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size, openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size,
machine->kernel_cmdline); machine->kernel_cmdline);
if (nd_table[0].used) { openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base, or1ksim_memmap[OR1KSIM_ETHOC].size,
or1ksim_memmap[OR1KSIM_ETHOC].size, smp_cpus, cpus,
smp_cpus, cpus, OR1KSIM_ETHOC_IRQ);
OR1KSIM_ETHOC_IRQ, nd_table);
}
if (smp_cpus > 1) { if (smp_cpus > 1) {
openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base, openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base,

73
hw/pci/pci.c
View File

@ -1853,76 +1853,49 @@ const pci_class_desc *get_class_desc(int class)
return desc; return desc;
} }
/* Initialize a PCI NIC. */ void pci_init_nic_devices(PCIBus *bus, const char *default_model)
PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model,
const char *default_devaddr)
{ {
const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; qemu_create_nic_bus_devices(&bus->qbus, TYPE_PCI_DEVICE, default_model,
GPtrArray *pci_nic_models; "virtio", "virtio-net-pci");
PCIBus *bus; }
bool pci_init_nic_in_slot(PCIBus *rootbus, const char *model,
const char *alias, const char *devaddr)
{
NICInfo *nd = qemu_find_nic_info(model, true, alias);
int dom, busnr, devfn;
PCIDevice *pci_dev; PCIDevice *pci_dev;
DeviceState *dev;
int devfn;
int i;
int dom, busnr;
unsigned slot; unsigned slot;
PCIBus *bus;
if (nd->model && !strcmp(nd->model, "virtio")) { if (!nd) {
g_free(nd->model); return false;
nd->model = g_strdup("virtio-net-pci");
} }
pci_nic_models = qemu_get_nic_models(TYPE_PCI_DEVICE); if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) < 0) {
error_report("Invalid PCI device address %s for device %s",
if (qemu_show_nic_models(nd->model, (const char **)pci_nic_models->pdata)) { devaddr, model);
exit(0);
}
i = qemu_find_nic_model(nd, (const char **)pci_nic_models->pdata,
default_model);
if (i < 0) {
exit(1); exit(1);
} }
if (!rootbus) { if (dom != 0) {
error_report("No primary PCI bus"); error_report("No support for non-zero PCI domains");
exit(1); exit(1);
} }
assert(!rootbus->parent_dev); devfn = PCI_DEVFN(slot, 0);
if (!devaddr) {
devfn = -1;
busnr = 0;
} else {
if (pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) < 0) {
error_report("Invalid PCI device address %s for device %s",
devaddr, nd->model);
exit(1);
}
if (dom != 0) {
error_report("No support for non-zero PCI domains");
exit(1);
}
devfn = PCI_DEVFN(slot, 0);
}
bus = pci_find_bus_nr(rootbus, busnr); bus = pci_find_bus_nr(rootbus, busnr);
if (!bus) { if (!bus) {
error_report("Invalid PCI device address %s for device %s", error_report("Invalid PCI device address %s for device %s",
devaddr, nd->model); devaddr, model);
exit(1); exit(1);
} }
pci_dev = pci_new(devfn, nd->model); pci_dev = pci_new(devfn, model);
dev = &pci_dev->qdev; qdev_set_nic_properties(&pci_dev->qdev, nd);
qdev_set_nic_properties(dev, nd);
pci_realize_and_unref(pci_dev, bus, &error_fatal); pci_realize_and_unref(pci_dev, bus, &error_fatal);
g_ptr_array_free(pci_nic_models, true); return true;
return pci_dev;
} }
PCIDevice *pci_vga_init(PCIBus *bus) PCIDevice *pci_vga_init(PCIBus *bus)

4
hw/ppc/e500.c
View File

@ -1079,9 +1079,7 @@ void ppce500_init(MachineState *machine)
if (pci_bus) { if (pci_bus) {
/* Register network interfaces. */ /* Register network interfaces. */
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
} }
/* Register spinning region */ /* Register spinning region */

4
hw/ppc/mac_newworld.c
View File

@ -444,9 +444,7 @@ static void ppc_core99_init(MachineState *machine)
graphic_depth = 15; graphic_depth = 15;
} }
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
/* The NewWorld NVRAM is not located in the MacIO device */ /* The NewWorld NVRAM is not located in the MacIO device */
if (kvm_enabled() && qemu_real_host_page_size() > 4096) { if (kvm_enabled() && qemu_real_host_page_size() > 4096) {

4
hw/ppc/mac_oldworld.c
View File

@ -277,9 +277,7 @@ static void ppc_heathrow_init(MachineState *machine)
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci_bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
/* MacIO IDE */ /* MacIO IDE */
ide_drive_get(hd, ARRAY_SIZE(hd)); ide_drive_get(hd, ARRAY_SIZE(hd));

14
hw/ppc/ppc440_bamboo.c
View File

@ -161,7 +161,6 @@ static void bamboo_init(MachineState *machine)
DeviceState *uicdev; DeviceState *uicdev;
SysBusDevice *uicsbd; SysBusDevice *uicsbd;
int success; int success;
int i;
if (kvm_enabled()) { if (kvm_enabled()) {
error_report("machine %s does not support the KVM accelerator", error_report("machine %s does not support the KVM accelerator",
@ -234,14 +233,11 @@ static void bamboo_init(MachineState *machine)
} }
if (pcibus) { if (pcibus) {
/* Register network interfaces. */ /*
for (i = 0; i < nb_nics; i++) { * There are no PCI NICs on the Bamboo board, but there are
/* * PCI slots, so we can pick whatever default model we want.
* There are no PCI NICs on the Bamboo board, but there are */
* PCI slots, so we can pick whatever default model we want. pci_init_nic_devices(pcibus, mc->default_nic);
*/
pci_nic_init_nofail(&nd_table[i], pcibus, mc->default_nic, NULL);
}
} }
/* Load kernel. */ /* Load kernel. */

8
hw/ppc/prep.c
View File

@ -241,7 +241,6 @@ static void ibm_40p_init(MachineState *machine)
ISADevice *isa_dev; ISADevice *isa_dev;
ISABus *isa_bus; ISABus *isa_bus;
void *fw_cfg; void *fw_cfg;
int i;
uint32_t kernel_base = 0, initrd_base = 0; uint32_t kernel_base = 0, initrd_base = 0;
long kernel_size = 0, initrd_size = 0; long kernel_size = 0, initrd_size = 0;
char boot_device; char boot_device;
@ -336,10 +335,9 @@ static void ibm_40p_init(MachineState *machine)
/* XXX: s3-trio at PCI_DEVFN(2, 0) */ /* XXX: s3-trio at PCI_DEVFN(2, 0) */
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
for (i = 0; i < nb_nics; i++) { /* First PCNET device at PCI_DEVFN(3, 0) */
pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "3");
i == 0 ? "3" : NULL); pci_init_nic_devices(pci_bus, mc->default_nic);
}
} }
/* Prepare firmware configuration for OpenBIOS */ /* Prepare firmware configuration for OpenBIOS */

18
hw/ppc/spapr.c
View File

@ -2796,6 +2796,7 @@ static void spapr_machine_init(MachineState *machine)
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
long load_limit, fw_size; long load_limit, fw_size;
Error *resize_hpt_err = NULL; Error *resize_hpt_err = NULL;
NICInfo *nd;
if (!filename) { if (!filename) {
error_report("Could not find LPAR firmware '%s'", bios_name); error_report("Could not find LPAR firmware '%s'", bios_name);
@ -2996,21 +2997,12 @@ static void spapr_machine_init(MachineState *machine)
phb = spapr_create_default_phb(); phb = spapr_create_default_phb();
for (i = 0; i < nb_nics; i++) { while ((nd = qemu_find_nic_info("spapr-vlan", true, "ibmveth"))) {
NICInfo *nd = &nd_table[i]; spapr_vlan_create(spapr->vio_bus, nd);
if (!nd->model) {
nd->model = g_strdup("spapr-vlan");
}
if (g_str_equal(nd->model, "spapr-vlan") ||
g_str_equal(nd->model, "ibmveth")) {
spapr_vlan_create(spapr->vio_bus, nd);
} else {
pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
}
} }
pci_init_nic_devices(phb->bus, NULL);
for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) { for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) {
spapr_vscsi_create(spapr->vio_bus); spapr_vscsi_create(spapr->vio_bus);
} }

14
hw/riscv/microchip_pfsoc.c
View File

@ -202,7 +202,6 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
MemoryRegion *envm_data = g_new(MemoryRegion, 1); MemoryRegion *envm_data = g_new(MemoryRegion, 1);
MemoryRegion *qspi_xip_mem = g_new(MemoryRegion, 1); MemoryRegion *qspi_xip_mem = g_new(MemoryRegion, 1);
char *plic_hart_config; char *plic_hart_config;
NICInfo *nd;
int i; int i;
sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort);
@ -411,17 +410,8 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
memmap[MICROCHIP_PFSOC_USB].size); memmap[MICROCHIP_PFSOC_USB].size);
/* GEMs */ /* GEMs */
qemu_configure_nic_device(DEVICE(&s->gem0), true, NULL);
nd = &nd_table[0]; qemu_configure_nic_device(DEVICE(&s->gem1), true, NULL);
if (nd->used) {
qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
qdev_set_nic_properties(DEVICE(&s->gem0), nd);
}
nd = &nd_table[1];
if (nd->used) {
qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
qdev_set_nic_properties(DEVICE(&s->gem1), nd);
}
object_property_set_int(OBJECT(&s->gem0), "revision", GEM_REVISION, errp); object_property_set_int(OBJECT(&s->gem0), "revision", GEM_REVISION, errp);
object_property_set_int(OBJECT(&s->gem0), "phy-addr", 8, errp); object_property_set_int(OBJECT(&s->gem0), "phy-addr", 8, errp);

7
hw/riscv/sifive_u.c
View File

@ -789,7 +789,6 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)
MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1); MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1);
char *plic_hart_config; char *plic_hart_config;
int i, j; int i, j;
NICInfo *nd = &nd_table[0];
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1); qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1);
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1); qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1);
@ -893,11 +892,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)
} }
sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_DEV_OTP].base); sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_DEV_OTP].base);
/* FIXME use qdev NIC properties instead of nd_table[] */ qemu_configure_nic_device(DEVICE(&s->gem), true, NULL);
if (nd->used) {
qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
qdev_set_nic_properties(DEVICE(&s->gem), nd);
}
object_property_set_int(OBJECT(&s->gem), "revision", GEM_REVISION, object_property_set_int(OBJECT(&s->gem), "revision", GEM_REVISION,
&error_abort); &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gem), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->gem), errp)) {

11
hw/s390x/s390-virtio-ccw.c
View File

@ -229,16 +229,9 @@ static void s390_init_ipl_dev(const char *kernel_filename,
static void s390_create_virtio_net(BusState *bus, const char *name) static void s390_create_virtio_net(BusState *bus, const char *name)
{ {
int i; DeviceState *dev;
for (i = 0; i < nb_nics; i++) { while ((dev = qemu_create_nic_device(name, true, "virtio"))) {
NICInfo *nd = &nd_table[i];
DeviceState *dev;
qemu_check_nic_model(nd, "virtio");
dev = qdev_new(name);
qdev_set_nic_properties(dev, nd);
qdev_realize_and_unref(dev, bus, &error_fatal); qdev_realize_and_unref(dev, bus, &error_fatal);
} }
} }

6
hw/sh4/r2d.c
View File

@ -240,7 +240,6 @@ static void r2d_init(MachineState *machine)
MemoryRegion *sdram = g_new(MemoryRegion, 1); MemoryRegion *sdram = g_new(MemoryRegion, 1);
qemu_irq *irq; qemu_irq *irq;
DriveInfo *dinfo; DriveInfo *dinfo;
int i;
DeviceState *dev; DeviceState *dev;
SysBusDevice *busdev; SysBusDevice *busdev;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
@ -309,9 +308,8 @@ static void r2d_init(MachineState *machine)
0x555, 0x2aa, 0); 0x555, 0x2aa, 0);
/* NIC: rtl8139 on-board, and 2 slots. */ /* NIC: rtl8139 on-board, and 2 slots. */
for (i = 0; i < nb_nics; i++) pci_init_nic_in_slot(pci_bus, mc->default_nic, NULL, "2");
pci_nic_init_nofail(&nd_table[i], pci_bus, pci_init_nic_devices(pci_bus, mc->default_nic);
mc->default_nic, i == 0 ? "2" : NULL);
/* USB keyboard */ /* USB keyboard */
usb_create_simple(usb_bus_find(-1), "usb-kbd"); usb_create_simple(usb_bus_find(-1), "usb-kbd");

20
hw/sparc/sun4m.c
View File

@ -299,13 +299,15 @@ static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq)
static void *sparc32_dma_init(hwaddr dma_base, static void *sparc32_dma_init(hwaddr dma_base,
hwaddr esp_base, qemu_irq espdma_irq, hwaddr esp_base, qemu_irq espdma_irq,
hwaddr le_base, qemu_irq ledma_irq, NICInfo *nd) hwaddr le_base, qemu_irq ledma_irq,
MACAddr *mac)
{ {
DeviceState *dma; DeviceState *dma;
ESPDMADeviceState *espdma; ESPDMADeviceState *espdma;
LEDMADeviceState *ledma; LEDMADeviceState *ledma;
SysBusESPState *esp; SysBusESPState *esp;
SysBusPCNetState *lance; SysBusPCNetState *lance;
NICInfo *nd = qemu_find_nic_info("lance", true, NULL);
dma = qdev_new(TYPE_SPARC32_DMA); dma = qdev_new(TYPE_SPARC32_DMA);
espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component( espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
@ -320,7 +322,14 @@ static void *sparc32_dma_init(hwaddr dma_base,
lance = SYSBUS_PCNET(object_resolve_path_component( lance = SYSBUS_PCNET(object_resolve_path_component(
OBJECT(ledma), "lance")); OBJECT(ledma), "lance"));
qdev_set_nic_properties(DEVICE(lance), nd);
if (nd) {
qdev_set_nic_properties(DEVICE(lance), nd);
memcpy(mac->a, nd->macaddr.a, sizeof(mac->a));
} else {
qemu_macaddr_default_if_unset(mac);
qdev_prop_set_macaddr(DEVICE(lance), "mac", mac->a);
}
sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base); sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base);
@ -823,7 +832,7 @@ static void sun4m_hw_init(MachineState *machine)
unsigned int smp_cpus = machine->smp.cpus; unsigned int smp_cpus = machine->smp.cpus;
unsigned int max_cpus = machine->smp.max_cpus; unsigned int max_cpus = machine->smp.max_cpus;
HostMemoryBackend *ram_memdev = machine->memdev; HostMemoryBackend *ram_memdev = machine->memdev;
NICInfo *nd = &nd_table[0]; MACAddr hostid;
if (machine->ram_size > hwdef->max_mem) { if (machine->ram_size > hwdef->max_mem) {
error_report("Too much memory for this machine: %" PRId64 "," error_report("Too much memory for this machine: %" PRId64 ","
@ -884,10 +893,9 @@ static void sun4m_hw_init(MachineState *machine)
hwdef->iommu_pad_base, hwdef->iommu_pad_len); hwdef->iommu_pad_base, hwdef->iommu_pad_len);
} }
qemu_check_nic_model(nd, TYPE_LANCE);
sparc32_dma_init(hwdef->dma_base, sparc32_dma_init(hwdef->dma_base,
hwdef->esp_base, slavio_irq[18], hwdef->esp_base, slavio_irq[18],
hwdef->le_base, slavio_irq[16], nd); hwdef->le_base, slavio_irq[16], &hostid);
if (graphic_depth != 8 && graphic_depth != 24) { if (graphic_depth != 8 && graphic_depth != 24) {
error_report("Unsupported depth: %d", graphic_depth); error_report("Unsupported depth: %d", graphic_depth);
@ -1039,7 +1047,7 @@ static void sun4m_hw_init(MachineState *machine)
machine->initrd_filename, machine->initrd_filename,
machine->ram_size, &initrd_size); machine->ram_size, &initrd_size);
nvram_init(nvram, (uint8_t *)&nd->macaddr, machine->kernel_cmdline, nvram_init(nvram, hostid.a, machine->kernel_cmdline,
machine->boot_config.order, machine->ram_size, kernel_size, machine->boot_config.order, machine->ram_size, kernel_size,
graphic_width, graphic_height, graphic_depth, graphic_width, graphic_height, graphic_depth,
hwdef->nvram_machine_id, "Sun4m"); hwdef->nvram_machine_id, "Sun4m");

27
hw/sparc64/sun4u.c
View File

@ -639,29 +639,18 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
memset(&macaddr, 0, sizeof(MACAddr)); memset(&macaddr, 0, sizeof(MACAddr));
onboard_nic = false; onboard_nic = false;
for (i = 0; i < nb_nics; i++) {
PCIBus *bus;
nd = &nd_table[i];
if (!nd->model || strcmp(nd->model, mc->default_nic) == 0) {
if (!onboard_nic) {
pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), mc->default_nic);
bus = pci_busA;
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
onboard_nic = true;
} else {
pci_dev = pci_new(-1, mc->default_nic);
bus = pci_busB;
}
} else {
pci_dev = pci_new(-1, nd->model);
bus = pci_busB;
}
nd = qemu_find_nic_info(mc->default_nic, true, NULL);
if (nd) {
pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), mc->default_nic);
dev = &pci_dev->qdev; dev = &pci_dev->qdev;
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
pci_realize_and_unref(pci_dev, bus, &error_fatal); pci_realize_and_unref(pci_dev, pci_busA, &error_fatal);
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
onboard_nic = true;
} }
pci_init_nic_devices(pci_busB, mc->default_nic);
/* If we don't have an onboard NIC, grab a default MAC address so that /* If we don't have an onboard NIC, grab a default MAC address so that
* we have a valid machine id */ * we have a valid machine id */

6
hw/xen/xen-bus.c
View File

@ -19,6 +19,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "net/net.h"
#include "trace.h" #include "trace.h"
static char *xen_device_get_backend_path(XenDevice *xendev) static char *xen_device_get_backend_path(XenDevice *xendev)
@ -1133,7 +1134,7 @@ static void xen_register_types(void)
type_init(xen_register_types) type_init(xen_register_types)
BusState *xen_bus_init(void) void xen_bus_init(void)
{ {
DeviceState *dev = qdev_new(TYPE_XEN_BRIDGE); DeviceState *dev = qdev_new(TYPE_XEN_BRIDGE);
BusState *bus = qbus_new(TYPE_XEN_BUS, dev, NULL); BusState *bus = qbus_new(TYPE_XEN_BUS, dev, NULL);
@ -1141,5 +1142,6 @@ BusState *xen_bus_init(void)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
qbus_set_bus_hotplug_handler(bus); qbus_set_bus_hotplug_handler(bus);
return bus; qemu_create_nic_bus_devices(bus, TYPE_XEN_DEVICE, "xen-net-device",
"xen", "xen-net-device");
} }

25
hw/xen/xen_devconfig.c
View File

@ -46,31 +46,6 @@ static int xen_config_dev_all(char *fe, char *be)
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
int xen_config_dev_nic(NICInfo *nic)
{
char fe[256], be[256];
char mac[20];
int vlan_id = -1;
net_hub_id_for_client(nic->netdev, &vlan_id);
snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
nic->macaddr.a[0], nic->macaddr.a[1], nic->macaddr.a[2],
nic->macaddr.a[3], nic->macaddr.a[4], nic->macaddr.a[5]);
xen_pv_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", vlan_id, mac);
xen_config_dev_dirs("vif", "qnic", vlan_id, fe, be, sizeof(fe));
/* frontend */
xenstore_write_int(fe, "handle", vlan_id);
xenstore_write_str(fe, "mac", mac);
/* backend */
xenstore_write_int(be, "handle", vlan_id);
xenstore_write_str(be, "mac", mac);
/* common stuff */
return xen_config_dev_all(fe, be);
}
int xen_config_dev_vfb(int vdev, const char *type) int xen_config_dev_vfb(int vdev, const char *type)
{ {
char fe[256], be[256]; char fe[256], be[256];

9
hw/xenpv/xen_machine_pv.c
View File

@ -32,8 +32,6 @@
static void xen_init_pv(MachineState *machine) static void xen_init_pv(MachineState *machine)
{ {
int i;
setup_xen_backend_ops(); setup_xen_backend_ops();
/* Initialize backend core & drivers */ /* Initialize backend core & drivers */
@ -62,13 +60,6 @@ static void xen_init_pv(MachineState *machine)
vga_interface_created = true; vga_interface_created = true;
} }
/* configure nics */
for (i = 0; i < nb_nics; i++) {
if (!nd_table[i].model || 0 != strcmp(nd_table[i].model, "xen"))
continue;
xen_config_dev_nic(nd_table + i);
}
xen_bus_init(); xen_bus_init();
/* config cleanup hook */ /* config cleanup hook */

4
hw/xtensa/virt.c
View File

@ -102,9 +102,7 @@ static void create_pcie(MachineState *ms, CPUXtensaState *env, int irq_base,
pci = PCI_HOST_BRIDGE(dev); pci = PCI_HOST_BRIDGE(dev);
if (pci->bus) { if (pci->bus) {
for (i = 0; i < nb_nics; i++) { pci_init_nic_devices(pci->bus, mc->default_nic);
pci_nic_init_nofail(&nd_table[i], pci->bus, mc->default_nic, NULL);
}
} }
} }

13
hw/xtensa/xtfpga.c
View File

@ -141,14 +141,16 @@ static void xtfpga_net_init(MemoryRegion *address_space,
hwaddr base, hwaddr base,
hwaddr descriptors, hwaddr descriptors,
hwaddr buffers, hwaddr buffers,
qemu_irq irq, NICInfo *nd) qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
MemoryRegion *ram; MemoryRegion *ram;
dev = qdev_new("open_eth"); dev = qemu_create_nic_device("open_eth", true, NULL);
qdev_set_nic_properties(dev, nd); if (!dev) {
return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -301,10 +303,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
memory_region_add_subregion(system_memory, board->io[1], io); memory_region_add_subregion(system_memory, board->io[1], io);
} }
xtfpga_fpga_init(system_io, 0x0d020000, freq); xtfpga_fpga_init(system_io, 0x0d020000, freq);
if (nd_table[0].used) { xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000, extints[1]);
xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000,
extints[1], nd_table);
}
serial_mm_init(system_io, 0x0d050020, 2, extints[0], serial_mm_init(system_io, 0x0d050020, 2, extints[0],
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);

2
include/hw/cris/etraxfs.h
View File

@ -31,7 +31,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qapi/error.h" #include "qapi/error.h"
DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, DeviceState *etraxfs_eth_init(hwaddr base, int phyaddr,
struct etraxfs_dma_client *dma_out, struct etraxfs_dma_client *dma_out,
struct etraxfs_dma_client *dma_in); struct etraxfs_dma_client *dma_in);

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

@ -33,7 +33,6 @@ typedef struct PCMachineState {
/* Pointers to devices and objects: */ /* Pointers to devices and objects: */
PCIBus *bus; PCIBus *bus;
BusState *xenbus;
I2CBus *smbus; I2CBus *smbus;
PFlashCFI01 *flash[2]; PFlashCFI01 *flash[2];
ISADevice *pcspk; ISADevice *pcspk;
@ -185,8 +184,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
void pc_cmos_init(PCMachineState *pcms, void pc_cmos_init(PCMachineState *pcms,
BusState *ide0, BusState *ide1, BusState *ide0, BusState *ide1,
ISADevice *s); ISADevice *s);
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus, void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus);
BusState *xen_bus);
void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs); void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);

2
include/hw/net/lan9118.h
View File

@ -15,6 +15,6 @@
#define TYPE_LAN9118 "lan9118" #define TYPE_LAN9118 "lan9118"
void lan9118_init(NICInfo *, uint32_t, qemu_irq); void lan9118_init(uint32_t, qemu_irq);
#endif #endif

4
include/hw/net/lasi_82596.h
View File

@ -25,7 +25,7 @@ struct SysBusI82596State {
int val_index:1; int val_index:1;
}; };
SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, hwaddr hpa,
hwaddr hpa, qemu_irq irq); qemu_irq irq, gboolean match_default);
#endif #endif

2
include/hw/net/ne2000-isa.h
View File

@ -22,8 +22,6 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,
{ {
ISADevice *d; ISADevice *d;
qemu_check_nic_model(nd, "ne2k_isa");
d = isa_try_new(TYPE_ISA_NE2000); d = isa_try_new(TYPE_ISA_NE2000);
if (d) { if (d) {
DeviceState *dev = DEVICE(d); DeviceState *dev = DEVICE(d);

2
include/hw/net/smc91c111.h
View File

@ -13,6 +13,6 @@
#include "net/net.h" #include "net/net.h"
void smc91c111_init(NICInfo *, uint32_t, qemu_irq); void smc91c111_init(uint32_t, qemu_irq);
#endif #endif

7
include/hw/pci/pci.h
View File

@ -314,10 +314,9 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev,
PCIINTxRoutingNotifier notifier); PCIINTxRoutingNotifier notifier);
void pci_device_reset(PCIDevice *dev); void pci_device_reset(PCIDevice *dev);
PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, void pci_init_nic_devices(PCIBus *bus, const char *default_model);
const char *default_model, bool pci_init_nic_in_slot(PCIBus *rootbus, const char *default_model,
const char *default_devaddr); const char *alias, const char *devaddr);
PCIDevice *pci_vga_init(PCIBus *bus); PCIDevice *pci_vga_init(PCIBus *bus);
static inline PCIBus *pci_get_bus(const PCIDevice *dev) static inline PCIBus *pci_get_bus(const PCIDevice *dev)

2
include/hw/xen/xen-bus.h
View File

@ -75,7 +75,7 @@ struct XenBusClass {
OBJECT_DECLARE_TYPE(XenBus, XenBusClass, OBJECT_DECLARE_TYPE(XenBus, XenBusClass,
XEN_BUS) XEN_BUS)
BusState *xen_bus_init(void); void xen_bus_init(void);
void xen_device_backend_set_state(XenDevice *xendev, void xen_device_backend_set_state(XenDevice *xendev,
enum xenbus_state state); enum xenbus_state state);

1
include/hw/xen/xen-legacy-backend.h
View File

@ -81,7 +81,6 @@ extern struct XenDevOps xen_usb_ops; /* xen-usb.c */
/* configuration (aka xenbus setup) */ /* configuration (aka xenbus setup) */
void xen_config_cleanup(void); void xen_config_cleanup(void);
int xen_config_dev_nic(NICInfo *nic);
int xen_config_dev_vfb(int vdev, const char *type); int xen_config_dev_vfb(int vdev, const char *type);
int xen_config_dev_vkbd(int vdev); int xen_config_dev_vkbd(int vdev);
int xen_config_dev_console(int vdev); int xen_config_dev_console(int vdev);

70
include/net/net.h
View File

@ -203,11 +203,69 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len);
int qemu_set_vnet_le(NetClientState *nc, bool is_le); int qemu_set_vnet_le(NetClientState *nc, bool is_le);
int qemu_set_vnet_be(NetClientState *nc, bool is_be); int qemu_set_vnet_be(NetClientState *nc, bool is_be);
void qemu_macaddr_default_if_unset(MACAddr *macaddr); void qemu_macaddr_default_if_unset(MACAddr *macaddr);
int qemu_show_nic_models(const char *arg, const char *const *models); /**
void qemu_check_nic_model(NICInfo *nd, const char *model); * qemu_find_nic_info: Obtain NIC configuration information
int qemu_find_nic_model(NICInfo *nd, const char * const *models, * @typename: Name of device object type
const char *default_model); * @match_default: Match NIC configurations with no model specified
* @alias: Additional model string to match (for user convenience and
* backward compatibility).
*
* Search for a NIC configuration matching the NIC model constraints.
*/
NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
const char *alias);
/**
* qemu_configure_nic_device: Apply NIC configuration to a given device
* @dev: Network device to be configured
* @match_default: Match NIC configurations with no model specified
* @alias: Additional model string to match
*
* Search for a NIC configuration for the provided device, using the
* additionally specified matching constraints. If found, apply the
* configuration using qdev_set_nic_properties() and return %true.
*
* This is used by platform code which creates the device anyway,
* regardless of whether there is a configuration for it. This tends
* to be platforms which ignore `--nodefaults` and create net devices
* anyway, for example because the Ethernet device on that board is
* always physically present.
*/
bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
const char *alias);
/**
* qemu_create_nic_device: Create a NIC device if a configuration exists for it
* @typename: Object typename of network device
* @match_default: Match NIC configurations with no model specified
* @alias: Additional model string to match
*
* Search for a NIC configuration for the provided device type. If found,
* create an object of the corresponding type and return it.
*/
DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
const char *alias);
/*
* qemu_create_nic_bus_devices: Create configured NIC devices for a given bus
* @bus: Bus on which to create devices
* @parent_type: Object type for devices to be created (e.g. TYPE_PCI_DEVICE)
* @default_model: Object type name for default NIC model (or %NULL)
* @alias: Additional model string to replace, for user convenience
* @alias_target: Actual object type name to be used in place of @alias
*
* Instantiate dynamic NICs on a given bus, typically a PCI bus. This scans
* for available NIC configurations which either specify a model which is
* a child type of @parent_type, or which do not specify a model when
* @default_model is non-NULL. Each device is instantiated on the given @bus.
*
* A single substitution is supported, e.g. "xen" → "xen-net-device" for the
* Xen bus, or "virtio" → "virtio-net-pci" for PCI. This allows the user to
* specify a more understandable "model=" parameter on the command line, not
* only the real object typename.
*/
void qemu_create_nic_bus_devices(BusState *bus, const char *parent_type,
const char *default_model,
const char *alias, const char *alias_target);
void print_net_client(Monitor *mon, NetClientState *nc); void print_net_client(Monitor *mon, NetClientState *nc);
void net_socket_rs_init(SocketReadState *rs, void net_socket_rs_init(SocketReadState *rs,
SocketReadStateFinalize *finalize, SocketReadStateFinalize *finalize,
@ -243,10 +301,6 @@ struct NICInfo {
int nvectors; int nvectors;
}; };
extern int nb_nics;
extern NICInfo nd_table[MAX_NICS];
extern const char *host_net_devices[];
/* from net.c */ /* from net.c */
extern NetClientStateList net_clients; extern NetClientStateList net_clients;
bool netdev_is_modern(const char *optstr); bool netdev_is_modern(const char *optstr);

253
net/net.c
View File

@ -75,6 +75,11 @@ typedef QSIMPLEQ_HEAD(, NetdevQueueEntry) NetdevQueue;
static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue); static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
static GHashTable *nic_model_help;
static int nb_nics;
static NICInfo nd_table[MAX_NICS];
/***********************************************************/ /***********************************************************/
/* network device redirectors */ /* network device redirectors */
@ -975,51 +980,6 @@ GPtrArray *qemu_get_nic_models(const char *device_type)
return nic_models; return nic_models;
} }
int qemu_show_nic_models(const char *arg, const char *const *models)
{
int i;
if (!arg || !is_help_option(arg)) {
return 0;
}
printf("Available NIC models:\n");
for (i = 0 ; models[i]; i++) {
printf("%s\n", models[i]);
}
return 1;
}
void qemu_check_nic_model(NICInfo *nd, const char *model)
{
const char *models[2];
models[0] = model;
models[1] = NULL;
if (qemu_show_nic_models(nd->model, models))
exit(0);
if (qemu_find_nic_model(nd, models, model) < 0)
exit(1);
}
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model)
{
int i;
if (!nd->model)
nd->model = g_strdup(default_model);
for (i = 0 ; models[i]; i++) {
if (strcmp(nd->model, models[i]) == 0)
return i;
}
error_report("Unsupported NIC model: %s", nd->model);
return -1;
}
static int net_init_nic(const Netdev *netdev, const char *name, static int net_init_nic(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp) NetClientState *peer, Error **errp)
{ {
@ -1087,6 +1047,192 @@ static int net_init_nic(const Netdev *netdev, const char *name,
return idx; return idx;
} }
static gboolean add_nic_result(gpointer key, gpointer value, gpointer user_data)
{
GPtrArray *results = user_data;
GPtrArray *alias_list = value;
const char *model = key;
char *result;
if (!alias_list) {
result = g_strdup(model);
} else {
GString *result_str = g_string_new(model);
int i;
g_string_append(result_str, " (aka ");
for (i = 0; i < alias_list->len; i++) {
if (i) {
g_string_append(result_str, ", ");
}
g_string_append(result_str, alias_list->pdata[i]);
}
g_string_append(result_str, ")");
result = result_str->str;
g_string_free(result_str, false);
g_ptr_array_unref(alias_list);
}
g_ptr_array_add(results, result);
return true;
}
static int model_cmp(char **a, char **b)
{
return strcmp(*a, *b);
}
static void show_nic_models(void)
{
GPtrArray *results = g_ptr_array_new();
int i;
g_hash_table_foreach_remove(nic_model_help, add_nic_result, results);
g_ptr_array_sort(results, (GCompareFunc)model_cmp);
printf("Available NIC models for this configuration:\n");
for (i = 0 ; i < results->len; i++) {
printf("%s\n", (char *)results->pdata[i]);
}
g_hash_table_unref(nic_model_help);
nic_model_help = NULL;
}
static void add_nic_model_help(const char *model, const char *alias)
{
GPtrArray *alias_list = NULL;
if (g_hash_table_lookup_extended(nic_model_help, model, NULL,
(gpointer *)&alias_list)) {
/* Already exists, no alias to add: return */
if (!alias) {
return;
}
if (alias_list) {
/* Check if this alias is already in the list. Add if not. */
if (!g_ptr_array_find_with_equal_func(alias_list, alias,
g_str_equal, NULL)) {
g_ptr_array_add(alias_list, g_strdup(alias));
}
return;
}
}
/* Either this model wasn't in the list already, or a first alias added */
if (alias) {
alias_list = g_ptr_array_new();
g_ptr_array_set_free_func(alias_list, g_free);
g_ptr_array_add(alias_list, g_strdup(alias));
}
g_hash_table_replace(nic_model_help, g_strdup(model), alias_list);
}
NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
const char *alias)
{
NICInfo *nd;
int i;
if (nic_model_help) {
add_nic_model_help(typename, alias);
}
for (i = 0; i < nb_nics; i++) {
nd = &nd_table[i];
if (!nd->used || nd->instantiated) {
continue;
}
if ((match_default && !nd->model) || !g_strcmp0(nd->model, typename)
|| (alias && !g_strcmp0(nd->model, alias))) {
return nd;
}
}
return NULL;
}
/* "I have created a device. Please configure it if you can" */
bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
const char *alias)
{
NICInfo *nd = qemu_find_nic_info(object_get_typename(OBJECT(dev)),
match_default, alias);
if (nd) {
qdev_set_nic_properties(dev, nd);
return true;
}
return false;
}
/* "Please create a device, if you have a configuration for it" */
DeviceState *qemu_create_nic_device(const char *typename, bool match_default,
const char *alias)
{
NICInfo *nd = qemu_find_nic_info(typename, match_default, alias);
DeviceState *dev;
if (!nd) {
return NULL;
}
dev = qdev_new(typename);
qdev_set_nic_properties(dev, nd);
return dev;
}
void qemu_create_nic_bus_devices(BusState *bus, const char *parent_type,
const char *default_model,
const char *alias, const char *alias_target)
{
GPtrArray *nic_models = qemu_get_nic_models(parent_type);
const char *model;
DeviceState *dev;
NICInfo *nd;
int i;
if (nic_model_help) {
if (alias_target) {
add_nic_model_help(alias_target, alias);
}
for (i = 0; i < nic_models->len - 1; i++) {
add_nic_model_help(nic_models->pdata[i], NULL);
}
}
/* Drop the NULL terminator which would make g_str_equal() unhappy */
nic_models->len--;
for (i = 0; i < nb_nics; i++) {
nd = &nd_table[i];
if (!nd->used || nd->instantiated) {
continue;
}
model = nd->model ? nd->model : default_model;
if (!model) {
continue;
}
/* Each bus type is allowed *one* substitution */
if (g_str_equal(model, alias)) {
model = alias_target;
}
if (!g_ptr_array_find_with_equal_func(nic_models, model,
g_str_equal, NULL)) {
/* This NIC does not live on this bus. */
continue;
}
dev = qdev_new(model);
qdev_set_nic_properties(dev, nd);
qdev_realize_and_unref(dev, bus, &error_fatal);
}
g_ptr_array_free(nic_models, true);
}
static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
const Netdev *netdev, const Netdev *netdev,
@ -1555,6 +1701,10 @@ void net_check_clients(void)
NetClientState *nc; NetClientState *nc;
int i; int i;
if (nic_model_help) {
show_nic_models();
exit(0);
}
net_hub_check_clients(); net_hub_check_clients();
QTAILQ_FOREACH(nc, &net_clients, next) { QTAILQ_FOREACH(nc, &net_clients, next) {
@ -1612,9 +1762,14 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
} }
if (is_help_option(type)) { if (is_help_option(type)) {
GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE); GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE);
int i;
show_netdevs(); show_netdevs();
printf("\n"); printf("\n");
qemu_show_nic_models(type, (const char **)nic_models->pdata); printf("Available NIC models "
"(use -nic model=help for a filtered list):\n");
for (i = 0 ; nic_models->pdata[i]; i++) {
printf("%s\n", (char *)nic_models->pdata[i]);
}
g_ptr_array_free(nic_models, true); g_ptr_array_free(nic_models, true);
exit(0); exit(0);
} }
@ -1634,6 +1789,12 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
memset(ni, 0, sizeof(*ni)); memset(ni, 0, sizeof(*ni));
ni->model = qemu_opt_get_del(opts, "model"); ni->model = qemu_opt_get_del(opts, "model");
if (!nic_model_help && !g_strcmp0(ni->model, "help")) {
nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
return 0;
}
/* Create an ID if the user did not specify one */ /* Create an ID if the user did not specify one */
nd_id = g_strdup(qemu_opts_id(opts)); nd_id = g_strdup(qemu_opts_id(opts));
if (!nd_id) { if (!nd_id) {

2
system/globals.c
View File

@ -36,8 +36,6 @@ int display_opengl;
const char* keyboard_layout; const char* keyboard_layout;
bool enable_mlock; bool enable_mlock;
bool enable_cpu_pm; bool enable_cpu_pm;
int nb_nics;
NICInfo nd_table[MAX_NICS];
int autostart = 1; int autostart = 1;
int vga_interface_type = VGA_NONE; int vga_interface_type = VGA_NONE;
bool vga_interface_created; bool vga_interface_created;

18
tests/qtest/npcm7xx_emc-test.c
View File

@ -225,21 +225,11 @@ static int *packet_test_init(int module_num, GString *cmd_line)
g_assert_cmpint(ret, != , -1); g_assert_cmpint(ret, != , -1);
/* /*
* KISS and use -nic. We specify two nics (both emc{0,1}) because there's * KISS and use -nic. The driver accepts 'emc0' and 'emc1' as aliases
* currently no way to specify only emc1: The driver implicitly relies on * in the 'model' field to specify the device to match.
* emc[i] == nd_table[i].
*/ */
if (module_num == 0) { g_string_append_printf(cmd_line, " -nic socket,fd=%d,model=emc%d ",
g_string_append_printf(cmd_line, test_sockets[1], module_num);
" -nic socket,fd=%d,model=" TYPE_NPCM7XX_EMC " "
" -nic user,model=" TYPE_NPCM7XX_EMC " ",
test_sockets[1]);
} else {
g_string_append_printf(cmd_line,
" -nic user,model=" TYPE_NPCM7XX_EMC " "
" -nic socket,fd=%d,model=" TYPE_NPCM7XX_EMC " ",
test_sockets[1]);
}
g_test_queue_destroy(packet_test_clear, test_sockets); g_test_queue_destroy(packet_test_clear, test_sockets);
return test_sockets; return test_sockets;