From patchwork Thu Oct 8 18:58:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/16] hotplug: safely iterate bus's sibling list while removing a device From: Mark McLoughlin X-Patchwork-Id: 35519 Message-Id: <1255028312-28180-3-git-send-email-markmc@redhat.com> To: qemu-devel@nongnu.org Cc: Mark McLoughlin , Gerd Hoffmann Date: Thu, 8 Oct 2009 19:58:18 +0100 Without this, I'm seeing a segfault when unpluging a NIC. Cc: Gerd Hoffmann Signed-off-by: Mark McLoughlin --- hw/acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index 4373133..d73aee9 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -695,11 +695,11 @@ static uint32_t pciej_read(void *opaque, uint32_t addr) static void pciej_write(void *opaque, uint32_t addr, uint32_t val) { BusState *bus = opaque; - DeviceState *qdev; + DeviceState *qdev, *next; PCIDevice *dev; int slot = ffs(val) - 1; - QLIST_FOREACH(qdev, &bus->children, sibling) { + QLIST_FOREACH_SAFE(qdev, &bus->children, sibling, next) { dev = DO_UPCAST(PCIDevice, qdev, qdev); if (PCI_SLOT(dev->devfn) == slot) { #if defined (TARGET_I386)