[PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[Wei Liu]

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);

Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[Stefano Stabellini]

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
> 

Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[Wei Liu]

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
> > 

Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[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
> > > 
> 
> 
> 

Re: [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

[Ian Jackson]

> > > >     qemu-xen: fix unmapping logic in hw/xen_console.c.

Applied, thanks.

I guess this should be considered for 4.1 backport too.

Ian.