david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sun4u: fix assert when adding NICs which aren't the in-built model

Browse Source 
Commit 8d93297 introduced a bug whereby non-inbuilt NICs are realized before
setting the default MAC address causing an assert. Switch NIC creation
over from pci_create_simple() to pci_create() which works exactly the
same except omitting the realize as originally intended.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
This commit is contained in:
Mark Cave-Ayland 2017-10-15 10:05:59 +01:00
parent 6864fa3897
commit bcf9e2c2f2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/sparc64/sun4u.c
View File

@ -494,10 +494,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr)); memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
onboard_nic = true; onboard_nic = true;
} else { } else {
pci_dev = pci_create_simple(pci_busB, -1, "sunhme"); pci_dev = pci_create(pci_busB, -1, "sunhme");
} }
} else { } else {
pci_dev = pci_create_simple(pci_busB, -1, nd->model); pci_dev = pci_create(pci_busB, -1, nd->model);
} }
dev = &pci_dev->qdev; dev = &pci_dev->qdev;