Proxmox/pve-qemu
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-qemu.git synced 2025-01-04 09:18:30 +03:00
Code

async snapshot: code cleanup: use error_setg() helper

Browse Source 
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-11-25 12:00:42 +01:00 committed by Thomas Lamprecht
parent 7882afe30d
commit 5fff8d91c7
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch vendored
View File

@ -37,13 +37,13 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
include/migration/snapshot.h | 2 + include/migration/snapshot.h | 2 +
include/monitor/hmp.h | 3 + include/monitor/hmp.h | 3 +
migration/meson.build | 1 + migration/meson.build | 1 +
migration/savevm-async.c | 540 +++++++++++++++++++++++++++++++++++ migration/savevm-async.c | 537 +++++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 38 +++ monitor/hmp-cmds.c | 38 +++
qapi/migration.json | 34 +++ qapi/migration.json | 34 +++
qapi/misc.json | 18 ++ qapi/misc.json | 18 ++
qemu-options.hx | 12 + qemu-options.hx | 12 +
system/vl.c | 10 + system/vl.c | 10 +
11 files changed, 688 insertions(+) 11 files changed, 685 insertions(+)
create mode 100644 migration/savevm-async.c create mode 100644 migration/savevm-async.c
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
@ -141,10 +141,10 @@ index 020127d901..4b0c4f0f51 100644
'threadinfo.c', 'threadinfo.c',
diff --git a/migration/savevm-async.c b/migration/savevm-async.c diff --git a/migration/savevm-async.c b/migration/savevm-async.c
new file mode 100644 new file mode 100644
index 0000000000..4f1ef0ebd8 index 0000000000..59bb0b57d9
--- /dev/null --- /dev/null
+++ b/migration/savevm-async.c +++ b/migration/savevm-async.c
@@ -0,0 +1,540 @@ @@ -0,0 +1,537 @@
+#include "qemu/osdep.h" +#include "qemu/osdep.h"
+#include "migration/channel-savevm-async.h" +#include "migration/channel-savevm-async.h"
+#include "migration/migration.h" +#include "migration/migration.h"
@ -292,7 +292,7 @@ index 0000000000..4f1ef0ebd8
+ DPRINTF("save_snapshot_error: %s\n", msg); + DPRINTF("save_snapshot_error: %s\n", msg);
+ +
+ if (!snap_state.error) { + if (!snap_state.error) {
+ error_set(&snap_state.error, ERROR_CLASS_GENERIC_ERROR, "%s", msg); + error_setg(&snap_state.error, "%s", msg);
+ } + }
+ +
+ g_free (msg); + g_free (msg);
@ -483,14 +483,12 @@ index 0000000000..4f1ef0ebd8
+ int bdrv_oflags = BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_NO_FLUSH; + int bdrv_oflags = BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_NO_FLUSH;
+ +
+ if (snap_state.state != SAVE_STATE_DONE) { + if (snap_state.state != SAVE_STATE_DONE) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, + error_setg(errp, "VM snapshot already started\n");
+ "VM snapshot already started\n");
+ return; + return;
+ } + }
+ +
+ if (migration_is_running()) { + if (migration_is_running()) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, + error_setg(errp, "There's a migration process in progress");
+ "There's a migration process in progress");
+ return; + return;
+ } + }
+ +
@ -522,7 +520,7 @@ index 0000000000..4f1ef0ebd8
+ qdict_put_str(options, "driver", "raw"); + qdict_put_str(options, "driver", "raw");
+ snap_state.target = blk_new_open(statefile, NULL, options, bdrv_oflags, &local_err); + snap_state.target = blk_new_open(statefile, NULL, options, bdrv_oflags, &local_err);
+ if (!snap_state.target) { + if (!snap_state.target) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile); + error_setg(errp, "failed to open '%s'", statefile);
+ goto restart; + goto restart;
+ } + }
+ +
@ -531,7 +529,7 @@ index 0000000000..4f1ef0ebd8
+ snap_state.file = qemu_file_new_output(ioc); + snap_state.file = qemu_file_new_output(ioc);
+ +
+ if (!snap_state.file) { + if (!snap_state.file) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile); + error_setg(errp, "failed to open '%s'", statefile);
+ goto restart; + goto restart;
+ } + }
+ +
@ -608,8 +606,7 @@ index 0000000000..4f1ef0ebd8
+void qmp_savevm_end(Error **errp) +void qmp_savevm_end(Error **errp)
+{ +{
+ if (snap_state.state == SAVE_STATE_DONE) { + if (snap_state.state == SAVE_STATE_DONE) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, + error_setg(errp, "VM snapshot not started\n");
+ "VM snapshot not started\n");
+ return; + return;
+ } + }
+ +

8
debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch vendored
View File

@ -184,10 +184,10 @@ index 11c2120edd..edf3c5d147 100644
/* /*
diff --git a/migration/savevm-async.c b/migration/savevm-async.c diff --git a/migration/savevm-async.c b/migration/savevm-async.c
index 4f1ef0ebd8..84e10b2c4c 100644 index 59bb0b57d9..9a4dd1e4f5 100644
--- a/migration/savevm-async.c --- a/migration/savevm-async.c
+++ b/migration/savevm-async.c +++ b/migration/savevm-async.c
@@ -381,7 +381,7 @@ void qmp_savevm_start(const char *statefile, Error **errp) @@ -379,7 +379,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target, QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
&snap_state.bs_pos)); &snap_state.bs_pos));
@ -195,8 +195,8 @@ index 4f1ef0ebd8..84e10b2c4c 100644
+ snap_state.file = qemu_file_new_output_sized(ioc, 4 * 1024 * 1024); + snap_state.file = qemu_file_new_output_sized(ioc, 4 * 1024 * 1024);
if (!snap_state.file) { if (!snap_state.file) {
error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile); error_setg(errp, "failed to open '%s'", statefile);
@@ -505,7 +505,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp) @@ -502,7 +502,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
blk_op_block_all(be, blocker); blk_op_block_all(be, blocker);
/* restore the VM state */ /* restore the VM state */