From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58231 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxJGb-0000pP-5c for qemu-devel@nongnu.org; Wed, 09 Mar 2011 08:17:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxJGW-0006F2-NU for qemu-devel@nongnu.org; Wed, 09 Mar 2011 08:17:29 -0500 Received: from mail-yi0-f45.google.com ([209.85.218.45]:65165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxJGW-0006Ey-Ja for qemu-devel@nongnu.org; Wed, 09 Mar 2011 08:17:24 -0500 Received: by yib19 with SMTP id 19so261010yib.4 for ; Wed, 09 Mar 2011 05:17:24 -0800 (PST) Message-ID: <4D777DE2.7040103@codemonkey.ws> Date: Wed, 09 Mar 2011 07:17:22 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1299666030-16824-1-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1299666030-16824-1-git-send-email-Jes.Sorensen@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH v4] Improve error handling in do_snapshot_blkdev() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jes.Sorensen@redhat.com Cc: kwolf@redhat.com, qemu-devel@nongnu.org On 03/09/2011 04:20 AM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > In case we cannot open the newly created snapshot image, try to fall > back to the original image file and continue running on that, which > should prevent the guest from aborting. > > This is a corner case which can happen if the admin by mistake > specifies the snapshot file on a virtual file system which does not > support O_DIRECT. bdrv_create() does not use O_DIRECT, but the > following open in bdrv_open() does and will then fail. > > Signed-off-by: Jes Sorensen > --- > blockdev.c | 23 +++++++++++++++++------ > 1 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 0690cc8..ecf2252 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -574,9 +574,10 @@ int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data) > const char *filename = qdict_get_try_str(qdict, "snapshot_file"); > const char *format = qdict_get_try_str(qdict, "format"); > BlockDriverState *bs; > - BlockDriver *drv, *proto_drv; > + BlockDriver *drv, *old_drv, *proto_drv; > int ret = 0; > int flags; > + char old_filename[1024]; > > if (!filename) { > qerror_report(QERR_MISSING_PARAMETER, "snapshot_file"); > @@ -591,6 +592,11 @@ int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data) > goto out; > } > > + pstrcpy(old_filename, sizeof(old_filename), bs->filename); > + > + old_drv = bs->drv; > + flags = bs->open_flags; > + > if (!format) { > format = "qcow2"; > } > @@ -610,7 +616,7 @@ int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data) > } > > ret = bdrv_img_create(filename, format, bs->filename, > - bs->drv->format_name, NULL, -1, bs->open_flags); > + bs->drv->format_name, NULL, -1, flags); > if (ret) { > goto out; > } > @@ -618,15 +624,20 @@ int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data) > qemu_aio_flush(); > bdrv_flush(bs); > > - flags = bs->open_flags; > bdrv_close(bs); > ret = bdrv_open(bs, filename, flags, drv); > /* > - * If reopening the image file we just created fails, we really > - * are in trouble :( > + * If reopening the image file we just created fails, fall back > + * and try to re-open the original image. If that fails too, we > + * are in serious trouble. > */ > if (ret != 0) { > - abort(); > + ret = bdrv_open(bs, old_filename, flags, old_drv); > + if (ret != 0) { > + qerror_report(QERR_OPEN_FILE_FAILED, old_filename); > + } else { > + qerror_report(QERR_OPEN_FILE_FAILED, filename); > + } > } Looks good. Regards, Anthony Liguori > out: > if (ret) {