diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-02-22 16:57:50 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-02-22 16:57:50 +0100 |
| commit | fe243e4881bc9e09767dba05f15acb016cfa7a52 (patch) | |
| tree | 34f9b8dd3fc7e94d177ce71fd6c59e5e5853f2a0 /blockdev.c | |
| parent | d310d85bf4472b6af9ff0235d397014dad713b8c (diff) | |
| parent | 43e15ed4fded6be585072a6dd2ef8dc3956bad67 (diff) | |
| download | focaccia-qemu-fe243e4881bc9e09767dba05f15acb016cfa7a52.tar.gz focaccia-qemu-fe243e4881bc9e09767dba05f15acb016cfa7a52.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-02-22' into queue-block
Block patches of the last three weeks. # gpg: Signature made Mon Feb 22 16:55:33 2016 CET using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" * mreitz/tags/pull-block-for-kevin-2016-02-22: qemu-iotests: 140: make description slightly more verbose qemu-iotests: 140: don't use IDE device qemu-iotests: 067: ignore QMP events blockdev: unset inappropriate flags when changing medium Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/blockdev.c b/blockdev.c index 5c02a4289c..d4bc435940 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2513,6 +2513,8 @@ void qmp_blockdev_change_medium(const char *device, const char *filename, } bdrv_flags = blk_get_open_flags_from_root_state(blk); + bdrv_flags &= ~(BDRV_O_TEMPORARY | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING | + BDRV_O_PROTOCOL); if (!has_read_only) { read_only = BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN; |