commit d246673dcb9911218ff555bcdf28b250e38fa46c
author Markus Armbruster <armbru@redhat.com> Mon Jun 28 10:45:02 2010 +0200
committer Kevin Wolf <kwolf@redhat.com> Tue Jul 06 17:05:49 2010 +0200
tree 0b5de072a8b26b0f2d50b961c6cd47d3903fde25
parent 528f7663473e146fd1b435d73ca21b219451877c

block migration: Fix test for read-only drive

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block-migration.c

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 @@
     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;