[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc"
From: |
Markus Armbruster |
Subject: |
[PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc" |
Date: |
Wed, 15 Jul 2020 16:04:39 +0200 |
Watch this:
$ qemu-system-aarch64 -M ast2600-evb -S -display none -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 0, "major": 5},
"package": "v5.0.0-2464-g3a9163af4e"}, "capabilities": ["oob"]}}
{"execute": "qmp_capabilities"}
{"return": {}}
{"execute": "device-list-properties", "arguments": {"typename": "msf2-soc"}}
Unsupported NIC model: ftgmac100
armbru@dusky:~/work/images$ echo $?
1
This is what breaks "make check SPEED=slow".
Root cause is m2sxxx_soc_initfn()'s messing with nd_table[] via
qemu_check_nic_model(). That's wrong.
We fixed the exact same bug for device "allwinner-a10" in commit
8aabc5437b "hw/arm/allwinner-a10: Do not use nd_table in instance_init
function". Fix this instance the same way: move the offending code to
m2sxxx_soc_realize(), where it's less wrong, and add a FIXME comment.
Fixes: 05b7374a58cd18aa3516e33513808896d0ac9b7b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/arm/msf2-soc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index 16bb7c9916..33ea7df342 100644
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -82,10 +82,6 @@ static void m2sxxx_soc_initfn(Object *obj)
}
object_initialize_child(obj, "emac", &s->emac, TYPE_MSS_EMAC);
- 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]);
- }
}
static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
@@ -187,6 +183,11 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error
**errp)
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);
object_property_set_link(OBJECT(&s->emac), "ahb-bus",
OBJECT(get_system_memory()), &error_abort);
--
2.26.2
- [PATCH for-5.1 0/2] Unbreak make check SPEED=slow, Markus Armbruster, 2020/07/15
- [PATCH for-5.1 2/2] hw: Mark nd_table[] misuse in realize methods FIXME, Markus Armbruster, 2020/07/15
- [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc",
Markus Armbruster <=
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Philippe Mathieu-Daudé, 2020/07/15
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Markus Armbruster, 2020/07/15
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", sundeep subbaraya, 2020/07/15
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Thomas Huth, 2020/07/16
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Philippe Mathieu-Daudé, 2020/07/16
- Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", sundeep subbaraya, 2020/07/16
Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Thomas Huth, 2020/07/15
Re: [PATCH for-5.1 1/2] msf2: Unbreak device-list-properties for "msf-soc", Alistair Francis, 2020/07/15
Re: [PATCH for-5.1 0/2] Unbreak make check SPEED=slow, no-reply, 2020/07/15