diff options
| author | Paolo Bonzini | 2014-06-25 20:21:37 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-07-14 16:14:15 +0200 |
| commit | 7497bce6c2561f1215fe179e40837774f6243799 (patch) | |
| tree | 42997828a5597dc03e15d98b5cbb74801d7b9fdb /hw/char | |
| parent | virtio-scsi: fix with -M pc-i440fx-2.0 (diff) | |
| download | qemu-7497bce6c2561f1215fe179e40837774f6243799.tar.gz qemu-7497bce6c2561f1215fe179e40837774f6243799.tar.xz qemu-7497bce6c2561f1215fe179e40837774f6243799.zip | |
serial-pci: remove memory regions from BAR before destroying them
Otherwise, hot-unplug of pci-serial-2x trips the assertion
in memory_region_destroy:
(qemu) device_del gg
(qemu) qemu-system-x86_64: /work/armbru/tmp/qemu/memory.c:1021: memory_region_destroy: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed.
Aborted (core dumped)
Reported-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char')
| -rw-r--r-- | hw/char/serial-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index f53bb9c5d0..c133c33e7a 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -148,6 +148,7 @@ static void multi_serial_pci_exit(PCIDevice *dev) for (i = 0; i < pci->ports; i++) { s = pci->state + i; serial_exit_core(s); + memory_region_del_subregion(&pci->iobar, &s->io); memory_region_destroy(&s->io); g_free(pci->name[i]); } |