From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, wrampazz@redhat.com, pavel.dovgalyuk@ispras.ru,
ehabkost@redhat.com, alex.bennee@linaro.org, mtosatti@redhat.com,
armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com,
crosa@redhat.com, pbonzini@redhat.com, philmd@redhat.com,
zhiwei_liu@c-sky.com, rth@twiddle.net
Subject: [PATCH 02/13] qcow2: introduce icount field for snapshots
Date: Fri, 26 Jun 2020 13:19:51 +0300 [thread overview]
Message-ID: <159316679154.10508.16814264064541947914.stgit@pasha-ThinkPad-X280> (raw)
In-Reply-To: <159316678008.10508.6615172353109944370.stgit@pasha-ThinkPad-X280>
From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
This patch introduces the icount field for saving within the snapshot.
It is required for navigation between the snapshots in record/replay mode.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
0 files changed
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 2756b37d24..d14e7be1aa 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -164,6 +164,12 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair,
sn->disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
}
+ if (sn->extra_data_size >= endof(QCowSnapshotExtraData, icount)) {
+ sn->icount = be64_to_cpu(extra.icount);
+ } else {
+ sn->icount = -1ULL;
+ }
+
if (sn->extra_data_size > sizeof(extra)) {
uint64_t extra_data_end;
size_t unknown_extra_data_size;
@@ -333,6 +339,7 @@ int qcow2_write_snapshots(BlockDriverState *bs)
memset(&extra, 0, sizeof(extra));
extra.vm_state_size_large = cpu_to_be64(sn->vm_state_size);
extra.disk_size = cpu_to_be64(sn->disk_size);
+ extra.icount = cpu_to_be64(sn->icount);
id_str_size = strlen(sn->id_str);
name_size = strlen(sn->name);
diff --git a/block/qcow2.h b/block/qcow2.h
index 7ce2c23bdb..9c81086991 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -179,6 +179,7 @@ typedef struct QEMU_PACKED QCowSnapshotHeader {
typedef struct QEMU_PACKED QCowSnapshotExtraData {
uint64_t vm_state_size_large;
uint64_t disk_size;
+ uint64_t icount;
} QCowSnapshotExtraData;
@@ -192,6 +193,8 @@ typedef struct QCowSnapshot {
uint32_t date_sec;
uint32_t date_nsec;
uint64_t vm_clock_nsec;
+ /* icount value for the moment when snapshot was taken */
+ uint64_t icount;
/* Size of all extra data, including QCowSnapshotExtraData if available */
uint32_t extra_data_size;
/* Data beyond QCowSnapshotExtraData, if any */
diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt
index cb723463f2..06014c0e90 100644
--- a/docs/interop/qcow2.txt
+++ b/docs/interop/qcow2.txt
@@ -645,6 +645,11 @@ Snapshot table entry:
Byte 48 - 55: Virtual disk size of the snapshot in bytes
+ Byte 56 - 63: icount value which corresponds to
+ the record/replay instruction count
+ when the snapshot was taken. Set to -1
+ if icount was disabled
+
Version 3 images must include extra data at least up to
byte 55.
next prev parent reply other threads:[~2020-06-26 13:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-26 10:19 [PATCH 00/13] Reverse debugging Pavel Dovgalyuk
2020-06-26 10:19 ` [PATCH 01/13] replay: provide an accessor for rr filename Pavel Dovgalyuk
2020-06-26 10:19 ` Pavel Dovgalyuk [this message]
2020-07-06 20:17 ` [PATCH 02/13] qcow2: introduce icount field for snapshots Eric Blake
2020-07-16 6:43 ` Pavel Dovgalyuk
2020-06-26 10:19 ` [PATCH 03/13] migration: " Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 04/13] iotests: update snapshot test for new output format Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 05/13] qapi: introduce replay.json for record/replay-related stuff Pavel Dovgalyuk
2020-07-15 11:20 ` Alex Bennée
2020-07-16 6:00 ` Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 06/13] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 07/13] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 08/13] replay: implement replay-seek command Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 09/13] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 10/13] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2020-07-15 11:27 ` Alex Bennée
2020-06-26 10:20 ` [PATCH 11/13] gdbstub: add reverse continue " Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 12/13] replay: describe reverse debugging in docs/replay.txt Pavel Dovgalyuk
2020-06-26 10:20 ` [PATCH 13/13] tests/acceptance: add reverse debugging test Pavel Dovgalyuk
2020-07-06 6:02 ` [PATCH 00/13] Reverse debugging Pavel Dovgalyuk
2020-07-06 19:55 ` Alex Bennée
2020-07-07 5:00 ` 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=159316679154.10508.16814264064541947914.stgit@pasha-ThinkPad-X280 \
--to=pavel.dovgalyuk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
--cc=wrampazz@redhat.com \
--cc=zhiwei_liu@c-sky.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).