[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 17/40] ivshmem: Failed realize() can leave migrati
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 17/40] ivshmem: Failed realize() can leave migration blocker behind |
Date: |
Mon, 21 Mar 2016 21:43:40 +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>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <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 299cf5b..51ad255 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -825,6 +825,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;
@@ -856,8 +857,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)) {
@@ -879,12 +878,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;
@@ -963,7 +956,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] [PULL v2 00/40] ivshmem: Fixes, cleanups, device model split, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 12/40] ivshmem: Compile debug prints unconditionally to prevent bit-rot, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 04/40] qemu-doc: Fix ivshmem huge page example, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 13/40] ivshmem: Clean up after commit 9940c32, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 07/40] ivshmem-test: Improve test case /ivshmem/single, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 05/40] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 02/40] ivshmem-server: Fix and clean up command line help, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 08/40] ivshmem-test: Clean up wait for devices to become operational, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 18/40] ivshmem: Clean up register callbacks, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 17/40] ivshmem: Failed realize() can leave migration blocker behind,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 22/40] ivshmem: Simplify rejection of invalid peer ID from server, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 16/40] ivshmem: Fix harmless misuse of Error, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 34/40] qdev: New DEFINE_PROP_ON_OFF_AUTO, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 38/40] ivshmem: Drop ivshmem property x-memdev, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 06/40] tests/libqos/pci-pc: Fix qpci_pc_iomap() to map BARs aligned, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 11/40] ivshmem: Add missing newlines to debug printfs, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 14/40] ivshmem: Drop ivshmem_event() stub, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 15/40] ivshmem: Don't destroy the chardev on version mismatch, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 24/40] ivshmem: Plug leaks on unplug, fix peer disconnect, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 20/40] ivshmem: Leave INTx alone when using MSI-X, Markus Armbruster, 2016/03/21