|
 |
4d7edd7 |
From: Li Qiang <liqiang6-s@360.cn>
|
|
|
4d7edd7 |
Date: Mon, 7 Nov 2016 21:57:46 -0800
|
|
|
4d7edd7 |
Subject: [PATCH] usbredir: free vm_change_state_handler in usbredir destroy
|
|
|
4d7edd7 |
dispatch
|
|
|
4d7edd7 |
MIME-Version: 1.0
|
|
|
4d7edd7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4d7edd7 |
Content-Transfer-Encoding: 8bit
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
In usbredir destroy dispatch function, it doesn't free the vm change
|
|
|
4d7edd7 |
state handler once registered in usbredir_realize function. This will
|
|
|
4d7edd7 |
lead a memory leak issue. This patch avoid this.
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
|
|
|
4d7edd7 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
4d7edd7 |
Message-id: 58216976.d0236b0a.77b99.bcd6@mx.google.com
|
|
|
4d7edd7 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4d7edd7 |
(cherry picked from commit 07b026fd82d6cf11baf7d7c603c4f5f6070b35bf)
|
|
|
4d7edd7 |
---
|
|
|
4d7edd7 |
hw/usb/redirect.c | 5 ++++-
|
|
|
4d7edd7 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
|
|
4d7edd7 |
index 8d80540..136cacc 100644
|
|
|
4d7edd7 |
--- a/hw/usb/redirect.c
|
|
|
4d7edd7 |
+++ b/hw/usb/redirect.c
|
|
|
4d7edd7 |
@@ -131,6 +131,7 @@ struct USBRedirDevice {
|
|
|
4d7edd7 |
struct usbredirfilter_rule *filter_rules;
|
|
|
4d7edd7 |
int filter_rules_count;
|
|
|
4d7edd7 |
int compatible_speedmask;
|
|
|
4d7edd7 |
+ VMChangeStateEntry *vmstate;
|
|
|
4d7edd7 |
};
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
#define TYPE_USB_REDIR "usb-redir"
|
|
|
4d7edd7 |
@@ -1406,7 +1407,8 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
|
|
|
4d7edd7 |
qemu_chr_add_handlers(dev->cs, usbredir_chardev_can_read,
|
|
|
4d7edd7 |
usbredir_chardev_read, usbredir_chardev_event, dev);
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
- qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
|
|
|
4d7edd7 |
+ dev->vmstate =
|
|
|
4d7edd7 |
+ qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
|
|
|
4d7edd7 |
}
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
|
|
|
4d7edd7 |
@@ -1443,6 +1445,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
|
|
|
4d7edd7 |
}
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
free(dev->filter_rules);
|
|
|
4d7edd7 |
+ qemu_del_vm_change_state_handler(dev->vmstate);
|
|
|
4d7edd7 |
}
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
static int usbredir_check_filter(USBRedirDevice *dev)
|