[Qemu-devel] [PATCH] usbredir: free vm_change_state_handler in usbredir destroy dispatch

[Qemu-devel] [PATCH] usbredir: free vm_change_state_handler in usbredir destroy dispatch

[Li Qiang]

From: Li Qiang <liqiang6-s@360.cn>

In usbredir destroy dispatch function, it doesn't free the vm change
state handler once registered in usbredir_realize function. This will
lead a memory leak issue. This patch avoid this.

Signed-off-by: Li Qiang <liqiang6-s@360.cn>
---
 hw/usb/redirect.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 528081e..a657237 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -132,6 +132,7 @@ struct USBRedirDevice {
     struct usbredirfilter_rule *filter_rules;
     int filter_rules_count;
     int compatible_speedmask;
+    VMChangeStateEntry *vmstate;
 };
 
 #define TYPE_USB_REDIR "usb-redir"
@@ -1411,7 +1412,8 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
                              usbredir_chardev_read, usbredir_chardev_event,
                              dev, NULL, true);
 
-    qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
+    dev->vmstate =
+        qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
 }
 
 static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
@@ -1450,6 +1452,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
     }
 
     free(dev->filter_rules);
+    qemu_del_vm_change_state_handler(dev->vmstate);
 }
 
 static int usbredir_check_filter(USBRedirDevice *dev)
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] usbredir: free vm_change_state_handler in usbredir destroy dispatch

[Marc-André Lureau]

Hi

On Tue, Nov 8, 2016 at 9:58 AM Li Qiang <liq3ea@gmail.com> wrote:

> From: Li Qiang <liqiang6-s@360.cn>
>
> In usbredir destroy dispatch function, it doesn't free the vm change
> state handler once registered in usbredir_realize function. This will
> lead a memory leak issue. This patch avoid this.
>
> Signed-off-by: Li Qiang <liqiang6-s@360.cn>
>


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>



> ---
>  hw/usb/redirect.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
> index 528081e..a657237 100644
> --- a/hw/usb/redirect.c
> +++ b/hw/usb/redirect.c
> @@ -132,6 +132,7 @@ struct USBRedirDevice {
>      struct usbredirfilter_rule *filter_rules;
>      int filter_rules_count;
>      int compatible_speedmask;
> +    VMChangeStateEntry *vmstate;
>  };
>
>  #define TYPE_USB_REDIR "usb-redir"
> @@ -1411,7 +1412,8 @@ static void usbredir_realize(USBDevice *udev, Error
> **errp)
>                               usbredir_chardev_read,
> usbredir_chardev_event,
>                               dev, NULL, true);
>
> -    qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
> +    dev->vmstate =
> +        qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
>  }
>
>  static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
> @@ -1450,6 +1452,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
>      }
>
>      free(dev->filter_rules);
> +    qemu_del_vm_change_state_handler(dev->vmstate);
>  }
>
>  static int usbredir_check_filter(USBRedirDevice *dev)
> --
> 1.8.3.1
>
>
> --
Marc-André Lureau