* [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c
@ 2011-06-08 9:44 Wei Liu
2011-06-08 10:54 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Wei Liu @ 2011-06-08 9:44 UTC (permalink / raw)
To: xen-devel@lists.xensource.com; +Cc: Ian Jackson
This is a patch for qemu-xen. Don't know if it is the right place to
post.
It has been fixed in upstream QEMU.
------8<----------------
commit 28ec10ef3ff22873cd3f1b703d3aecbc93cbf680
Author: Wei Liu <liuw@liuw.name>
Date: Wed Jun 8 17:40:02 2011 +0800
qemu-xen: fix unmapping logic in hw/xen_console.c.
Signed-off-by: Wei Liu <liuw@liuw.name>
diff --git a/hw/xen_console.c b/hw/xen_console.c
index 0a2374c..d7099c4 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -258,7 +258,7 @@ static void con_disconnect(struct XenDevice *xendev)
xen_be_unbind_evtchn(&con->xendev);
if (con->sring) {
- if (!xendev->dev)
+ if (!xendev->gnttabdev)
munmap(con->sring, XC_PAGE_SIZE);
else
xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c
2011-06-08 9:44 [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c Wei Liu
@ 2011-06-08 10:54 ` Stefano Stabellini
2011-06-08 11:33 ` Wei Liu
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Stabellini @ 2011-06-08 10:54 UTC (permalink / raw)
To: Wei Liu; +Cc: Ian, xen-devel@lists.xensource.com, Jackson
On Wed, 8 Jun 2011, Wei Liu wrote:
> This is a patch for qemu-xen. Don't know if it is the right place to
> post.
>
it is the right place
> It has been fixed in upstream QEMU.
>
The patch looks sensible but I tried to find it in upstream QEMU and I
couldn't. Where is the original patch you are referring to?
> ------8<----------------
> commit 28ec10ef3ff22873cd3f1b703d3aecbc93cbf680
> Author: Wei Liu <liuw@liuw.name>
> Date: Wed Jun 8 17:40:02 2011 +0800
>
> qemu-xen: fix unmapping logic in hw/xen_console.c.
>
> Signed-off-by: Wei Liu <liuw@liuw.name>
>
> diff --git a/hw/xen_console.c b/hw/xen_console.c
> index 0a2374c..d7099c4 100644
> --- a/hw/xen_console.c
> +++ b/hw/xen_console.c
> @@ -258,7 +258,7 @@ static void con_disconnect(struct XenDevice *xendev)
> xen_be_unbind_evtchn(&con->xendev);
>
> if (con->sring) {
> - if (!xendev->dev)
> + if (!xendev->gnttabdev)
> munmap(con->sring, XC_PAGE_SIZE);
> else
> xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c
2011-06-08 10:54 ` Stefano Stabellini
@ 2011-06-08 11:33 ` Wei Liu
2011-06-08 11:53 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Wei Liu @ 2011-06-08 11:33 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: Ian, xen-devel@lists.xensource.com, Jackson
On Wed, 2011-06-08 at 11:54 +0100, Stefano Stabellini wrote:
> On Wed, 8 Jun 2011, Wei Liu wrote:
> > This is a patch for qemu-xen. Don't know if it is the right place to
> > post.
> >
>
> it is the right place
>
>
> > It has been fixed in upstream QEMU.
> >
>
> The patch looks sensible but I tried to find it in upstream QEMU and I
> couldn't. Where is the original patch you are referring to?
>
Sorry if I got you confused. Here by "upstream" I mean Anthony's
xenpv-support branch.
The commit is b1999dfdad84d1204a03bc5e7d0405255a6a7cf8 .
>
> > ------8<----------------
> > commit 28ec10ef3ff22873cd3f1b703d3aecbc93cbf680
> > Author: Wei Liu <liuw@liuw.name>
> > Date: Wed Jun 8 17:40:02 2011 +0800
> >
> > qemu-xen: fix unmapping logic in hw/xen_console.c.
> >
> > Signed-off-by: Wei Liu <liuw@liuw.name>
> >
> > diff --git a/hw/xen_console.c b/hw/xen_console.c
> > index 0a2374c..d7099c4 100644
> > --- a/hw/xen_console.c
> > +++ b/hw/xen_console.c
> > @@ -258,7 +258,7 @@ static void con_disconnect(struct XenDevice *xendev)
> > xen_be_unbind_evtchn(&con->xendev);
> >
> > if (con->sring) {
> > - if (!xendev->dev)
> > + if (!xendev->gnttabdev)
> > munmap(con->sring, XC_PAGE_SIZE);
> > else
> > xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);
> >
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xensource.com
> > http://lists.xensource.com/xen-devel
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c
2011-06-08 11:33 ` Wei Liu
@ 2011-06-08 11:53 ` Stefano Stabellini
2011-06-21 16:59 ` Ian Jackson
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Stabellini @ 2011-06-08 11:53 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel@lists.xensource.com, Ian Jackson, Stefano Stabellini
On Wed, 8 Jun 2011, Wei Liu wrote:
> On Wed, 2011-06-08 at 11:54 +0100, Stefano Stabellini wrote:
> > On Wed, 8 Jun 2011, Wei Liu wrote:
> > > This is a patch for qemu-xen. Don't know if it is the right place to
> > > post.
> > >
> >
> > it is the right place
> >
> >
> > > It has been fixed in upstream QEMU.
> > >
> >
> > The patch looks sensible but I tried to find it in upstream QEMU and I
> > couldn't. Where is the original patch you are referring to?
> >
>
> Sorry if I got you confused. Here by "upstream" I mean Anthony's
> xenpv-support branch.
>
> The commit is b1999dfdad84d1204a03bc5e7d0405255a6a7cf8 .
>
I understand now.
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > ------8<----------------
> > > commit 28ec10ef3ff22873cd3f1b703d3aecbc93cbf680
> > > Author: Wei Liu <liuw@liuw.name>
> > > Date: Wed Jun 8 17:40:02 2011 +0800
> > >
> > > qemu-xen: fix unmapping logic in hw/xen_console.c.
> > >
> > > Signed-off-by: Wei Liu <liuw@liuw.name>
> > >
> > > diff --git a/hw/xen_console.c b/hw/xen_console.c
> > > index 0a2374c..d7099c4 100644
> > > --- a/hw/xen_console.c
> > > +++ b/hw/xen_console.c
> > > @@ -258,7 +258,7 @@ static void con_disconnect(struct XenDevice *xendev)
> > > xen_be_unbind_evtchn(&con->xendev);
> > >
> > > if (con->sring) {
> > > - if (!xendev->dev)
> > > + if (!xendev->gnttabdev)
> > > munmap(con->sring, XC_PAGE_SIZE);
> > > else
> > > xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);
> > >
> > >
> > >
> > > _______________________________________________
> > > Xen-devel mailing list
> > > Xen-devel@lists.xensource.com
> > > http://lists.xensource.com/xen-devel
> > >
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-06-21 16:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-08 9:44 [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c Wei Liu
2011-06-08 10:54 ` Stefano Stabellini
2011-06-08 11:33 ` Wei Liu
2011-06-08 11:53 ` Stefano Stabellini
2011-06-21 16:59 ` Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).