[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 04/10] block: allow specifying name of block device for vmstat
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v5 04/10] block: allow specifying name of block device for vmstate storage |
Date: |
Fri, 2 Oct 2020 17:27:41 +0100 |
Currently the vmstate will be stored in the first block device that
supports snapshots. Historically this would have usually been the
root device, but with UEFI it might be the variable store. There
needs to be a way to override the choice of block device to store
the state in.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
block/monitor/block-hmp-cmds.c | 2 +-
block/snapshot.c | 26 +++++++++++++++++++++++---
include/block/snapshot.h | 3 ++-
migration/savevm.c | 4 ++--
tests/qemu-iotests/267.out | 12 ++++++------
5 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 30279bd15a..4a1fc1d6b0 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -900,7 +900,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
SnapshotEntry *snapshot_entry;
Error *err = NULL;
- bs = bdrv_all_find_vmstate_bs(false, NULL, &err);
+ bs = bdrv_all_find_vmstate_bs(NULL, false, NULL, &err);
if (!bs) {
error_report_err(err);
return;
diff --git a/block/snapshot.c b/block/snapshot.c
index 155b8aad88..2c3edd9922 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -678,7 +678,9 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
return 0;
}
-BlockDriverState *bdrv_all_find_vmstate_bs(bool has_devices, strList *devices,
+
+BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs,
+ bool has_devices, strList *devices,
Error **errp)
{
g_autoptr(GList) bdrvs = NULL;
@@ -699,13 +701,31 @@ BlockDriverState *bdrv_all_find_vmstate_bs(bool
has_devices, strList *devices,
bdrv_can_snapshot(bs);
aio_context_release(ctx);
- if (found) {
+ if (vmstate_bs) {
+ if (g_str_equal(vmstate_bs,
+ bdrv_get_node_name(bs))) {
+ if (found) {
+ return bs;
+ } else {
+ error_setg(errp,
+ "vmstate block device '%s' does not support
snapshots",
+ vmstate_bs);
+ return NULL;
+ }
+ }
+ } else if (found) {
return bs;
}
iterbdrvs = iterbdrvs->next;
}
- error_setg(errp, "No block device supports snapshots");
+ if (vmstate_bs) {
+ error_setg(errp,
+ "vmstate block device '%s' does not exist", vmstate_bs);
+ } else {
+ error_setg(errp,
+ "no block device can store vmstate for snapshot");
+ }
return NULL;
}
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index bac3409669..4d25f17728 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -94,7 +94,8 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
strList *devices,
Error **errp);
-BlockDriverState *bdrv_all_find_vmstate_bs(bool has_devices, strList *devices,
+BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs,
+ bool has_devices, strList *devices,
Error **errp);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 5084c2da00..d89d8fe605 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2691,7 +2691,7 @@ int save_snapshot(const char *name, Error **errp)
}
}
- bs = bdrv_all_find_vmstate_bs(false, NULL, errp);
+ bs = bdrv_all_find_vmstate_bs(NULL, false, NULL, errp);
if (bs == NULL) {
return ret;
}
@@ -2882,7 +2882,7 @@ int load_snapshot(const char *name, Error **errp)
return -1;
}
- bs_vm_state = bdrv_all_find_vmstate_bs(false, NULL, errp);
+ bs_vm_state = bdrv_all_find_vmstate_bs(NULL, false, NULL, errp);
if (!bs_vm_state) {
return -1;
}
diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out
index c65cce893a..73281c5f59 100644
--- a/tests/qemu-iotests/267.out
+++ b/tests/qemu-iotests/267.out
@@ -6,11 +6,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
Testing:
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) savevm snap0
-Error: No block device supports snapshots
+Error: no block device can store vmstate for snapshot
(qemu) info snapshots
-No block device supports snapshots
+no block device can store vmstate for snapshot
(qemu) loadvm snap0
-Error: No block device supports snapshots
+Error: no block device can store vmstate for snapshot
(qemu) quit
@@ -22,7 +22,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
(qemu) savevm snap0
Error: Device 'none0' is writable but does not support snapshots
(qemu) info snapshots
-No block device supports snapshots
+no block device can store vmstate for snapshot
(qemu) loadvm snap0
Error: Device 'none0' is writable but does not support snapshots
(qemu) quit
@@ -58,7 +58,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
(qemu) savevm snap0
Error: Device 'virtio0' is writable but does not support snapshots
(qemu) info snapshots
-No block device supports snapshots
+no block device can store vmstate for snapshot
(qemu) loadvm snap0
Error: Device 'virtio0' is writable but does not support snapshots
(qemu) quit
@@ -83,7 +83,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
(qemu) savevm snap0
Error: Device 'file' is writable but does not support snapshots
(qemu) info snapshots
-No block device supports snapshots
+no block device can store vmstate for snapshot
(qemu) loadvm snap0
Error: Device 'file' is writable but does not support snapshots
(qemu) quit
--
2.26.2
- [PATCH v5 00/10] migration: bring improved savevm/loadvm/delvm to QMP, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 01/10] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 02/10] migration: stop returning errno from load_snapshot(), Daniel P . Berrangé, 2020/10/02
- [PATCH v5 03/10] block: add ability to specify list of blockdevs during snapshot, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 04/10] block: allow specifying name of block device for vmstate storage,
Daniel P . Berrangé <=
- [PATCH v5 05/10] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 06/10] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 07/10] migration: wire up support for snapshot device selection, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 08/10] migration: introduce a delete_snapshot wrapper, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 09/10] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2020/10/02
- Re: [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Eric Blake, 2020/10/02
- Re: [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Markus Armbruster, 2020/10/05
- Re: [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2020/10/05
- Re: [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Markus Armbruster, 2020/10/05