[Qemu-devel] [PULL 0/2] simple Xen fixes

[Qemu-devel] [PULL 0/2] simple Xen fixes

[Stefano Stabellini]

Hi Anthony,
I have a couple of old Xen one-line fixes laying around:

Stefano Stabellini (2):
      xen_console: ignore console disconnect events from console/0
      xen_disk: detach the blkdev before bdrv_delete

 hw/xen_console.c |    3 +++
 hw/xen_disk.c    |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)


Please pull:

git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-fixes


They should also go into stable-1.0.


Cheers,

Stefano

[Qemu-devel] [PATCH 1/2] xen_console: ignore console disconnect events from console/0

[Stefano Stabellini]

The first console has a different location compared to other PV devices
(console, rather than device/console/0) and doesn't obey the xenstore
state protocol. We already special case the first console in con_init
and con_initialise, we should also do it in con_disconnect.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 hw/xen_console.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/hw/xen_console.c b/hw/xen_console.c
index edcb31c..3794b19 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -248,6 +248,9 @@ 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);
     xen_be_unbind_evtchn(&con->xendev);
-- 
1.7.2.5

[Qemu-devel] [PATCH 2/2] xen_disk: detach the blkdev before bdrv_delete

[Stefano Stabellini]

We need to detach the blkdev from the BlockDriverState before calling
bdrv_delete.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 hw/xen_disk.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 68fa36a..bf06fc1 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -726,6 +726,7 @@ static void blk_disconnect(struct XenDevice *xendev)
         if (!blkdev->dinfo) {
             /* close/delete only if we created it ourself */
             bdrv_close(blkdev->bs);
+            bdrv_detach_dev(blkdev->bs, blkdev);
             bdrv_delete(blkdev->bs);
         }
         blkdev->bs = NULL;
-- 
1.7.2.5

Re: [Qemu-devel] [PULL 0/2] simple Xen fixes

[Anthony Liguori]

On 03/27/2012 11:14 AM, Stefano Stabellini wrote:
> Hi Anthony,
> I have a couple of old Xen one-line fixes laying around:
>
> Stefano Stabellini (2):
>        xen_console: ignore console disconnect events from console/0
>        xen_disk: detach the blkdev before bdrv_delete
>
>   hw/xen_console.c |    3 +++
>   hw/xen_disk.c    |    1 +
>   2 files changed, 4 insertions(+), 0 deletions(-)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
>
> Please pull:
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-fixes
>
>
> They should also go into stable-1.0.
>
>
> Cheers,
>
> Stefano
>
>