summaryrefslogtreecommitdiff
path: root/savevm.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-08-03 15:08:11 +0200
committerKevin Wolf <kwolf@redhat.com>2011-09-06 11:24:07 +0200
commit07b70bfbb3f3aea9ce7a3a1da78cbfa8ae6bbce6 (patch)
tree992011ee4e652f5add4e9668d6443e7923c954dc /savevm.c
parentc602a489f9685407d93beab3b121408811d20ce4 (diff)
downloadqemu-07b70bfbb3f3aea9ce7a3a1da78cbfa8ae6bbce6.tar.gz
qemu-07b70bfbb3f3aea9ce7a3a1da78cbfa8ae6bbce6.tar.bz2
qemu-07b70bfbb3f3aea9ce7a3a1da78cbfa8ae6bbce6.zip
savevm: Include writable devices with removable media
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 <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'savevm.c')
-rw-r--r--savevm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/savevm.c b/savevm.c
index b06308b56a..1feaa70ccc 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;
}