From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 22/28] replication: move include out of root directory
Date: Mon, 24 May 2021 18:41:25 +0200 [thread overview]
Message-ID: <20210524164131.383778-23-pbonzini@redhat.com> (raw)
In-Reply-To: <20210524164131.383778-1-pbonzini@redhat.com>
The replication.h file is included from migration/colo.c and tests/unit/test-replication.c,
so it should be in include/.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/replication.c | 2 +-
replication.h => include/block/replication.h | 4 ++--
migration/colo.c | 2 +-
replication.c | 2 +-
tests/unit/test-replication.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
rename replication.h => include/block/replication.h (98%)
diff --git a/block/replication.c b/block/replication.c
index 97be7ef4de..52163f2d1f 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -22,7 +22,7 @@
#include "sysemu/block-backend.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
-#include "replication.h"
+#include "block/replication.h"
typedef enum {
BLOCK_REPLICATION_NONE, /* block replication is not started */
diff --git a/replication.h b/include/block/replication.h
similarity index 98%
rename from replication.h
rename to include/block/replication.h
index d49fc22cb9..21931b4f0c 100644
--- a/replication.h
+++ b/include/block/replication.h
@@ -23,7 +23,7 @@ typedef struct ReplicationOps ReplicationOps;
typedef struct ReplicationState ReplicationState;
/**
- * SECTION:replication.h
+ * SECTION:block/replication.h
* @title:Base Replication System
* @short_description: interfaces for handling replication
*
@@ -32,7 +32,7 @@ typedef struct ReplicationState ReplicationState;
* <example>
* <title>How to use replication interfaces</title>
* <programlisting>
- * #include "replication.h"
+ * #include "block/replication.h"
*
* typedef struct BDRVReplicationState {
* ReplicationState *rs;
diff --git a/migration/colo.c b/migration/colo.c
index de27662cab..e498fdb125 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -28,7 +28,7 @@
#include "migration/failover.h"
#include "migration/ram.h"
#ifdef CONFIG_REPLICATION
-#include "replication.h"
+#include "block/replication.h"
#endif
#include "net/colo-compare.h"
#include "net/colo.h"
diff --git a/replication.c b/replication.c
index be3a42f9c9..4acd3f8004 100644
--- a/replication.c
+++ b/replication.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "replication.h"
+#include "block/replication.h"
static QLIST_HEAD(, ReplicationState) replication_states;
diff --git a/tests/unit/test-replication.c b/tests/unit/test-replication.c
index b067240add..afff908d77 100644
--- a/tests/unit/test-replication.c
+++ b/tests/unit/test-replication.c
@@ -14,7 +14,7 @@
#include "qapi/qmp/qdict.h"
#include "qemu/option.h"
#include "qemu/main-loop.h"
-#include "replication.h"
+#include "block/replication.h"
#include "block/block_int.h"
#include "block/qdict.h"
#include "sysemu/block-backend.h"
--
2.31.1
next prev parent reply other threads:[~2021-05-24 17:09 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 16:41 [PULL 00/28] Misc patches for 2021-05-24 Paolo Bonzini
2021-05-24 16:41 ` [PULL 01/28] configure: Only clone softfloat-3 repositories if TCG is enabled Paolo Bonzini
2021-05-24 16:41 ` [PULL 02/28] configure: check for submodules if --with-git-submodules=ignore Paolo Bonzini
2021-05-24 16:41 ` [PULL 03/28] configure: simplify assignment to GIT_SUBMODULES Paolo Bonzini
2021-05-24 16:41 ` [PULL 04/28] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on' Paolo Bonzini
2021-05-24 16:41 ` [PULL 05/28] i386/cpu: Expose AVX_VNNI instruction to guest Paolo Bonzini
2021-05-24 16:41 ` [PULL 06/28] object: add more commands to preconfig mode Paolo Bonzini
2021-05-24 16:41 ` [PULL 07/28] qtest: add a QOM object for qtest Paolo Bonzini
2021-06-04 15:37 ` Eric Blake
2021-06-04 15:45 ` Philippe Mathieu-Daudé
2021-06-04 15:48 ` Philippe Mathieu-Daudé
2021-05-24 16:41 ` [PULL 08/28] KVM: do not allow setting properties at runtime Paolo Bonzini
2021-05-24 16:41 ` [PULL 09/28] memory: Introduce log_sync_global() to memory listener Paolo Bonzini
2021-05-24 16:41 ` [PULL 10/28] KVM: Use a big lock to replace per-kml slots_lock Paolo Bonzini
2021-05-24 16:41 ` [PULL 11/28] KVM: Create the KVMSlot dirty bitmap on flag changes Paolo Bonzini
2021-05-24 16:41 ` [PULL 12/28] KVM: Provide helper to get kvm dirty log Paolo Bonzini
2021-05-24 16:41 ` [PULL 13/28] KVM: Provide helper to sync dirty bitmap from slot to ramblock Paolo Bonzini
2021-05-24 16:41 ` [PULL 14/28] KVM: Simplify dirty log sync in kvm_set_phys_mem Paolo Bonzini
2021-05-24 16:41 ` [PULL 15/28] KVM: Cache kvm slot dirty bitmap size Paolo Bonzini
2021-05-24 16:41 ` [PULL 16/28] KVM: Add dirty-ring-size property Paolo Bonzini
2021-05-24 16:41 ` [PULL 17/28] KVM: Disable manual dirty log when dirty ring enabled Paolo Bonzini
2021-05-24 16:41 ` [PULL 18/28] KVM: Dirty ring support Paolo Bonzini
2021-05-24 16:41 ` [PULL 19/28] tests/qtest/fuzz: Fix build failure Paolo Bonzini
2021-05-24 16:41 ` [PULL 20/28] meson: Set implicit_include_directories to false Paolo Bonzini
2021-05-24 16:41 ` [PULL 21/28] remove qemu-options* from root directory Paolo Bonzini
2021-05-24 16:41 ` Paolo Bonzini [this message]
2021-05-24 16:41 ` [PULL 23/28] vl: allow not specifying size in -m when using -M memory-backend Paolo Bonzini
2021-05-24 16:41 ` [PULL 24/28] qemu-config: load modules when instantiating option groups Paolo Bonzini
2021-05-24 16:41 ` [PULL 25/28] doc: Add notes about -mon option mode=control argument Paolo Bonzini
2021-05-24 16:41 ` [PULL 26/28] configure: Avoid error messages about missing *-config-*.h files Paolo Bonzini
2021-05-24 16:41 ` [PULL 27/28] hw/scsi: Fix sector translation bug in scsi_unmap_complete_noio Paolo Bonzini
2021-05-24 16:41 ` [PULL 28/28] gitlab-ci: use --meson=git for CFI jobs Paolo Bonzini
2021-05-24 17:39 ` [PULL 00/28] Misc patches for 2021-05-24 no-reply
2021-05-24 18:02 ` Peter Maydell
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=20210524164131.383778-23-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).