From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org,
igor.rubinov@gmail.com, alex.bennee@linaro.org,
mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru,
maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru,
pbonzini@redhat.com, hines@cert.org, fred.konrad@greensocs.com
Subject: [Qemu-devel] [PATCH v18 19/21] replay: replay blockers for devices
Date: Thu, 17 Sep 2015 19:25:13 +0300 [thread overview]
Message-ID: <20150917162512.8676.11367.stgit@PASHA-ISP.def.inno> (raw)
In-Reply-To: <20150917162322.8676.29314.stgit@PASHA-ISP.def.inno>
Some devices are not supported by record/replay subsystem.
This patch introduces replay blocker which denies starting record/replay
if such devices are included into the configuration.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
hw/bt/hci.c | 7 +++++++
include/qapi/qmp/qerror.h | 3 +++
qapi/common.json | 6 +++++-
replay/replay.c | 13 +++++++++++++
replay/replay.h | 3 +++
vl.c | 10 ++++++++++
6 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 3fec435..3f416ea 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -23,6 +23,8 @@
#include "hw/usb.h"
#include "sysemu/bt.h"
#include "hw/bt.h"
+#include "qapi/qmp/qerror.h"
+#include "replay/replay.h"
struct bt_hci_s {
uint8_t *(*evt_packet)(void *opaque);
@@ -72,6 +74,8 @@ struct bt_hci_s {
struct HCIInfo info;
struct bt_device_s device;
+
+ Error *replay_blocker;
};
#define DEFAULT_RSSI_DBM 20
@@ -2189,6 +2193,9 @@ struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net)
s->device.handle_destroy = bt_hci_destroy;
+ error_set(&s->replay_blocker, ERROR_CLASS_REPLAY_NOT_SUPPORTED, "bt hci");
+ replay_add_blocker(s->replay_blocker);
+
return &s->info;
}
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 842b27a..0781a7f 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -106,4 +106,7 @@
#define QERR_UNSUPPORTED \
"this feature or command is not currently supported"
+#define QERR_REPLAY_NOT_SUPPORTED \
+ ERROR_CLASS_GENERIC_ERROR, "Record/replay feature is not supported for '%s'"
+
#endif /* QERROR_H */
diff --git a/qapi/common.json b/qapi/common.json
index bad56bf..d80e3d4 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -22,11 +22,15 @@
# @KVMMissingCap: the requested operation can't be fulfilled because a
# required KVM capability is missing
#
+# @ReplayNotSupported: the requested feature is not supported with
+# record/replay mode enabled
+#
# Since: 1.2
##
{ 'enum': 'ErrorClass',
'data': [ 'GenericError', 'CommandNotFound', 'DeviceEncrypted',
- 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }
+ 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap',
+ 'ReplayNotSupported' ] }
##
# @VersionTriple
diff --git a/replay/replay.c b/replay/replay.c
index e22e595..671b7b3 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -15,6 +15,7 @@
#include "qemu/timer.h"
#include "qemu/main-loop.h"
#include "sysemu/sysemu.h"
+#include "qemu/error-report.h"
/* Current version of the replay mechanism.
Increase it when file format changes. */
@@ -27,6 +28,7 @@ ReplayMode replay_mode = REPLAY_MODE_NONE;
/* Name of replay file */
static char *replay_filename;
ReplayState replay_state;
+static GSList *replay_blockers;
bool replay_next_event_is(int event)
{
@@ -288,6 +290,12 @@ void replay_start(void)
return;
}
+ if (replay_blockers) {
+ error_report("Record/replay: %s",
+ error_get_pretty(replay_blockers->data));
+ exit(1);
+ }
+
/* Timer for snapshotting will be set up here. */
replay_enable_events();
@@ -323,3 +331,8 @@ void replay_finish(void)
replay_finish_events();
replay_mutex_destroy();
}
+
+void replay_add_blocker(Error *reason)
+{
+ replay_blockers = g_slist_prepend(replay_blockers, reason);
+}
diff --git a/replay/replay.h b/replay/replay.h
index 736555d..3539d31 100755
--- a/replay/replay.h
+++ b/replay/replay.h
@@ -15,6 +15,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "qapi-types.h"
+#include "qapi/error.h"
#include "qemu/typedefs.h"
/* replay clock kinds */
@@ -51,6 +52,8 @@ void replay_configure(struct QemuOpts *opts);
void replay_start(void);
/*! Closes replay log file and frees other resources. */
void replay_finish(void);
+/*! Adds replay blocker with the specified error description */
+void replay_add_blocker(Error *reason);
/* Processing the instructions */
diff --git a/vl.c b/vl.c
index 88cca5d..1f24c94 100644
--- a/vl.c
+++ b/vl.c
@@ -123,6 +123,7 @@ int main(int argc, char **argv)
#include "exec/semihost.h"
#include "crypto/init.h"
#include "replay/replay.h"
+#include "qapi/qmp/qerror.h"
#define MAX_VIRTIO_CONSOLES 1
#define MAX_SCLP_CONSOLES 1
@@ -841,7 +842,11 @@ static void configure_rtc(QemuOpts *opts)
if (!strcmp(value, "utc")) {
rtc_utc = 1;
} else if (!strcmp(value, "localtime")) {
+ Error *blocker = NULL;
rtc_utc = 0;
+ error_set(&blocker, ERROR_CLASS_REPLAY_NOT_SUPPORTED,
+ "-rtc base=localtime");
+ replay_add_blocker(blocker);
} else {
configure_rtc_date_offset(value, 0);
}
@@ -1244,6 +1249,11 @@ static void smp_parse(QemuOpts *opts)
exit(1);
}
+ if (smp_cpus > 1 || smp_cores > 1 || smp_threads > 1) {
+ Error *blocker = NULL;
+ error_set(&blocker, ERROR_CLASS_REPLAY_NOT_SUPPORTED, "smp");
+ replay_add_blocker(blocker);
+ }
}
static void realtime_init(void)
next prev parent reply other threads:[~2015-09-17 16:25 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 16:23 [Qemu-devel] [PATCH v18 00/21] Deterministic replay core Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 01/21] i386: partial revert of interrupt poll fix Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 02/21] replay: global variables and function stubs Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 03/21] replay: internal functions for replay log Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 04/21] replay: introduce mutex to protect the " Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 05/21] replay: introduce icount event Pavel Dovgalyuk
2015-09-17 16:23 ` [Qemu-devel] [PATCH v18 06/21] cpu-exec: allow temporary disabling icount Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 07/21] cpu: replay instructions sequence Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 08/21] i386: interrupt poll processing Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 09/21] replay: interrupts and exceptions Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 10/21] replay: asynchronous events infrastructure Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 11/21] replay: recording and replaying clock ticks Pavel Dovgalyuk
2015-09-22 13:15 ` Paolo Bonzini
2015-09-23 7:09 ` Pavel Dovgaluk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 12/21] replay: shutdown event Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 13/21] icount: improve counting for record/replay Pavel Dovgalyuk
2015-09-22 13:15 ` Paolo Bonzini
2015-09-23 7:22 ` Pavel Dovgaluk
[not found] ` <1946.37127356163$1442992987@news.gmane.org>
2015-09-23 8:08 ` Paolo Bonzini
2015-09-23 8:42 ` Pavel Dovgaluk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 14/21] replay: checkpoints Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 15/21] bottom halves: introduce bh call function Pavel Dovgalyuk
2015-09-17 16:24 ` [Qemu-devel] [PATCH v18 16/21] replay: ptimer Pavel Dovgalyuk
2015-09-17 16:25 ` [Qemu-devel] [PATCH v18 17/21] typedef: add typedef for QemuOpts Pavel Dovgalyuk
2015-09-17 16:25 ` [Qemu-devel] [PATCH v18 18/21] replay: initialization and deinitialization Pavel Dovgalyuk
2015-09-17 16:25 ` Pavel Dovgalyuk [this message]
2015-10-06 20:15 ` [Qemu-devel] [PATCH v18 19/21] replay: replay blockers for devices Eric Blake
2015-09-17 16:25 ` [Qemu-devel] [PATCH v18 20/21] replay: command line options Pavel Dovgalyuk
2015-09-17 16:25 ` [Qemu-devel] [PATCH v18 21/21] replay: recording of the user input Pavel Dovgalyuk
2015-09-21 7:12 ` [Qemu-devel] [PATCH v18 00/21] Deterministic replay core Pavel Dovgaluk
2015-09-22 13:13 ` Paolo Bonzini
[not found] ` <13403.5645904534$1442819578@news.gmane.org>
2015-10-06 15:09 ` Paolo Bonzini
2015-10-06 16:38 ` Paolo Bonzini
[not found] ` <CAPnv1P+PMm7stf-TUoWBX9+frHHOWzz=LB-Errn6_=fBO_QxNQ@mail.gmail.com>
[not found] ` <CAPnv1PKaYDZQeMxK33e1U3mWcsNQiufPnDxLZgiFxXAktxzktA@mail.gmail.com>
2015-11-04 10:57 ` Igor R
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=20150917162512.8676.11367.stgit@PASHA-ISP.def.inno \
--to=pavel.dovgaluk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=batuzovk@ispras.ru \
--cc=edgar.iglesias@xilinx.com \
--cc=fred.konrad@greensocs.com \
--cc=hines@cert.org \
--cc=igor.rubinov@gmail.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mark.burton@greensocs.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=real@ispras.ru \
/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).