diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
| commit | 5efb397f877fc3002c8bc764f4656f4761bd965d (patch) | |
| tree | 4ef1809f16a7f30f237840cdbfc5521afd4e8316 /blockdev.c | |
| parent | fb787f81e749fde8c74548f9db1472eb321b9a0c (diff) | |
| parent | 33b1db1c8888b77e06c720ebef0482ed598eb384 (diff) | |
| download | focaccia-qemu-5efb397f877fc3002c8bc764f4656f4761bd965d.tar.gz focaccia-qemu-5efb397f877fc3002c8bc764f4656f4761bd965d.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index be88098d53..0a9dec364e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -589,7 +589,7 @@ int do_change_block(Monitor *mon, const char *device, if (eject_device(mon, bs, 0) < 0) { return -1; } - bdrv_flags = bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM ? 0 : BDRV_O_RDWR; + bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) { qerror_report(QERR_OPEN_FILE_FAILED, filename); return -1; |