From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3tv5-0006fJ-82 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 16:19:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3tuz-0004MK-7C for qemu-devel@nongnu.org; Mon, 29 Jul 2013 16:19:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55447 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3tuy-0004Lm-NN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 16:19:45 -0400 Message-ID: <51F6CE59.70708@suse.de> Date: Mon, 29 Jul 2013 22:19:37 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1370629140-30841-1-git-send-email-afaerber@suse.de> <1370629140-30841-2-git-send-email-afaerber@suse.de> <20130610113909.GB32662@stefanha-thinkpad.redhat.com> In-Reply-To: <20130610113909.GB32662@stefanha-thinkpad.redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH RFT 1/5] virtio-blk-dataplane: Improve error reporting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Anthony Liguori , qemu-devel@nongnu.org, jlarrew@linux.vnet.ibm.com, anthony@codemonkey.ws, fred.konrad@greensocs.com Am 10.06.2013 13:39, schrieb Stefan Hajnoczi: > On Fri, Jun 07, 2013 at 08:18:56PM +0200, Andreas F=E4rber wrote: >> Return an Error so that it can be propagated later. >> >> Signed-off-by: Andreas F=E4rber >> --- >> hw/block/dataplane/virtio-blk.c | 25 +++++++++++++------------ >> hw/block/dataplane/virtio-blk.h | 5 +++-- >> hw/block/virtio-blk.c | 8 +++++++- >> 3 files changed, 23 insertions(+), 15 deletions(-) >=20 > Tested-by: Stefan Hajnoczi > Acked-by: Stefan Hajnoczi Needs some more trivial changes since today. Andreas diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index ae82aea..fed9231 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -421,8 +421,9 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIO BlkConf *blk, * block jobs that can conflict. */ if (bdrv_in_use(blk->conf.bs)) { - error_report("cannot start dataplane thread while device is in use"); - return false; + error_setg(errp, + "cannot start dataplane thread while device is in use= "); + return; } fd =3D raw_get_aio_fd(blk->conf.bs); diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 14f292b..5fb006d 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -638,6 +638,7 @@ static void virtio_blk_migration_state_changed(Notifier *notifier, void *data) VirtIOBlock *s =3D container_of(notifier, VirtIOBlock, migration_state_notifier); MigrationState *mig =3D data; + Error *err =3D NULL; if (migration_in_setup(mig)) { if (!s->dataplane) { @@ -652,7 +653,11 @@ static void virtio_blk_migration_state_changed(Notifier *notifier, void *data) } bdrv_drain_all(); /* complete in-flight non-dataplane requests *= / virtio_blk_data_plane_create(VIRTIO_DEVICE(s), &s->blk, - &s->dataplane); + &s->dataplane, &err); + if (err !=3D NULL) { + error_report("%s", error_get_pretty(err)); + error_free(err); + } } } #endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */ --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg