From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56656 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7BQ-0003Vc-N4 for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:23:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW6xQ-0003Hx-3b for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:01 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:38894) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW6xP-0003Gx-UJ for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:00 -0400 From: Markus Armbruster Date: Tue, 6 Jul 2010 14:08:45 +0200 Message-Id: <1278418136-24556-3-git-send-email-armbru@redhat.com> In-Reply-To: <1278418136-24556-1-git-send-email-armbru@redhat.com> References: <1278418136-24556-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/13] block migration: Fix test for read-only drive List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de init_blk_migration_it() skips drives with type hint BDRV_TYPE_CDROM. The intention is to skip read-only drives. However, BDRV_TYPE_CDROM is only a hint. It is currently sufficent for read-only. But it's not necessary, and it may not remain sufficient. Use bdrv_is_read_only() instead. Signed-off-by: Markus Armbruster --- block-migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block-migration.c b/block-migration.c index 7d04d6d..7337349 100644 --- a/block-migration.c +++ b/block-migration.c @@ -236,7 +236,7 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs) BlkMigDevState *bmds; int64_t sectors; - if (bs->type == BDRV_TYPE_HD) { + if (!bdrv_is_read_only(bs)) { sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS; if (sectors == 0) { return; -- 1.6.6.1