[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] xen_console: correctly cleanup primary console o
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 1/8] xen_console: correctly cleanup primary console on teardown. |
Date: |
Tue, 26 Jan 2016 15:52:00 +0000 |
From: Ian Campbell <address@hidden>
All of the work in con_disconnect applies to the primary console case
(when xendev->dev is NULL). Therefore remove the early check and bail
and allow it to fall through. All of the existing code is correctly
conditional already.
The ->dev and ->gnttabdev handles are either both set or neither. For
consistency with con_initialise() with to the former here too.
With this con_initialise and con_disconnect now mirror each other.
Fix up a hard tab in the function while editing.
Signed-off-by: Ian Campbell <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
---
hw/char/xen_console.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index eb7f450..63ade33 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -265,9 +265,6 @@ static void con_disconnect(struct XenDevice *xendev)
{
struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
- if (!xendev->dev) {
- return;
- }
if (con->chr) {
qemu_chr_add_handlers(con->chr, NULL, NULL, NULL, NULL);
qemu_chr_fe_release(con->chr);
@@ -275,12 +272,12 @@ static void con_disconnect(struct XenDevice *xendev)
xen_be_unbind_evtchn(&con->xendev);
if (con->sring) {
- if (!xendev->gnttabdev) {
+ if (!xendev->dev) {
munmap(con->sring, XC_PAGE_SIZE);
} else {
xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);
}
- con->sring = NULL;
+ con->sring = NULL;
}
}
--
1.7.10.4
- [Qemu-devel] [PULL 0/8] xen-20160126, Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 6/8] xen: Use stable library interfaces when they are available., Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 2/8] xen: Switch to libxenevtchn interface for compat shims., Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 8/8] xen: make it possible to build without the Xen PV domain builder, Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 3/8] xen: Switch to libxengnttab interface for compat shims., Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 5/8] xen: Switch uses of xc_map_foreign_{pages, bulk} to use libxenforeignmemory API., Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 1/8] xen_console: correctly cleanup primary console on teardown.,
Stefano Stabellini <=
- [Qemu-devel] [PULL 4/8] xen: Switch uses of xc_map_foreign_range into xc_map_foreign_pages, Stefano Stabellini, 2016/01/26
- [Qemu-devel] [PULL 7/8] xen: domainbuild: reopen libxenctrl interface after forking for domain watcher., Stefano Stabellini, 2016/01/26
- Re: [Qemu-devel] [PULL 0/8] xen-20160126, Peter Maydell, 2016/01/26