From patchwork Wed Apr 11 13:42:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 151795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F4B3B7059 for ; Wed, 11 Apr 2012 23:39:02 +1000 (EST) Received: from localhost ([::1]:42859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHxlE-0002nB-81 for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 09:39:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHxkz-0002i1-FN for qemu-devel@nongnu.org; Wed, 11 Apr 2012 09:38:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHxku-0002Ro-48 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 09:38:45 -0400 Received: from smtp.citrix.com ([66.165.176.89]:19673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHxkt-0002Pf-Vr for qemu-devel@nongnu.org; Wed, 11 Apr 2012 09:38:40 -0400 X-IronPort-AV: E=Sophos;i="4.75,406,1330923600"; d="scan'208";a="24056920" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Apr 2012 09:38:33 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Wed, 11 Apr 2012 09:38:33 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SHxkh-0007eG-Ov; Wed, 11 Apr 2012 14:38:27 +0100 From: Stefano Stabellini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 14:42:19 +0100 Message-ID: <1334151739-10484-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: kwolf@redhat.com, aliguori@us.ibm.com, xen-devel@lists.xensource.com, Stefano Stabellini , kraxel@redhat.com, anthony.perard@citrix.com Subject: [Qemu-devel] [PATCH] xen: handle backend deletion from xenstore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Stefano Stabellini Acked-by: Gerd Hoffmann --- 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);