From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org,
boost.lists@gmail.com, quintela@redhat.com, jasowang@redhat.com,
mst@redhat.com, zuban32s@gmail.com,
maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru,
kraxel@redhat.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com,
alex.bennee@linaro.org
Subject: [Qemu-devel] [RFC PATCH v5 03/24] blkreplay: create temporary overlay for underlaying devices
Date: Tue, 23 Jan 2018 11:53:37 +0300 [thread overview]
Message-ID: <20180123085336.3419.85806.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20180123085319.3419.97865.stgit@pasha-VirtualBox>
From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
This patch allows using '-snapshot' behavior in record/replay mode.
blkreplay layer creates temporary overlays on top of underlaying
disk images. It is needed, because creating an overlay over blkreplay
breaks the determinism.
This patch creates similar temporary overlay (when it is needed)
under the blkreplay driver. Therefore all block operations are controlled
by blkreplay.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
block/blkreplay.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++
stubs/replay.c | 1 +
vl.c | 2 +-
3 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/block/blkreplay.c b/block/blkreplay.c
index 4c58bd2..2bef4d6 100755
--- a/block/blkreplay.c
+++ b/block/blkreplay.c
@@ -14,12 +14,69 @@
#include "block/block_int.h"
#include "sysemu/replay.h"
#include "qapi/error.h"
+#include "qapi/qmp/qstring.h"
typedef struct Request {
Coroutine *co;
QEMUBH *bh;
} Request;
+static BlockDriverState *blkreplay_append_snapshot(BlockDriverState *bs,
+ Error **errp)
+{
+ int ret;
+ BlockDriverState *bs_snapshot;
+ int64_t total_size;
+ QemuOpts *opts = NULL;
+ char tmp_filename[PATH_MAX + 1];
+ QDict *snapshot_options = qdict_new();
+
+ /* Prepare options QDict for the overlay file */
+ qdict_put(snapshot_options, "file.driver", qstring_from_str("file"));
+ qdict_put(snapshot_options, "driver", qstring_from_str("qcow2"));
+
+ /* Create temporary file */
+ ret = get_tmp_filename(tmp_filename, PATH_MAX + 1);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Could not get temporary filename");
+ goto out;
+ }
+ qdict_put(snapshot_options, "file.filename",
+ qstring_from_str(tmp_filename));
+
+ /* Get the required size from the image */
+ total_size = bdrv_getlength(bs);
+ if (total_size < 0) {
+ error_setg_errno(errp, -total_size, "Could not get image size");
+ goto out;
+ }
+
+ opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0, &error_abort);
+ qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size, &error_abort);
+ ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, errp);
+ qemu_opts_del(opts);
+ if (ret < 0) {
+ error_prepend(errp, "Could not create temporary overlay '%s': ",
+ tmp_filename);
+ goto out;
+ }
+
+ bs_snapshot = bdrv_open(NULL, NULL, snapshot_options,
+ BDRV_O_RDWR | BDRV_O_TEMPORARY, errp);
+ snapshot_options = NULL;
+ if (!bs_snapshot) {
+ goto out;
+ }
+
+ bdrv_append(bs_snapshot, bs, errp);
+
+ return bs_snapshot;
+
+out:
+ QDECREF(snapshot_options);
+ return NULL;
+}
+
static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
@@ -35,6 +92,14 @@ static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
+ /* Add temporary snapshot to preserve the image */
+ if (!replay_snapshot
+ && !blkreplay_append_snapshot(bs->file->bs, &local_err)) {
+ ret = -EINVAL;
+ error_propagate(errp, local_err);
+ goto fail;
+ }
+
ret = 0;
fail:
return ret;
diff --git a/stubs/replay.c b/stubs/replay.c
index 9c8aa48..9991ee5 100644
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -3,6 +3,7 @@
#include "sysemu/sysemu.h"
ReplayMode replay_mode;
+char *replay_snapshot;
int64_t replay_save_clock(unsigned int kind, int64_t clock)
{
diff --git a/vl.c b/vl.c
index e725ecb..d147bfb 100644
--- a/vl.c
+++ b/vl.c
@@ -4548,7 +4548,7 @@ int main(int argc, char **argv, char **envp)
qapi_free_BlockdevOptions(bdo->bdo);
g_free(bdo);
}
- if (snapshot || replay_mode != REPLAY_MODE_NONE) {
+ if (snapshot) {
qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
NULL, NULL);
}
next prev parent reply other threads:[~2018-01-23 8:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 8:53 [Qemu-devel] [RFC PATCH v5 00/24] replay additions Pavel Dovgalyuk
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 01/24] cpu-exec: fix exception_index handling Pavel Dovgalyuk
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 02/24] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-01-23 8:53 ` Pavel Dovgalyuk [this message]
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 04/24] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 05/24] replay: fix processing async events Pavel Dovgalyuk
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 06/24] replay: fixed replay_enable_events Pavel Dovgalyuk
2018-01-23 8:53 ` [Qemu-devel] [RFC PATCH v5 07/24] replay: fix save/load vm for non-empty queue Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 08/24] replay: added replay log format description Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 09/24] replay: save prior value of the host clock Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 10/24] target/arm/arm-powertctl: drop BQL assertions Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 11/24] cpus: push BQL lock to qemu_*_wait_io_event Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 12/24] hax: remove BQL lock/unlock Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 13/24] kvm: " Pavel Dovgalyuk
2018-01-31 1:24 ` Paolo Bonzini
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 14/24] replay/replay.c: bump REPLAY_VERSION again Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 15/24] replay/replay-internal.c: track holding of replay_lock Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 16/24] replay: make locking visible outside replay code Pavel Dovgalyuk
2018-01-23 8:54 ` [Qemu-devel] [RFC PATCH v5 17/24] replay: push replay_mutex_lock up the call tree Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 18/24] replay: don't destroy mutex at exit Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 19/24] replay: check return values of fwrite Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 20/24] replay: avoid recursive call of checkpoints Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 21/24] scripts/replay-dump.py: replay log dumper Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 22/24] replay: don't process async events when warping the clock Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 23/24] replay: save vmstate of the asynchronous events Pavel Dovgalyuk
2018-01-23 8:55 ` [Qemu-devel] [RFC PATCH v5 24/24] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-01-23 9:32 ` [Qemu-devel] [RFC PATCH v5 00/24] replay additions no-reply
2018-01-30 5:57 ` Pavel Dovgalyuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180123085336.3419.85806.stgit@pasha-VirtualBox \
--to=pavel.dovgaluk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=boost.lists@gmail.com \
--cc=dovgaluk@ispras.ru \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=zuban32s@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).