[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] xen: handle backend deletion from xenstore
From: |
Gerd Hoffmann |
Subject: |
Re: [Qemu-devel] [PATCH] xen: handle backend deletion from xenstore |
Date: |
Mon, 16 Apr 2012 10:17:37 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:10.0.3) Gecko/20120307 Thunderbird/10.0.3 |
On 04/11/12 15:42, Stefano Stabellini wrote:
> Signed-off-by: Stefano Stabellini <address@hidden>
> ---
> hw/xen_backend.c | 17 +++++++++--------
> hw/xen_disk.c | 4 ++++
> 2 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/hw/xen_backend.c b/hw/xen_backend.c
> index d876cab..555da41 100644
> --- a/hw/xen_backend.c
> +++ b/hw/xen_backend.c
> @@ -589,7 +589,7 @@ static void xenstore_update_be(char *watch, char *type,
> int dom,
> struct XenDevOps *ops)
> {
> struct XenDevice *xendev;
> - char path[XEN_BUFSIZE], *dom0;
> + char path[XEN_BUFSIZE], *dom0, *bepath;
> unsigned int len, dev;
>
> dom0 = xs_get_domain_path(xenstore, 0);
> @@ -608,15 +608,16 @@ static void xenstore_update_be(char *watch, char *type,
> int dom,
> return;
> }
>
> - if (0) {
> - /* FIXME: detect devices being deleted from xenstore ... */
> - xen_be_del_xendev(dom, dev);
> - }
> -
> xendev = xen_be_get_xendev(type, dom, dev, ops);
> if (xendev != NULL) {
> - xen_be_backend_changed(xendev, path);
> - xen_be_check_state(xendev);
> + bepath = xs_read(xenstore, 0, xendev->be, &len);
> + if (bepath == NULL) {
> + xen_be_del_xendev(dom, dev);
> + } else {
> + free(bepath);
> + xen_be_backend_changed(xendev, path);
> + xen_be_check_state(xendev);
> + }
> }
> }
>
> diff --git a/hw/xen_disk.c b/hw/xen_disk.c
> index e9bbbf7..8217109 100644
> --- a/hw/xen_disk.c
> +++ b/hw/xen_disk.c
> @@ -824,6 +824,10 @@ static int blk_free(struct XenDevice *xendev)
> struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev,
> xendev);
> struct ioreq *ioreq;
>
> + if (blkdev->bs || blkdev->sring) {
> + blk_disconnect(xendev);
> + }
> +
> while (!QLIST_EMPTY(&blkdev->freelist)) {
> ioreq = QLIST_FIRST(&blkdev->freelist);
> QLIST_REMOVE(ioreq, list);
Acked-by: Gerd Hoffmann <address@hidden>
cheers,
Gerd