From: Ian Campbell <ian.campbell@citrix.com> To: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell <ian.campbell@citrix.com>, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [PATCH QEMU-XEN v8 1/8] xen_console: correctly cleanup primary console on teardown. Date: Fri, 15 Jan 2016 13:23:37 +0000 [thread overview] Message-ID: <1452864224-2554-2-git-send-email-ian.campbell@citrix.com> (raw) In-Reply-To: <1452864224-2554-1-git-send-email-ian.campbell@citrix.com> 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 <ian.campbell@citrix.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- v4: New patch based on feedback to "xen: Switch uses of xc_map_foreign_bulk to use libxenforeignmemory API." --- 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; } } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Ian Campbell <ian.campbell@citrix.com> To: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell <ian.campbell@citrix.com>, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Subject: [PATCH QEMU-XEN v8 1/8] xen_console: correctly cleanup primary console on teardown. Date: Fri, 15 Jan 2016 13:23:37 +0000 [thread overview] Message-ID: <1452864224-2554-2-git-send-email-ian.campbell@citrix.com> (raw) In-Reply-To: <1452864224-2554-1-git-send-email-ian.campbell@citrix.com> 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 <ian.campbell@citrix.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- v4: New patch based on feedback to "xen: Switch uses of xc_map_foreign_bulk to use libxenforeignmemory API." --- 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; } } -- 2.1.4
next prev parent reply other threads:[~2016-01-15 13:23 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-15 13:22 [Qemu-devel] [Minios-devel] [PATCH v8 0/<VARIOUS>] Begin to disentangle libxenctrl and provide some stable libraries Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 00/29] " Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 01/29] tools/libxc: Remove osdep indirection for xc_evtchn Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 02/29] tools: Refactor /dev/xen/evtchn wrappers into libxenevtchn Ian Campbell 2016-01-22 11:48 ` Ian Campbell 2016-01-22 17:12 ` Boris Ostrovsky 2016-01-25 9:48 ` Ian Campbell 2016-01-25 14:35 ` Ian Jackson 2016-01-25 14:39 ` Boris Ostrovsky 2016-01-25 14:47 ` Ian Campbell 2016-01-25 14:49 ` Andrew Cooper 2016-01-25 15:28 ` Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 03/29] tools: Arrange to check public headers for ANSI compatiblity Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 04/29] tools/libxc: Remove osdep indirection for xc_gnt{shr, tab} Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 05/29] tools: Refactor /dev/xen/gnt{dev, shr} wrappers into libxengnttab Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 06/29] tools/libxc: Remove osdep indirection for privcmd Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 07/29] tools: Refactor hypercall calling wrappers into libxencall Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 08/29] tools/libxc: drop xc_map_foreign_bulk_compat wrappers Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 09/29] tools: Remove xc_map_foreign_batch Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 10/29] tools: Implement xc_map_foreign_range(s) in terms of common helper Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 11/29] tools: Refactor foreign memory mapping into libxenforeignmemory Ian Campbell 2016-01-25 12:01 ` Olaf Hering 2016-01-25 12:31 ` Ian Campbell 2016-01-25 12:44 ` Ian Campbell 2016-01-25 12:45 ` [PATCH] kdd: Opt in to libxc compat xc_map_foreign_* intefaces Ian Campbell 2016-01-25 13:25 ` Tim Deegan 2016-01-25 14:22 ` Ian Campbell 2016-01-25 14:00 ` Olaf Hering 2016-01-25 13:18 ` [PATCH] kdd: build using Werror Ian Campbell 2016-01-25 13:20 ` Olaf Hering 2016-01-25 13:24 ` Ian Campbell 2016-01-25 13:25 ` Tim Deegan 2016-01-25 14:22 ` Ian Campbell 2016-01-25 14:37 ` Olaf Hering 2016-01-15 13:22 ` [PATCH XEN v8 12/29] tools/libs/foreignmemory: provide xenforeignmemory_unmap Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 13/29] tools/libs/foreignmemory: use size_t for size arguments Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 14/29] tools/libs/foreignmemory: Mention restrictions on fork in docs Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-19 13:34 ` Ian Campbell 2016-01-19 14:25 ` Wei Liu 2016-01-15 13:22 ` [PATCH XEN v8 15/29] tools/libs/foreignmemory: Support err == NULL to map Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 16/29] tools/libs/foreignmemory: pull array length argument to map forward Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 17/29] tools/libs/evtchn: Review and update doc comments Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 18/29] tools/libs/evtchn: Use uint32_t for domid arguments Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-15 13:22 ` [PATCH XEN v8 19/29] tools/libs: Clean up hard tabs Ian Campbell 2016-01-15 13:22 ` [PATCH XEN v8 20/29] tools/libs/gnttab: Extensive updates to API documentation Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-15 13:23 ` [PATCH XEN v8 21/29] tools/libs/call: Update some log messages to not refer to xc Ian Campbell 2016-01-15 13:23 ` [PATCH XEN v8 22/29] tools/libs/call: Describe return values and error semantics for xencall* Ian Campbell 2016-01-15 13:23 ` [PATCH XEN v8 23/29] tools/libs/call: Avoid xc_memalign in netbsd and solaris backends Ian Campbell 2016-01-15 13:23 ` [PATCH XEN v8 24/29] tools/libs/call: linux: touch newly allocated pages after madvise lockdown Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-19 13:40 ` Ian Campbell 2016-01-19 14:26 ` Wei Liu 2016-01-19 14:54 ` Roger Pau Monné 2016-01-19 14:58 ` Wei Liu 2016-01-19 15:03 ` Ian Campbell 2016-01-19 15:49 ` Wei Liu 2016-01-19 15:59 ` Ian Campbell 2016-01-15 13:23 ` [PATCH XEN v8 25/29] tools/libs/{call, evtchn}: Document requirements around forking Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-15 13:23 ` [PATCH XEN v8 26/29] tools/libs/*: Use O_CLOEXEC on Linux and FreeBSD Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-15 13:23 ` [PATCH XEN v8 27/29] tools: Update CFLAGS for qemu-xen to allow it to use new libraries Ian Campbell 2016-01-15 13:23 ` [PATCH XEN v8 28/29] tools/libs/*: Introduce APIs to restrict handles to a specific domain Ian Campbell 2016-01-19 13:24 ` Wei Liu 2016-01-19 13:44 ` Ian Campbell 2016-01-19 14:30 ` Wei Liu 2016-01-15 13:23 ` [PATCH XEN v8 29/29] HACK: Update Config.mk to pull all the right bits from my xenbits trees Ian Campbell 2016-01-15 13:23 ` [PATCH QEMU-XEN v8 0/8] Begin to disentangle libxenctrl and provide some stable libraries Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] " Ian Campbell 2016-01-15 13:23 ` Ian Campbell [this message] 2016-01-15 13:23 ` [PATCH QEMU-XEN v8 1/8] xen_console: correctly cleanup primary console on teardown Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 2/8] xen: Switch to libxenevtchn interface for compat shims Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 3/8] xen: Switch to libxengnttab " Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 4/8] xen: Switch uses of xc_map_foreign_range into xc_map_foreign_pages Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 5/8] xen: Switch uses of xc_map_foreign_{pages, bulk} to use libxenforeignmemory API Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 14:43 ` [Qemu-devel] " Stefano Stabellini 2016-01-15 14:43 ` Stefano Stabellini 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 6/8] xen: Use stable library interfaces when they are available Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 14:43 ` [Qemu-devel] " Stefano Stabellini 2016-01-15 14:43 ` Stefano Stabellini 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 7/8] xen: domainbuild: reopen libxenctrl interface after forking for domain watcher Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 13:23 ` [Qemu-devel] [PATCH QEMU-XEN v8 8/8] xen: make it possible to build without the Xen PV domain builder Ian Campbell 2016-01-15 13:23 ` Ian Campbell 2016-01-15 14:44 ` [Qemu-devel] [PATCH QEMU-XEN v8 0/8] Begin to disentangle libxenctrl and provide some stable libraries Stefano Stabellini 2016-01-15 15:08 ` Ian Campbell 2016-01-15 15:08 ` [Qemu-devel] " Ian Campbell 2016-01-15 14:44 ` Stefano Stabellini 2016-01-15 13:23 ` [PATCH QEMU-XEN-TRADITIONAL v8 0/4] " Ian Campbell 2016-01-15 13:23 ` [PATCH QEMU-XEN-TRADITIONAL v8 1/4] qemu-xen-traditional: Use libxenevtchn Ian Campbell 2016-01-15 13:23 ` [PATCH QEMU-XEN-TRADITIONAL v8 2/4] qemu-xen-traditional: Use libxengnttab Ian Campbell 2016-01-15 13:23 ` [PATCH QEMU-XEN-TRADITIONAL v8 3/4] qemu-xen-traditional: Add libxencall to rpath-link Ian Campbell 2016-01-15 13:23 ` [PATCH QEMU-XEN-TRADITIONAL v8 4/4] qemu-xen-traditional: Add libxenforeignmemory " Ian Campbell 2016-01-15 13:23 ` [PATCH MINI-OS v8 0/4] Begin to disentangle libxenctrl and provide some stable libraries Ian Campbell 2016-01-15 13:24 ` [PATCH MINI-OS v8 1/4] mini-os: Include libxenevtchn with libxc Ian Campbell 2016-01-15 13:24 ` [PATCH MINI-OS v8 2/4] mini-os: Include libxengnttab " Ian Campbell 2016-01-15 13:24 ` [PATCH MINI-OS v8 3/4] mini-os: Include libxencall " Ian Campbell 2016-01-15 13:24 ` [PATCH MINI-OS v8 4/4] mini-os: Include libxenforeignmemory " Ian Campbell 2016-01-19 15:44 ` [Qemu-devel] [Minios-devel] [PATCH v8 0/<VARIOUS>] Begin to disentangle libxenctrl and provide some stable libraries Ian Campbell 2016-01-22 10:42 ` Ian Campbell 2016-01-22 10:42 ` [Qemu-devel] " Ian Campbell 2016-01-19 15:44 ` Ian Campbell 2016-01-22 14:14 ` [Qemu-devel] " Ian Campbell 2016-01-22 14:14 ` Ian Campbell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1452864224-2554-2-git-send-email-ian.campbell@citrix.com \ --to=ian.campbell@citrix.com \ --cc=ian.jackson@eu.citrix.com \ --cc=qemu-devel@nongnu.org \ --cc=stefano.stabellini@eu.citrix.com \ --cc=wei.liu2@citrix.com \ --cc=xen-devel@lists.xen.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.