| Message ID | 20210517121909.2625099-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | replication: move include out of root directory | expand |
On 5/17/21 2:19 PM, Paolo Bonzini wrote: > 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%) Including the following hunk: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> -- >8 -- diff --git a/MAINTAINERS b/MAINTAINERS index 7877710e372..34c60d9284f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3257,8 +3257,9 @@ Replication M: Wen Congyang <wencongyang2@huawei.com> M: Xie Changlong <xiechanglong.d@gmail.com> S: Supported -F: replication* +F: replication.c F: block/replication.c +F: include/block/replication.h F: tests/unit/test-replication.c F: docs/block-replication.txt ---
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"
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%)