qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.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, afaerber@suse.de, fred.konrad@greensocs.com
Subject: [Qemu-devel] [RFC PATCH v10 22/24] replay: replay blockers for devices
Date: Fri, 27 Feb 2015 16:11:54 +0300	[thread overview]
Message-ID: <20150227131154.11912.1578.stgit@PASHA-ISP> (raw)
In-Reply-To: <20150227130939.11912.50660.stgit@PASHA-ISP>

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 +++
 replay/replay.c           |   13 +++++++++++++
 replay/replay.h           |    3 +++
 vl.c                      |    9 +++++++++
 5 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 7ea3dc6..9be30e1 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
@@ -2191,6 +2195,9 @@ struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net)
 
     s->device.handle_destroy = bt_hci_destroy;
 
+    error_set(&s->replay_blocker, QERR_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 986260f..a9f5e24 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -136,4 +136,7 @@ void qerror_report_err(Error *err);
 #define QERR_UNSUPPORTED \
     ERROR_CLASS_GENERIC_ERROR, "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/replay/replay.c b/replay/replay.c
index 98b5e2f..a5ae58b 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -14,6 +14,7 @@
 #include "replay-internal.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
+#include "qemu/error-report.h"
 
 /* Current version of the replay mechanism.
    Increase it when file format changes. */
@@ -26,6 +27,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)
 {
@@ -285,6 +287,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();
@@ -324,3 +332,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 e0b08c6..1bded8a 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 */
@@ -48,6 +49,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 bad9bee..f9c345d 100644
--- a/vl.c
+++ b/vl.c
@@ -800,7 +800,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, QERR_REPLAY_NOT_SUPPORTED,
+                      "-rtc base=localtime");
+            replay_add_blocker(blocker);
         } else {
             configure_rtc_date_offset(value, 0);
         }
@@ -1206,6 +1210,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, QERR_REPLAY_NOT_SUPPORTED, "smp");
+        replay_add_blocker(blocker);
+    }
 }
 
 static void realtime_init(void)

  parent reply	other threads:[~2015-02-27 13:12 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-27 13:09 [Qemu-devel] [RFC PATCH v10 00/24] Deterministic replay core Pavel Dovgalyuk
2015-02-27 13:09 ` [Qemu-devel] [RFC PATCH v10 01/24] i386: partial revert of interrupt poll fix Pavel Dovgalyuk
2015-02-27 13:09 ` [Qemu-devel] [RFC PATCH v10 02/24] replay: global variables and function stubs Pavel Dovgalyuk
2015-03-13 19:07   ` Eric Blake
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 03/24] sysemu: system functions for replay Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 04/24] replay: internal functions for replay log Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 05/24] replay: introduce mutex to protect the " Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 06/24] replay: introduce icount event Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 07/24] cpu-exec: allow temporary disabling icount Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 08/24] cpu: replay instructions sequence Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 09/24] i386: interrupt poll processing Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 10/24] replay: interrupts and exceptions Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 11/24] replay: asynchronous events infrastructure Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 12/24] replay: recording and replaying clock ticks Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 13/24] timer: replace time() with QEMU_CLOCK_HOST Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 14/24] replay: shutdown event Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 15/24] replay: checkpoints Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 16/24] aio: replace stack of bottom halves with queue Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 17/24] replay: bottom halves Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 18/24] replay: replay aio requests Pavel Dovgalyuk
2015-03-13 17:01   ` Paolo Bonzini
2015-03-16 10:40     ` Pavel Dovgaluk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 19/24] replay: thread pool Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 20/24] typedef: add typedef for QemuOpts Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 21/24] replay: initialization and deinitialization Pavel Dovgalyuk
2015-02-27 13:11 ` Pavel Dovgalyuk [this message]
2015-02-27 13:12 ` [Qemu-devel] [RFC PATCH v10 23/24] replay: command line options Pavel Dovgalyuk
2015-02-27 13:12 ` [Qemu-devel] [RFC PATCH v10 24/24] replay: recording of the user input 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=20150227131154.11912.1578.stgit@PASHA-ISP \
    --to=pavel.dovgaluk@ispras.ru \
    --cc=afaerber@suse.de \
    --cc=alex.bennee@linaro.org \
    --cc=batuzovk@ispras.ru \
    --cc=fred.konrad@greensocs.com \
    --cc=maria.klimushenkova@ispras.ru \
    --cc=mark.burton@greensocs.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.crosthwaite@xilinx.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).