qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Jason Zeng" <jason.zeng@linux.intel.com>,
	"Zheng Chuan" <zhengchuan@huawei.com>,
	"Steve Sistare" <steven.sistare@oracle.com>,
	"Mark Kanda" <mark.kanda@oracle.com>,
	"Guoyi Tu" <tugy@chinatelecom.cn>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"John Snow" <jsnow@redhat.com>
Subject: [PATCH V8 09/39] cpr: register blockers
Date: Wed, 15 Jun 2022 07:51:56 -0700	[thread overview]
Message-ID: <1655304746-102776-10-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com>

Register the known cpr blockers.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 accel/xen/xen-all.c    | 3 +++
 backends/hostmem-epc.c | 6 ++++++
 migration/migration.c  | 6 ++++++
 replay/replay.c        | 4 ++++
 4 files changed, 19 insertions(+)

diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 69aa7d0..9dd0dc6 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -21,6 +21,7 @@
 #include "sysemu/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
+#include "migration/cpr.h"
 #include "hw/boards.h"
 
 //#define DEBUG_XEN
@@ -181,6 +182,8 @@ static int xen_init(MachineState *ms)
      * opt out of system RAM being allocated by generic code
      */
     mc->default_ram_id = NULL;
+
+    cpr_add_blocker_str("xen does not support cpr", &error_fatal, CPR_MODE_ALL);
     return 0;
 }
 
diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
index cb06255..094fed9 100644
--- a/backends/hostmem-epc.c
+++ b/backends/hostmem-epc.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "sysemu/hostmem.h"
 #include "hw/i386/hostmem-epc.h"
+#include "migration/cpr.h"
 
 static void
 sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
@@ -23,6 +24,7 @@ sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
     uint32_t ram_flags;
     char *name;
     int fd;
+    Error *blocker = NULL;
 
     if (!backend->size) {
         error_setg(errp, "can't create backend with size 0");
@@ -41,6 +43,10 @@ sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
     memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),
                                    name, backend->size, ram_flags,
                                    fd, 0, errp);
+
+    error_setg(&blocker, "RAM_PROTECTED block %s does not support cpr", name);
+    cpr_add_blocker(&blocker, errp, CPR_MODE_ALL);
+
     g_free(name);
 }
 
diff --git a/migration/migration.c b/migration/migration.c
index 31739b2..1451bae 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -32,6 +32,7 @@
 #include "savevm.h"
 #include "qemu-file-channel.h"
 #include "qemu-file.h"
+#include "migration/cpr.h"
 #include "migration/vmstate.h"
 #include "block/block.h"
 #include "qapi/error.h"
@@ -1283,6 +1284,11 @@ static bool migrate_caps_check(bool *cap_list,
         return false;
     }
 
+    if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {
+        return cpr_add_blocker_str("x-colo is not compatible with cpr",
+                                   errp, CPR_MODE_ALL);
+    }
+
     return true;
 }
 
diff --git a/replay/replay.c b/replay/replay.c
index 4c396bb..eb5456f 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -19,6 +19,7 @@
 #include "qemu/option.h"
 #include "sysemu/cpus.h"
 #include "qemu/error-report.h"
+#include "migration/cpr.h"
 
 /* Current version of the replay mechanism.
    Increase it when file format changes. */
@@ -232,6 +233,9 @@ static void replay_enable(const char *fname, int mode)
     const char *fmode = NULL;
     assert(!replay_file);
 
+    cpr_add_blocker_str("replay is not compatible with cpr",
+                        &error_fatal, CPR_MODE_ALL);
+
     switch (mode) {
     case REPLAY_MODE_RECORD:
         fmode = "wb";
-- 
1.8.3.1



  parent reply	other threads:[~2022-06-15 15:04 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-15 14:51 [PATCH V8 00/39] Live Update Steve Sistare
2022-06-15 14:51 ` [PATCH V8 01/39] migration: fix populate_vfio_info Steve Sistare
2022-06-16 14:41   ` Marc-André Lureau
2022-06-15 14:51 ` [PATCH V8 02/39] migration: qemu file wrappers Steve Sistare
2022-06-16  2:18   ` Guoyi Tu
2022-07-05 18:24     ` Steven Sistare
2022-06-16 14:55   ` Marc-André Lureau
2022-07-05 18:25     ` Steven Sistare
2022-06-16 15:29   ` Daniel P. Berrangé
2022-07-05 18:25     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 03/39] migration: simplify savevm Steve Sistare
2022-06-16 14:59   ` Marc-André Lureau
2022-06-15 14:51 ` [PATCH V8 04/39] memory: RAM_ANON flag Steve Sistare
2022-06-15 20:25   ` David Hildenbrand
2022-07-05 18:23     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 05/39] vl: start on wakeup request Steve Sistare
2022-06-16 15:55   ` Marc-André Lureau
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 06/39] cpr: reboot mode Steve Sistare
2022-06-16 11:10   ` Daniel P. Berrangé
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 07/39] cpr: reboot HMP interfaces Steve Sistare
2022-06-15 14:51 ` [PATCH V8 08/39] cpr: blockers Steve Sistare
2022-06-15 14:51 ` Steve Sistare [this message]
2022-06-15 14:51 ` [PATCH V8 10/39] cpr: cpr-enable option Steve Sistare
2022-06-15 14:51 ` [PATCH V8 11/39] cpr: save ram blocks Steve Sistare
2022-06-15 14:51 ` [PATCH V8 12/39] memory: flat section iterator Steve Sistare
2022-07-03  7:52   ` Peng Liang
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 13/39] oslib: qemu_clear_cloexec Steve Sistare
2022-06-16 16:01   ` Marc-André Lureau
2022-06-16 16:07   ` Daniel P. Berrangé
2022-07-05 18:27     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 14/39] qapi: strList_from_string Steve Sistare
2022-06-16 16:04   ` Marc-André Lureau
2022-07-05 18:28     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 15/39] qapi: QAPI_LIST_LENGTH Steve Sistare
2022-06-16 16:06   ` Marc-André Lureau
2022-06-15 14:52 ` [PATCH V8 16/39] qapi: strv_from_strList Steve Sistare
2022-06-16 16:08   ` Marc-André Lureau
2022-07-05 18:28     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 17/39] qapi: strList unit tests Steve Sistare
2022-06-16 16:10   ` Marc-André Lureau
2022-06-15 14:52 ` [PATCH V8 18/39] vl: helper to request re-exec Steve Sistare
2022-06-15 14:52 ` [PATCH V8 19/39] cpr: preserve extra state Steve Sistare
2022-06-15 14:52 ` [PATCH V8 20/39] cpr: restart mode Steve Sistare
2022-07-03  8:15   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-07-06  0:15       ` Peng Liang
2022-06-15 14:52 ` [PATCH V8 21/39] cpr: restart HMP interfaces Steve Sistare
2022-06-15 14:52 ` [PATCH V8 22/39] cpr: ram block blockers Steve Sistare
2022-06-15 14:52 ` [PATCH V8 23/39] hostmem-memfd: cpr for memory-backend-memfd Steve Sistare
2022-06-15 14:52 ` [PATCH V8 24/39] pci: export export msix_is_pending Steve Sistare
2022-06-27 22:44   ` Michael S. Tsirkin
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 25/39] cpr: notifiers Steve Sistare
2022-06-15 14:52 ` [PATCH V8 26/39] vfio-pci: refactor for cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 27/39] vfio-pci: cpr part 1 (fd and dma) Steve Sistare
2022-06-29 19:14   ` Alex Williamson
2022-07-06 17:45     ` Steven Sistare
2022-07-03  8:32   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 28/39] vfio-pci: cpr part 2 (msi) Steve Sistare
2022-06-29 20:19   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 29/39] vfio-pci: cpr part 3 (intx) Steve Sistare
2022-06-29 20:43   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 30/39] vfio-pci: recover from unmap-all-vaddr failure Steve Sistare
2022-06-29 22:58   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 31/39] vhost: reset vhost devices for cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 32/39] loader: suppress rom_reset during cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 33/39] chardev: cpr framework Steve Sistare
2022-06-15 14:52 ` [PATCH V8 34/39] chardev: cpr for simple devices Steve Sistare
2022-06-15 14:52 ` [PATCH V8 35/39] chardev: cpr for pty Steve Sistare
2022-06-15 14:52 ` [PATCH V8 36/39] chardev: cpr for sockets Steve Sistare
2022-07-03  8:19   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 37/39] cpr: only-cpr-capable option Steve Sistare
2022-06-15 14:52 ` [PATCH V8 38/39] python/machine: add QEMUMachine accessors Steve Sistare
2022-06-17 14:16   ` John Snow
2022-07-05 18:30     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 39/39] tests/avocado: add cpr regression test Steve Sistare

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=1655304746-102776-10-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.bennee@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=david@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jason.zeng@linux.intel.com \
    --cc=jsnow@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mark.kanda@oracle.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philippe.mathieu.daude@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=tugy@chinatelecom.cn \
    --cc=zhengchuan@huawei.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).