• M
    msf2: Unbreak device-list-properties for "msf-soc" · 2b065020
    Markus Armbruster 提交于
    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-g3a9163af"}, "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
    8aabc543 "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: 05b7374a ("msf2: Add EMAC block to SmartFusion2 SoC")
    Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
    Message-Id: <20200715140440.3540942-2-armbru@redhat.com>
    Reviewed-by: NAlistair Francis <alistair.francis@wdc.com>
    Reviewed-by: NThomas Huth <thuth@redhat.com>
    Signed-off-by: NThomas Huth <thuth@redhat.com>
    2b065020
msf2-soc.c 9.1 KB