From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xi7-0001mo-5s for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xi1-0003mA-UI for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xi1-0003lk-AL for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:09 -0400 From: Kevin Wolf Date: Tue, 6 Sep 2011 17:39:30 +0200 Message-Id: <1315323586-23840-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 15/31] savevm: Include writable devices with removable media List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster savevm and loadvm silently ignore block devices with removable media, such as floppies and SD cards. Rolling back a VM to a previous checkpoint will *not* roll back writes to block devices with removable media. Moreover, bdrv_is_removable() is a confused mess, and wrong in at least one case: it considers "-drive if=xen,media=cdrom -M xenpv" removable. It'll be cleaned up later in this series. Read-only block devices are also ignored, but that's okay. Fix by ignoring only read-only block devices and empty block devices. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 2 +- savevm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 487a6a9..a8c789a 100644 --- a/block.c +++ b/block.c @@ -2097,7 +2097,7 @@ void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event) int bdrv_can_snapshot(BlockDriverState *bs) { BlockDriver *drv = bs->drv; - if (!drv || bdrv_is_removable(bs) || bdrv_is_read_only(bs)) { + if (!drv || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) { return 0; } diff --git a/savevm.c b/savevm.c index b06308b..1feaa70 100644 --- a/savevm.c +++ b/savevm.c @@ -1914,7 +1914,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) bs = NULL; while ((bs = bdrv_next(bs))) { - if (bdrv_is_removable(bs) || bdrv_is_read_only(bs)) { + if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) { continue; } @@ -2034,7 +2034,7 @@ int load_vmstate(const char *name) bs = NULL; while ((bs = bdrv_next(bs))) { - if (bdrv_is_removable(bs) || bdrv_is_read_only(bs)) { + if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) { continue; } -- 1.7.6