diff options
| author | Stefan Hajnoczi | 2016-11-22 20:30:39 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-11-22 20:30:39 +0100 |
| commit | 01d7d15ce31ffb625ae6cf6ea295ecdad8456365 (patch) | |
| tree | d87c554d3bc3b5b82ac10e6674ffbf1090bf1bfc /hw/xen/xen_pvdev.c | |
| parent | Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging (diff) | |
| parent | xen: attach pvusb usb bus to backend qdev (diff) | |
| download | qemu-01d7d15ce31ffb625ae6cf6ea295ecdad8456365.tar.gz qemu-01d7d15ce31ffb625ae6cf6ea295ecdad8456365.tar.xz qemu-01d7d15ce31ffb625ae6cf6ea295ecdad8456365.zip | |
Merge remote-tracking branch 'sstabellini/tags/xen-20161122-tag' into staging
Xen 2016/11/22
# gpg: Signature made Tue 22 Nov 2016 06:41:23 PM GMT
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* sstabellini/tags/xen-20161122-tag:
xen: attach pvusb usb bus to backend qdev
xen: create qdev for each backend device
qdev: add function qdev_set_id()
xen: add an own bus for xen backend devices
xen: fix ioreq handling
Message-id: alpine.DEB.2.10.1611221037010.21858@sstabellini-ThinkPad-X260
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/xen/xen_pvdev.c')
| -rw-r--r-- | hw/xen/xen_pvdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 5212bc6d9e..aed783e844 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/qdev-core.h" #include "hw/xen/xen_backend.h" #include "hw/xen/xen_pvdev.h" @@ -307,7 +308,8 @@ void xen_pv_del_xendev(struct XenDevice *xendev) } QTAILQ_REMOVE(&xendevs, xendev, next); - g_free(xendev); + + qdev_unplug(&xendev->qdev, NULL); } void xen_pv_insert_xendev(struct XenDevice *xendev) |