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

hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases

Browse Source 
Also update the test to specify which device to attach the test socket
to, and remove the comment lamenting the fact that we can't do so.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
David Woodhouse 2023-10-23 09:37:39 +01:00
parent 27c0235f72
commit 707a42e2db
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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;