9cc71e44f4
- Stable fixes from upstream * Patches added: block-introduce-max_hw_iov-for-use-in-sc.patch hmp-Unbreak-change-vnc.patch qemu-nbd-Change-default-cache-mode-to-wr.patch target-arm-Don-t-skip-M-profile-reset-en.patch vhost-vsock-fix-migration-issue-when-seq.patch virtio-mem-pci-Fix-memory-leak-when-crea.patch virtio-net-fix-use-after-unmap-free-for-.patch OBS-URL: https://build.opensuse.org/request/show/924265 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=675
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From: David Hildenbrand <david@redhat.com>
|
|
Date: Wed, 29 Sep 2021 18:24:43 +0200
|
|
Subject: virtio-mem-pci: Fix memory leak when creating
|
|
MEMORY_DEVICE_SIZE_CHANGE event
|
|
|
|
Git-commit: 75b98cb9f6456ccf194211beffcbf93b0a995fa4
|
|
|
|
Apparently, we don't have to duplicate the string.
|
|
|
|
Fixes: 722a3c783ef4 ("virtio-pci: Send qapi events when the virtio-mem size changes")
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
Message-Id: <20210929162445.64060-2-david@redhat.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Li Zhang <li.zhang@suse.com>
|
|
---
|
|
hw/virtio/virtio-mem-pci.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c
|
|
index fa5395cd88577964fba445c68f2d..7e384b7397edf9014c4e81df4ff5 100644
|
|
--- a/hw/virtio/virtio-mem-pci.c
|
|
+++ b/hw/virtio/virtio-mem-pci.c
|
|
@@ -88,13 +88,8 @@ static void virtio_mem_pci_size_change_notify(Notifier *notifier, void *data)
|
|
size_change_notifier);
|
|
DeviceState *dev = DEVICE(pci_mem);
|
|
const uint64_t * const size_p = data;
|
|
- const char *id = NULL;
|
|
|
|
- if (dev->id) {
|
|
- id = g_strdup(dev->id);
|
|
- }
|
|
-
|
|
- qapi_event_send_memory_device_size_change(!!id, id, *size_p);
|
|
+ qapi_event_send_memory_device_size_change(!!dev->id, dev->id, *size_p);
|
|
}
|
|
|
|
static void virtio_mem_pci_class_init(ObjectClass *klass, void *data)
|