[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/38] ivshmem: Failed realize() can leave migration
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 15/38] ivshmem: Failed realize() can leave migration blocker behind |
Date: |
Mon, 29 Feb 2016 19:40:31 +0100 |
If pci_ivshmem_realize() fails after it created its migration blocker,
the blocker is left in place. Fix that by creating it last.
Likewise, if it fails after it called fifo8_create(), it leaks fifo
memory. Fix that the same way.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/misc/ivshmem.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index eb53d9a..1392426 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -824,6 +824,7 @@ static void ivshmem_write_config(PCIDevice *pdev, uint32_t
address,
static void pci_ivshmem_realize(PCIDevice *dev, Error **errp)
{
IVShmemState *s = IVSHMEM(dev);
+ Error *err = NULL;
uint8_t *pci_conf;
uint8_t attr = PCI_BASE_ADDRESS_SPACE_MEMORY |
PCI_BASE_ADDRESS_MEM_PREFETCH;
@@ -855,8 +856,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
s->ivshmem_size = size;
}
- fifo8_create(&s->incoming_fifo, sizeof(int64_t));
-
/* IRQFD requires MSI */
if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) &&
!ivshmem_has_feature(s, IVSHMEM_MSI)) {
@@ -878,12 +877,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
s->role_val = IVSHMEM_MASTER; /* default */
}
- if (s->role_val == IVSHMEM_PEER) {
- error_setg(&s->migration_blocker,
- "Migration is disabled when using feature 'peer mode' in
device 'ivshmem'");
- migrate_add_blocker(s->migration_blocker);
- }
-
pci_conf = dev->config;
pci_conf[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
@@ -962,7 +955,19 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
return;
}
- create_shared_memory_BAR(s, fd, attr, errp);
+ create_shared_memory_BAR(s, fd, attr, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ }
+
+ fifo8_create(&s->incoming_fifo, sizeof(int64_t));
+
+ if (s->role_val == IVSHMEM_PEER) {
+ error_setg(&s->migration_blocker,
+ "Migration is disabled when using feature 'peer mode' in
device 'ivshmem'");
+ migrate_add_blocker(s->migration_blocker);
}
}
--
2.4.3
- [Qemu-devel] [PATCH 00/38] ivshmem: Fixes, cleanups, device model split, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 09/38] ivshmem: Add missing newlines to debug printfs, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 02/38] qemu-doc: Fix ivshmem huge page example, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 07/38] ivshmem-test: Improve test cases /ivshmem/server-*, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 11/38] ivshmem: Clean up after commit 9940c32, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 12/38] ivshmem: Drop ivshmem_event() stub, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 05/38] ivshmem-test: Improve test case /ivshmem/single, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 15/38] ivshmem: Failed realize() can leave migration blocker behind,
Markus Armbruster <=
- [Qemu-devel] [PATCH 14/38] ivshmem: Fix harmless misuse of Error, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 10/38] ivshmem: Compile debug prints unconditionally to prevent bit-rot, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 22/38] ivshmem: Plug leaks on unplug, fix peer disconnect, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 06/38] ivshmem-test: Clean up wait for devices to become operational, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 16/38] ivshmem: Clean up register callbacks, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 03/38] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 13/38] ivshmem: Don't destroy the chardev on version mismatch, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 21/38] ivshmem: Disentangle ivshmem_read(), Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 32/38] qdev: New DEFINE_PROP_ON_OFF_AUTO, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 26/38] ivshmem: Drop the hackish test for UNIX domain chardev, Markus Armbruster, 2016/02/29