From bcf9e2c2f2b7a610efaafc4bd6d0bee9181c2345 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Sun, 15 Oct 2017 10:05:59 +0100 Subject: [PATCH] sun4u: fix assert when adding NICs which aren't the in-built model 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 Reviewed-by: Artyom Tarasenko --- hw/sparc64/sun4u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 55d81ee73e..77a787466a 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -494,10 +494,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem, memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr)); onboard_nic = true; } else { - pci_dev = pci_create_simple(pci_busB, -1, "sunhme"); + pci_dev = pci_create(pci_busB, -1, "sunhme"); } } else { - pci_dev = pci_create_simple(pci_busB, -1, nd->model); + pci_dev = pci_create(pci_busB, -1, nd->model); } dev = &pci_dev->qdev; -- 2.11.4.GIT