* [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:00 ` Dr. David Alan Gilbert
2017-06-01 12:03 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h Juan Quintela
` (8 subsequent siblings)
9 siblings, 2 replies; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/core/qdev.c | 1 -
include/hw/acpi/memory_hotplug.h | 1 -
include/hw/acpi/pcihp.h | 1 -
include/hw/pci/shpc.h | 1 -
target/alpha/cpu.c | 1 -
target/hppa/cpu.c | 1 -
target/s390x/cpu.c | 1 -
target/tilegx/cpu.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 71ff95f..0ce45a2 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -37,7 +37,6 @@
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "qapi-event.h"
-#include "migration/vmstate.h"
bool qdev_hotplug = false;
static bool qdev_hot_added = false;
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
index db8ebc9..77c6576 100644
--- a/include/hw/acpi/memory_hotplug.h
+++ b/include/hw/acpi/memory_hotplug.h
@@ -3,7 +3,6 @@
#include "hw/qdev-core.h"
#include "hw/acpi/acpi.h"
-#include "migration/vmstate.h"
#include "hw/acpi/aml-build.h"
/**
diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index 04528b7..8a65f99 100644
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -28,7 +28,6 @@
#define HW_ACPI_PCIHP_H
#include "hw/acpi/acpi.h"
-#include "migration/vmstate.h"
#include "hw/hotplug.h"
#define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index b208554..71e836b 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -3,7 +3,6 @@
#include "qemu-common.h"
#include "exec/memory.h"
-#include "migration/vmstate.h"
#include "hw/hotplug.h"
#include "hw/pci/pci.h"
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
index b4f9798..8186c9d 100644
--- a/target/alpha/cpu.c
+++ b/target/alpha/cpu.c
@@ -23,7 +23,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "qemu-common.h"
-#include "migration/vmstate.h"
#include "exec/exec-all.h"
diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index 1d791d0..30299e9 100644
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -22,7 +22,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "qemu-common.h"
-#include "migration/vmstate.h"
#include "exec/exec-all.h"
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index a69005d..accef03 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -32,7 +32,6 @@
#include "qemu/error-report.h"
#include "trace.h"
#include "qapi/visitor.h"
-#include "migration/vmstate.h"
#include "exec/exec-all.h"
#ifndef CONFIG_USER_ONLY
#include "hw/hw.h"
diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
index d90e38e..4532639 100644
--- a/target/tilegx/cpu.c
+++ b/target/tilegx/cpu.c
@@ -23,7 +23,6 @@
#include "cpu.h"
#include "qemu-common.h"
#include "hw/qdev-properties.h"
-#include "migration/vmstate.h"
#include "linux-user/syscall_defs.h"
#include "exec/exec-all.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h Juan Quintela
@ 2017-06-01 12:00 ` Dr. David Alan Gilbert
2017-06-01 12:03 ` Dr. David Alan Gilbert
1 sibling, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:00 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/core/qdev.c | 1 -
> include/hw/acpi/memory_hotplug.h | 1 -
> include/hw/acpi/pcihp.h | 1 -
> include/hw/pci/shpc.h | 1 -
> target/alpha/cpu.c | 1 -
> target/hppa/cpu.c | 1 -
> target/s390x/cpu.c | 1 -
> target/tilegx/cpu.c | 1 -
> 8 files changed, 8 deletions(-)
>
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 71ff95f..0ce45a2 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -37,7 +37,6 @@
> #include "hw/boards.h"
> #include "hw/sysbus.h"
> #include "qapi-event.h"
> -#include "migration/vmstate.h"
>
> bool qdev_hotplug = false;
> static bool qdev_hot_added = false;
> diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
> index db8ebc9..77c6576 100644
> --- a/include/hw/acpi/memory_hotplug.h
> +++ b/include/hw/acpi/memory_hotplug.h
> @@ -3,7 +3,6 @@
>
> #include "hw/qdev-core.h"
> #include "hw/acpi/acpi.h"
> -#include "migration/vmstate.h"
> #include "hw/acpi/aml-build.h"
>
> /**
> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
> index 04528b7..8a65f99 100644
> --- a/include/hw/acpi/pcihp.h
> +++ b/include/hw/acpi/pcihp.h
> @@ -28,7 +28,6 @@
> #define HW_ACPI_PCIHP_H
>
> #include "hw/acpi/acpi.h"
> -#include "migration/vmstate.h"
> #include "hw/hotplug.h"
>
> #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
> index b208554..71e836b 100644
> --- a/include/hw/pci/shpc.h
> +++ b/include/hw/pci/shpc.h
> @@ -3,7 +3,6 @@
>
> #include "qemu-common.h"
> #include "exec/memory.h"
> -#include "migration/vmstate.h"
> #include "hw/hotplug.h"
> #include "hw/pci/pci.h"
>
> diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
> index b4f9798..8186c9d 100644
> --- a/target/alpha/cpu.c
> +++ b/target/alpha/cpu.c
> @@ -23,7 +23,6 @@
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu-common.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
>
>
> diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> index 1d791d0..30299e9 100644
> --- a/target/hppa/cpu.c
> +++ b/target/hppa/cpu.c
> @@ -22,7 +22,6 @@
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu-common.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
>
>
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index a69005d..accef03 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -32,7 +32,6 @@
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/visitor.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #ifndef CONFIG_USER_ONLY
> #include "hw/hw.h"
> diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
> index d90e38e..4532639 100644
> --- a/target/tilegx/cpu.c
> +++ b/target/tilegx/cpu.c
> @@ -23,7 +23,6 @@
> #include "cpu.h"
> #include "qemu-common.h"
> #include "hw/qdev-properties.h"
> -#include "migration/vmstate.h"
> #include "linux-user/syscall_defs.h"
> #include "exec/exec-all.h"
>
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h Juan Quintela
2017-06-01 12:00 ` Dr. David Alan Gilbert
@ 2017-06-01 12:03 ` Dr. David Alan Gilbert
1 sibling, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:03 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/core/qdev.c | 1 -
> include/hw/acpi/memory_hotplug.h | 1 -
> include/hw/acpi/pcihp.h | 1 -
> include/hw/pci/shpc.h | 1 -
> target/alpha/cpu.c | 1 -
> target/hppa/cpu.c | 1 -
> target/s390x/cpu.c | 1 -
> target/tilegx/cpu.c | 1 -
> 8 files changed, 8 deletions(-)
>
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 71ff95f..0ce45a2 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -37,7 +37,6 @@
> #include "hw/boards.h"
> #include "hw/sysbus.h"
> #include "qapi-event.h"
> -#include "migration/vmstate.h"
>
> bool qdev_hotplug = false;
> static bool qdev_hot_added = false;
> diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
> index db8ebc9..77c6576 100644
> --- a/include/hw/acpi/memory_hotplug.h
> +++ b/include/hw/acpi/memory_hotplug.h
> @@ -3,7 +3,6 @@
>
> #include "hw/qdev-core.h"
> #include "hw/acpi/acpi.h"
> -#include "migration/vmstate.h"
> #include "hw/acpi/aml-build.h"
>
> /**
> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
> index 04528b7..8a65f99 100644
> --- a/include/hw/acpi/pcihp.h
> +++ b/include/hw/acpi/pcihp.h
> @@ -28,7 +28,6 @@
> #define HW_ACPI_PCIHP_H
>
> #include "hw/acpi/acpi.h"
> -#include "migration/vmstate.h"
> #include "hw/hotplug.h"
>
> #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
> index b208554..71e836b 100644
> --- a/include/hw/pci/shpc.h
> +++ b/include/hw/pci/shpc.h
> @@ -3,7 +3,6 @@
>
> #include "qemu-common.h"
> #include "exec/memory.h"
> -#include "migration/vmstate.h"
> #include "hw/hotplug.h"
> #include "hw/pci/pci.h"
>
> diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
> index b4f9798..8186c9d 100644
> --- a/target/alpha/cpu.c
> +++ b/target/alpha/cpu.c
> @@ -23,7 +23,6 @@
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu-common.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
>
>
> diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> index 1d791d0..30299e9 100644
> --- a/target/hppa/cpu.c
> +++ b/target/hppa/cpu.c
> @@ -22,7 +22,6 @@
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu-common.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
>
>
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index a69005d..accef03 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -32,7 +32,6 @@
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/visitor.h"
> -#include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #ifndef CONFIG_USER_ONLY
> #include "hw/hw.h"
> diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
> index d90e38e..4532639 100644
> --- a/target/tilegx/cpu.c
> +++ b/target/tilegx/cpu.c
> @@ -23,7 +23,6 @@
> #include "cpu.h"
> #include "qemu-common.h"
> #include "hw/qdev-properties.h"
> -#include "migration/vmstate.h"
> #include "linux-user/syscall_defs.h"
> #include "exec/exec-all.h"
>
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:21 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 03/10] migration: Export exec.c functions in its own file Juan Quintela
` (7 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Split the file into public and internal interfaces. I have to rename
the external one because we can't have two include files with the same
name in the same directory. Build system gets confused. The only
exported functions are the ones that handle basic types.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
hw/i2c/i2c-ddc.c | 1 +
hw/intc/s390_flic.c | 1 -
hw/intc/s390_flic_kvm.c | 1 -
hw/s390x/s390-skeys.c | 1 -
include/hw/hw.h | 2 +-
include/migration/qemu-file-types.h | 164 +++++++++++++++++++++++++++
migration/block.c | 2 +-
migration/colo.c | 2 +-
migration/migration.c | 2 +-
migration/postcopy-ram.c | 2 +-
migration/qemu-file-channel.c | 3 +-
migration/qemu-file.c | 2 +-
{include/migration => migration}/qemu-file.h | 157 +------------------------
migration/ram.c | 2 +-
migration/rdma.c | 2 +-
migration/savevm.c | 1 +
migration/socket.c | 2 +-
migration/vmstate-types.c | 3 +-
migration/vmstate.c | 2 +-
tests/test-vmstate.c | 3 +-
20 files changed, 186 insertions(+), 169 deletions(-)
create mode 100644 include/migration/qemu-file-types.h
rename {include/migration => migration}/qemu-file.h (62%)
diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c
index 66899d7..6b92e95 100644
--- a/hw/i2c/i2c-ddc.c
+++ b/hw/i2c/i2c-ddc.c
@@ -17,6 +17,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu-common.h"
#include "qemu/log.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/i2c-ddc.h"
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 711c114..a26e906 100644
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/sysbus.h"
-#include "migration/qemu-file.h"
#include "hw/s390x/s390_flic.h"
#include "trace.h"
#include "hw/qdev.h"
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index cc44bc4..b4c61d8 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -17,7 +17,6 @@
#include "qemu/error-report.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
-#include "migration/qemu-file.h"
#include "hw/s390x/s390_flic.h"
#include "hw/s390x/adapter.h"
#include "trace.h"
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index e2d4e1a..619152c 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
#include "qmp-commands.h"
-#include "migration/qemu-file.h"
#include "hw/s390x/storage-keys.h"
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
diff --git a/include/hw/hw.h b/include/hw/hw.h
index af9eae1..ab4950c 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -11,7 +11,7 @@
#include "exec/memory.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
-#include "migration/qemu-file.h"
+#include "migration/qemu-file-types.h"
#include "qemu/module.h"
#include "sysemu/reset.h"
diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h
new file mode 100644
index 0000000..bd6d7dd
--- /dev/null
+++ b/include/migration/qemu-file-types.h
@@ -0,0 +1,164 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef QEMU_FILE_H
+#define QEMU_FILE_H
+
+void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size);
+void qemu_put_byte(QEMUFile *f, int v);
+
+#define qemu_put_sbyte qemu_put_byte
+
+void qemu_put_be16(QEMUFile *f, unsigned int v);
+void qemu_put_be32(QEMUFile *f, unsigned int v);
+void qemu_put_be64(QEMUFile *f, uint64_t v);
+size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
+
+int qemu_get_byte(QEMUFile *f);
+
+static inline unsigned int qemu_get_ubyte(QEMUFile *f)
+{
+ return (unsigned int)qemu_get_byte(f);
+}
+
+#define qemu_get_sbyte qemu_get_byte
+
+unsigned int qemu_get_be16(QEMUFile *f);
+unsigned int qemu_get_be32(QEMUFile *f);
+uint64_t qemu_get_be64(QEMUFile *f);
+
+static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)
+{
+ qemu_put_be64(f, *pv);
+}
+
+static inline void qemu_put_be32s(QEMUFile *f, const uint32_t *pv)
+{
+ qemu_put_be32(f, *pv);
+}
+
+static inline void qemu_put_be16s(QEMUFile *f, const uint16_t *pv)
+{
+ qemu_put_be16(f, *pv);
+}
+
+static inline void qemu_put_8s(QEMUFile *f, const uint8_t *pv)
+{
+ qemu_put_byte(f, *pv);
+}
+
+static inline void qemu_get_be64s(QEMUFile *f, uint64_t *pv)
+{
+ *pv = qemu_get_be64(f);
+}
+
+static inline void qemu_get_be32s(QEMUFile *f, uint32_t *pv)
+{
+ *pv = qemu_get_be32(f);
+}
+
+static inline void qemu_get_be16s(QEMUFile *f, uint16_t *pv)
+{
+ *pv = qemu_get_be16(f);
+}
+
+static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv)
+{
+ *pv = qemu_get_byte(f);
+}
+
+/* Signed versions for type safety */
+static inline void qemu_put_sbe16(QEMUFile *f, int v)
+{
+ qemu_put_be16(f, (unsigned int)v);
+}
+
+static inline void qemu_put_sbe32(QEMUFile *f, int v)
+{
+ qemu_put_be32(f, (unsigned int)v);
+}
+
+static inline void qemu_put_sbe64(QEMUFile *f, int64_t v)
+{
+ qemu_put_be64(f, (uint64_t)v);
+}
+
+static inline int qemu_get_sbe16(QEMUFile *f)
+{
+ return (int)qemu_get_be16(f);
+}
+
+static inline int qemu_get_sbe32(QEMUFile *f)
+{
+ return (int)qemu_get_be32(f);
+}
+
+static inline int64_t qemu_get_sbe64(QEMUFile *f)
+{
+ return (int64_t)qemu_get_be64(f);
+}
+
+static inline void qemu_put_s8s(QEMUFile *f, const int8_t *pv)
+{
+ qemu_put_8s(f, (const uint8_t *)pv);
+}
+
+static inline void qemu_put_sbe16s(QEMUFile *f, const int16_t *pv)
+{
+ qemu_put_be16s(f, (const uint16_t *)pv);
+}
+
+static inline void qemu_put_sbe32s(QEMUFile *f, const int32_t *pv)
+{
+ qemu_put_be32s(f, (const uint32_t *)pv);
+}
+
+static inline void qemu_put_sbe64s(QEMUFile *f, const int64_t *pv)
+{
+ qemu_put_be64s(f, (const uint64_t *)pv);
+}
+
+static inline void qemu_get_s8s(QEMUFile *f, int8_t *pv)
+{
+ qemu_get_8s(f, (uint8_t *)pv);
+}
+
+static inline void qemu_get_sbe16s(QEMUFile *f, int16_t *pv)
+{
+ qemu_get_be16s(f, (uint16_t *)pv);
+}
+
+static inline void qemu_get_sbe32s(QEMUFile *f, int32_t *pv)
+{
+ qemu_get_be32s(f, (uint32_t *)pv);
+}
+
+static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
+{
+ qemu_get_be64s(f, (uint64_t *)pv);
+}
+
+int qemu_file_rate_limit(QEMUFile *f);
+
+#endif
diff --git a/migration/block.c b/migration/block.c
index 13f90d3..3e27499 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -26,7 +26,7 @@
#include "migration/block.h"
#include "migration/migration.h"
#include "sysemu/blockdev.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "migration/vmstate.h"
#include "sysemu/block-backend.h"
diff --git a/migration/colo.c b/migration/colo.c
index 3dd1390..4f1f3b8 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -15,7 +15,7 @@
#include "sysemu/sysemu.h"
#include "qemu-file-channel.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "savevm.h"
#include "migration/colo.h"
#include "migration/block.h"
diff --git a/migration/migration.c b/migration/migration.c
index c3218cd..ea61650 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -21,7 +21,7 @@
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "migration/vmstate.h"
#include "sysemu/sysemu.h"
#include "block/block.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 3f9ae1b..6f239f9 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "exec/target_page.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "savevm.h"
#include "postcopy-ram.h"
#include "sysemu/sysemu.h"
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index dc991c9..e202d73 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -24,7 +24,8 @@
#include "qemu/osdep.h"
#include "qemu-file-channel.h"
-#include "migration/qemu-file.h"
+#include "exec/cpu-common.h"
+#include "qemu-file.h"
#include "io/channel-socket.h"
#include "qemu/iov.h"
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 195fa94..ab26f4e 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -29,7 +29,7 @@
#include "qemu/sockets.h"
#include "qemu/coroutine.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "trace.h"
#define IO_BUF_SIZE 32768
diff --git a/include/migration/qemu-file.h b/migration/qemu-file.h
similarity index 62%
rename from include/migration/qemu-file.h
rename to migration/qemu-file.h
index b5ac800..49fd697 100644
--- a/include/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -22,11 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef QEMU_FILE_H
-#define QEMU_FILE_H
-
-#include "qemu-common.h"
-#include "exec/cpu-common.h"
+#ifndef MIGRATION_QEMU_FILE_H
+#define MIGRATION_QEMU_FILE_H
/* Read a chunk of data from a file at the given position. The pos argument
* can be ignored if the file is only be used for streaming. The number of
@@ -122,8 +119,6 @@ int qemu_get_fd(QEMUFile *f);
int qemu_fclose(QEMUFile *f);
int64_t qemu_ftell(QEMUFile *f);
int64_t qemu_ftell_fast(QEMUFile *f);
-void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size);
-void qemu_put_byte(QEMUFile *f, int v);
/*
* put_buffer without copying the buffer.
* The buffer should be available till it is sent asynchronously.
@@ -133,19 +128,9 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size,
bool qemu_file_mode_is_not_valid(const char *mode);
bool qemu_file_is_writable(QEMUFile *f);
+#include "migration/qemu-file-types.h"
-static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v)
-{
- qemu_put_byte(f, (int)v);
-}
-
-#define qemu_put_sbyte qemu_put_byte
-
-void qemu_put_be16(QEMUFile *f, unsigned int v);
-void qemu_put_be32(QEMUFile *f, unsigned int v);
-void qemu_put_be64(QEMUFile *f, uint64_t v);
size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset);
-size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size);
ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size,
int level);
@@ -157,22 +142,8 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
* previously peeked +n-1.
*/
int qemu_peek_byte(QEMUFile *f, int offset);
-int qemu_get_byte(QEMUFile *f);
void qemu_file_skip(QEMUFile *f, int size);
void qemu_update_position(QEMUFile *f, size_t size);
-
-static inline unsigned int qemu_get_ubyte(QEMUFile *f)
-{
- return (unsigned int)qemu_get_byte(f);
-}
-
-#define qemu_get_sbyte qemu_get_byte
-
-unsigned int qemu_get_be16(QEMUFile *f);
-unsigned int qemu_get_be32(QEMUFile *f);
-uint64_t qemu_get_be64(QEMUFile *f);
-
-int qemu_file_rate_limit(QEMUFile *f);
void qemu_file_reset_rate_limit(QEMUFile *f);
void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
int64_t qemu_file_get_rate_limit(QEMUFile *f);
@@ -183,127 +154,7 @@ QEMUFile *qemu_file_get_return_path(QEMUFile *f);
void qemu_fflush(QEMUFile *f);
void qemu_file_set_blocking(QEMUFile *f, bool block);
-static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)
-{
- qemu_put_be64(f, *pv);
-}
-
-static inline void qemu_put_be32s(QEMUFile *f, const uint32_t *pv)
-{
- qemu_put_be32(f, *pv);
-}
-
-static inline void qemu_put_be16s(QEMUFile *f, const uint16_t *pv)
-{
- qemu_put_be16(f, *pv);
-}
-
-static inline void qemu_put_8s(QEMUFile *f, const uint8_t *pv)
-{
- qemu_put_byte(f, *pv);
-}
-
-static inline void qemu_get_be64s(QEMUFile *f, uint64_t *pv)
-{
- *pv = qemu_get_be64(f);
-}
-
-static inline void qemu_get_be32s(QEMUFile *f, uint32_t *pv)
-{
- *pv = qemu_get_be32(f);
-}
-
-static inline void qemu_get_be16s(QEMUFile *f, uint16_t *pv)
-{
- *pv = qemu_get_be16(f);
-}
-
-static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv)
-{
- *pv = qemu_get_byte(f);
-}
-
-// Signed versions for type safety
-static inline void qemu_put_sbuffer(QEMUFile *f, const int8_t *buf, size_t size)
-{
- qemu_put_buffer(f, (const uint8_t *)buf, size);
-}
-
-static inline void qemu_put_sbe16(QEMUFile *f, int v)
-{
- qemu_put_be16(f, (unsigned int)v);
-}
-
-static inline void qemu_put_sbe32(QEMUFile *f, int v)
-{
- qemu_put_be32(f, (unsigned int)v);
-}
-
-static inline void qemu_put_sbe64(QEMUFile *f, int64_t v)
-{
- qemu_put_be64(f, (uint64_t)v);
-}
-
-static inline size_t qemu_get_sbuffer(QEMUFile *f, int8_t *buf, int size)
-{
- return qemu_get_buffer(f, (uint8_t *)buf, size);
-}
-
-static inline int qemu_get_sbe16(QEMUFile *f)
-{
- return (int)qemu_get_be16(f);
-}
-
-static inline int qemu_get_sbe32(QEMUFile *f)
-{
- return (int)qemu_get_be32(f);
-}
-
-static inline int64_t qemu_get_sbe64(QEMUFile *f)
-{
- return (int64_t)qemu_get_be64(f);
-}
-
-static inline void qemu_put_s8s(QEMUFile *f, const int8_t *pv)
-{
- qemu_put_8s(f, (const uint8_t *)pv);
-}
-
-static inline void qemu_put_sbe16s(QEMUFile *f, const int16_t *pv)
-{
- qemu_put_be16s(f, (const uint16_t *)pv);
-}
-
-static inline void qemu_put_sbe32s(QEMUFile *f, const int32_t *pv)
-{
- qemu_put_be32s(f, (const uint32_t *)pv);
-}
-
-static inline void qemu_put_sbe64s(QEMUFile *f, const int64_t *pv)
-{
- qemu_put_be64s(f, (const uint64_t *)pv);
-}
-
-static inline void qemu_get_s8s(QEMUFile *f, int8_t *pv)
-{
- qemu_get_8s(f, (uint8_t *)pv);
-}
-
-static inline void qemu_get_sbe16s(QEMUFile *f, int16_t *pv)
-{
- qemu_get_be16s(f, (uint16_t *)pv);
-}
-
-static inline void qemu_get_sbe32s(QEMUFile *f, int32_t *pv)
-{
- qemu_get_be32s(f, (uint32_t *)pv);
-}
-
-static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
-{
- qemu_get_be64s(f, (uint64_t *)pv);
-}
-
size_t qemu_get_counted_string(QEMUFile *f, char buf[256]);
+
#endif
diff --git a/migration/ram.c b/migration/ram.c
index 26e03a5..390f714 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -37,7 +37,7 @@
#include "qemu/main-loop.h"
#include "xbzrle.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "migration/vmstate.h"
#include "postcopy-ram.h"
#include "exec/address-spaces.h"
diff --git a/migration/rdma.c b/migration/rdma.c
index 166cd60..4cb5bf8 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -18,7 +18,7 @@
#include "qemu-common.h"
#include "qemu/cutils.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "exec/cpu-common.h"
#include "qemu-file-channel.h"
#include "qemu/error-report.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index 2d1d4bc..bb3f9ec 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -36,6 +36,7 @@
#include "qemu/timer.h"
#include "migration/migration.h"
#include "qemu-file-channel.h"
+#include "qemu-file.h"
#include "savevm.h"
#include "postcopy-ram.h"
#include "qapi/qmp/qerror.h"
diff --git a/migration/socket.c b/migration/socket.c
index 53f9d61..3f8ffc9 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -21,7 +21,7 @@
#include "qapi/error.h"
#include "channel.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
#include "io/channel-socket.h"
#include "trace.h"
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index cc95e47..7287c6b 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -12,8 +12,9 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
+#include "exec/cpu-common.h"
+#include "qemu-file.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
#include "migration/vmstate.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index ff54531..51a19b6 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -13,8 +13,8 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
#include "migration/vmstate.h"
+#include "qemu-file.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
#include "trace.h"
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 25389bc..c52aff9 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -27,7 +27,8 @@
#include "qemu-common.h"
#include "migration/migration.h"
#include "migration/vmstate.h"
-#include "migration/qemu-file.h"
+#include "migration/qemu-file-types.h"
+#include "../migration/qemu-file.h"
#include "../migration/qemu-file-channel.h"
#include "qemu/coroutine.h"
#include "io/channel-file.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h Juan Quintela
@ 2017-06-01 12:21 ` Dr. David Alan Gilbert
2017-06-01 15:19 ` Juan Quintela
0 siblings, 1 reply; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:21 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Split the file into public and internal interfaces. I have to rename
> the external one because we can't have two include files with the same
> name in the same directory. Build system gets confused. The only
> exported functions are the ones that handle basic types.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Hmm, ok, but I'd like to make qemu-file-types.h private eventually;
we're down to 193 qemu_put_b*'s outside of migration - of those 72 will
go when Halil's set goes in.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/i2c/i2c-ddc.c | 1 +
> hw/intc/s390_flic.c | 1 -
> hw/intc/s390_flic_kvm.c | 1 -
> hw/s390x/s390-skeys.c | 1 -
> include/hw/hw.h | 2 +-
> include/migration/qemu-file-types.h | 164 +++++++++++++++++++++++++++
> migration/block.c | 2 +-
> migration/colo.c | 2 +-
> migration/migration.c | 2 +-
> migration/postcopy-ram.c | 2 +-
> migration/qemu-file-channel.c | 3 +-
> migration/qemu-file.c | 2 +-
> {include/migration => migration}/qemu-file.h | 157 +------------------------
> migration/ram.c | 2 +-
> migration/rdma.c | 2 +-
> migration/savevm.c | 1 +
> migration/socket.c | 2 +-
> migration/vmstate-types.c | 3 +-
> migration/vmstate.c | 2 +-
> tests/test-vmstate.c | 3 +-
> 20 files changed, 186 insertions(+), 169 deletions(-)
> create mode 100644 include/migration/qemu-file-types.h
> rename {include/migration => migration}/qemu-file.h (62%)
>
> diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c
> index 66899d7..6b92e95 100644
> --- a/hw/i2c/i2c-ddc.c
> +++ b/hw/i2c/i2c-ddc.c
> @@ -17,6 +17,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu-common.h"
> #include "qemu/log.h"
> #include "hw/i2c/i2c.h"
> #include "hw/i2c/i2c-ddc.h"
> diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
> index 711c114..a26e906 100644
> --- a/hw/intc/s390_flic.c
> +++ b/hw/intc/s390_flic.c
> @@ -13,7 +13,6 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "hw/sysbus.h"
> -#include "migration/qemu-file.h"
> #include "hw/s390x/s390_flic.h"
> #include "trace.h"
> #include "hw/qdev.h"
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index cc44bc4..b4c61d8 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -17,7 +17,6 @@
> #include "qemu/error-report.h"
> #include "hw/sysbus.h"
> #include "sysemu/kvm.h"
> -#include "migration/qemu-file.h"
> #include "hw/s390x/s390_flic.h"
> #include "hw/s390x/adapter.h"
> #include "trace.h"
> diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
> index e2d4e1a..619152c 100644
> --- a/hw/s390x/s390-skeys.c
> +++ b/hw/s390x/s390-skeys.c
> @@ -12,7 +12,6 @@
> #include "qemu/osdep.h"
> #include "hw/boards.h"
> #include "qmp-commands.h"
> -#include "migration/qemu-file.h"
> #include "hw/s390x/storage-keys.h"
> #include "qemu/error-report.h"
> #include "sysemu/kvm.h"
> diff --git a/include/hw/hw.h b/include/hw/hw.h
> index af9eae1..ab4950c 100644
> --- a/include/hw/hw.h
> +++ b/include/hw/hw.h
> @@ -11,7 +11,7 @@
> #include "exec/memory.h"
> #include "hw/irq.h"
> #include "migration/vmstate.h"
> -#include "migration/qemu-file.h"
> +#include "migration/qemu-file-types.h"
> #include "qemu/module.h"
> #include "sysemu/reset.h"
>
> diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h
> new file mode 100644
> index 0000000..bd6d7dd
> --- /dev/null
> +++ b/include/migration/qemu-file-types.h
> @@ -0,0 +1,164 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2003-2008 Fabrice Bellard
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#ifndef QEMU_FILE_H
> +#define QEMU_FILE_H
> +
> +void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size);
> +void qemu_put_byte(QEMUFile *f, int v);
> +
> +#define qemu_put_sbyte qemu_put_byte
> +
> +void qemu_put_be16(QEMUFile *f, unsigned int v);
> +void qemu_put_be32(QEMUFile *f, unsigned int v);
> +void qemu_put_be64(QEMUFile *f, uint64_t v);
> +size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
> +
> +int qemu_get_byte(QEMUFile *f);
> +
> +static inline unsigned int qemu_get_ubyte(QEMUFile *f)
> +{
> + return (unsigned int)qemu_get_byte(f);
> +}
> +
> +#define qemu_get_sbyte qemu_get_byte
> +
> +unsigned int qemu_get_be16(QEMUFile *f);
> +unsigned int qemu_get_be32(QEMUFile *f);
> +uint64_t qemu_get_be64(QEMUFile *f);
> +
> +static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)
> +{
> + qemu_put_be64(f, *pv);
> +}
> +
> +static inline void qemu_put_be32s(QEMUFile *f, const uint32_t *pv)
> +{
> + qemu_put_be32(f, *pv);
> +}
> +
> +static inline void qemu_put_be16s(QEMUFile *f, const uint16_t *pv)
> +{
> + qemu_put_be16(f, *pv);
> +}
> +
> +static inline void qemu_put_8s(QEMUFile *f, const uint8_t *pv)
> +{
> + qemu_put_byte(f, *pv);
> +}
> +
> +static inline void qemu_get_be64s(QEMUFile *f, uint64_t *pv)
> +{
> + *pv = qemu_get_be64(f);
> +}
> +
> +static inline void qemu_get_be32s(QEMUFile *f, uint32_t *pv)
> +{
> + *pv = qemu_get_be32(f);
> +}
> +
> +static inline void qemu_get_be16s(QEMUFile *f, uint16_t *pv)
> +{
> + *pv = qemu_get_be16(f);
> +}
> +
> +static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv)
> +{
> + *pv = qemu_get_byte(f);
> +}
> +
> +/* Signed versions for type safety */
> +static inline void qemu_put_sbe16(QEMUFile *f, int v)
> +{
> + qemu_put_be16(f, (unsigned int)v);
> +}
> +
> +static inline void qemu_put_sbe32(QEMUFile *f, int v)
> +{
> + qemu_put_be32(f, (unsigned int)v);
> +}
> +
> +static inline void qemu_put_sbe64(QEMUFile *f, int64_t v)
> +{
> + qemu_put_be64(f, (uint64_t)v);
> +}
> +
> +static inline int qemu_get_sbe16(QEMUFile *f)
> +{
> + return (int)qemu_get_be16(f);
> +}
> +
> +static inline int qemu_get_sbe32(QEMUFile *f)
> +{
> + return (int)qemu_get_be32(f);
> +}
> +
> +static inline int64_t qemu_get_sbe64(QEMUFile *f)
> +{
> + return (int64_t)qemu_get_be64(f);
> +}
> +
> +static inline void qemu_put_s8s(QEMUFile *f, const int8_t *pv)
> +{
> + qemu_put_8s(f, (const uint8_t *)pv);
> +}
> +
> +static inline void qemu_put_sbe16s(QEMUFile *f, const int16_t *pv)
> +{
> + qemu_put_be16s(f, (const uint16_t *)pv);
> +}
> +
> +static inline void qemu_put_sbe32s(QEMUFile *f, const int32_t *pv)
> +{
> + qemu_put_be32s(f, (const uint32_t *)pv);
> +}
> +
> +static inline void qemu_put_sbe64s(QEMUFile *f, const int64_t *pv)
> +{
> + qemu_put_be64s(f, (const uint64_t *)pv);
> +}
> +
> +static inline void qemu_get_s8s(QEMUFile *f, int8_t *pv)
> +{
> + qemu_get_8s(f, (uint8_t *)pv);
> +}
> +
> +static inline void qemu_get_sbe16s(QEMUFile *f, int16_t *pv)
> +{
> + qemu_get_be16s(f, (uint16_t *)pv);
> +}
> +
> +static inline void qemu_get_sbe32s(QEMUFile *f, int32_t *pv)
> +{
> + qemu_get_be32s(f, (uint32_t *)pv);
> +}
> +
> +static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
> +{
> + qemu_get_be64s(f, (uint64_t *)pv);
> +}
> +
> +int qemu_file_rate_limit(QEMUFile *f);
> +
> +#endif
> diff --git a/migration/block.c b/migration/block.c
> index 13f90d3..3e27499 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -26,7 +26,7 @@
> #include "migration/block.h"
> #include "migration/migration.h"
> #include "sysemu/blockdev.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "migration/vmstate.h"
> #include "sysemu/block-backend.h"
>
> diff --git a/migration/colo.c b/migration/colo.c
> index 3dd1390..4f1f3b8 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -15,7 +15,7 @@
> #include "sysemu/sysemu.h"
> #include "qemu-file-channel.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "savevm.h"
> #include "migration/colo.h"
> #include "migration/block.h"
> diff --git a/migration/migration.c b/migration/migration.c
> index c3218cd..ea61650 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -21,7 +21,7 @@
> #include "migration/migration.h"
> #include "savevm.h"
> #include "qemu-file-channel.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "migration/vmstate.h"
> #include "sysemu/sysemu.h"
> #include "block/block.h"
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index 3f9ae1b..6f239f9 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -21,7 +21,7 @@
> #include "qemu-common.h"
> #include "exec/target_page.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "savevm.h"
> #include "postcopy-ram.h"
> #include "sysemu/sysemu.h"
> diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
> index dc991c9..e202d73 100644
> --- a/migration/qemu-file-channel.c
> +++ b/migration/qemu-file-channel.c
> @@ -24,7 +24,8 @@
>
> #include "qemu/osdep.h"
> #include "qemu-file-channel.h"
> -#include "migration/qemu-file.h"
> +#include "exec/cpu-common.h"
> +#include "qemu-file.h"
> #include "io/channel-socket.h"
> #include "qemu/iov.h"
>
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 195fa94..ab26f4e 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -29,7 +29,7 @@
> #include "qemu/sockets.h"
> #include "qemu/coroutine.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "trace.h"
>
> #define IO_BUF_SIZE 32768
> diff --git a/include/migration/qemu-file.h b/migration/qemu-file.h
> similarity index 62%
> rename from include/migration/qemu-file.h
> rename to migration/qemu-file.h
> index b5ac800..49fd697 100644
> --- a/include/migration/qemu-file.h
> +++ b/migration/qemu-file.h
> @@ -22,11 +22,8 @@
> * THE SOFTWARE.
> */
>
> -#ifndef QEMU_FILE_H
> -#define QEMU_FILE_H
> -
> -#include "qemu-common.h"
> -#include "exec/cpu-common.h"
> +#ifndef MIGRATION_QEMU_FILE_H
> +#define MIGRATION_QEMU_FILE_H
>
> /* Read a chunk of data from a file at the given position. The pos argument
> * can be ignored if the file is only be used for streaming. The number of
> @@ -122,8 +119,6 @@ int qemu_get_fd(QEMUFile *f);
> int qemu_fclose(QEMUFile *f);
> int64_t qemu_ftell(QEMUFile *f);
> int64_t qemu_ftell_fast(QEMUFile *f);
> -void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size);
> -void qemu_put_byte(QEMUFile *f, int v);
> /*
> * put_buffer without copying the buffer.
> * The buffer should be available till it is sent asynchronously.
> @@ -133,19 +128,9 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size,
> bool qemu_file_mode_is_not_valid(const char *mode);
> bool qemu_file_is_writable(QEMUFile *f);
>
> +#include "migration/qemu-file-types.h"
>
> -static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v)
> -{
> - qemu_put_byte(f, (int)v);
> -}
> -
> -#define qemu_put_sbyte qemu_put_byte
> -
> -void qemu_put_be16(QEMUFile *f, unsigned int v);
> -void qemu_put_be32(QEMUFile *f, unsigned int v);
> -void qemu_put_be64(QEMUFile *f, uint64_t v);
> size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset);
> -size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
> size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size);
> ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size,
> int level);
> @@ -157,22 +142,8 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
> * previously peeked +n-1.
> */
> int qemu_peek_byte(QEMUFile *f, int offset);
> -int qemu_get_byte(QEMUFile *f);
> void qemu_file_skip(QEMUFile *f, int size);
> void qemu_update_position(QEMUFile *f, size_t size);
> -
> -static inline unsigned int qemu_get_ubyte(QEMUFile *f)
> -{
> - return (unsigned int)qemu_get_byte(f);
> -}
> -
> -#define qemu_get_sbyte qemu_get_byte
> -
> -unsigned int qemu_get_be16(QEMUFile *f);
> -unsigned int qemu_get_be32(QEMUFile *f);
> -uint64_t qemu_get_be64(QEMUFile *f);
> -
> -int qemu_file_rate_limit(QEMUFile *f);
> void qemu_file_reset_rate_limit(QEMUFile *f);
> void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
> int64_t qemu_file_get_rate_limit(QEMUFile *f);
> @@ -183,127 +154,7 @@ QEMUFile *qemu_file_get_return_path(QEMUFile *f);
> void qemu_fflush(QEMUFile *f);
> void qemu_file_set_blocking(QEMUFile *f, bool block);
>
> -static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)
> -{
> - qemu_put_be64(f, *pv);
> -}
> -
> -static inline void qemu_put_be32s(QEMUFile *f, const uint32_t *pv)
> -{
> - qemu_put_be32(f, *pv);
> -}
> -
> -static inline void qemu_put_be16s(QEMUFile *f, const uint16_t *pv)
> -{
> - qemu_put_be16(f, *pv);
> -}
> -
> -static inline void qemu_put_8s(QEMUFile *f, const uint8_t *pv)
> -{
> - qemu_put_byte(f, *pv);
> -}
> -
> -static inline void qemu_get_be64s(QEMUFile *f, uint64_t *pv)
> -{
> - *pv = qemu_get_be64(f);
> -}
> -
> -static inline void qemu_get_be32s(QEMUFile *f, uint32_t *pv)
> -{
> - *pv = qemu_get_be32(f);
> -}
> -
> -static inline void qemu_get_be16s(QEMUFile *f, uint16_t *pv)
> -{
> - *pv = qemu_get_be16(f);
> -}
> -
> -static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv)
> -{
> - *pv = qemu_get_byte(f);
> -}
> -
> -// Signed versions for type safety
> -static inline void qemu_put_sbuffer(QEMUFile *f, const int8_t *buf, size_t size)
> -{
> - qemu_put_buffer(f, (const uint8_t *)buf, size);
> -}
> -
> -static inline void qemu_put_sbe16(QEMUFile *f, int v)
> -{
> - qemu_put_be16(f, (unsigned int)v);
> -}
> -
> -static inline void qemu_put_sbe32(QEMUFile *f, int v)
> -{
> - qemu_put_be32(f, (unsigned int)v);
> -}
> -
> -static inline void qemu_put_sbe64(QEMUFile *f, int64_t v)
> -{
> - qemu_put_be64(f, (uint64_t)v);
> -}
> -
> -static inline size_t qemu_get_sbuffer(QEMUFile *f, int8_t *buf, int size)
> -{
> - return qemu_get_buffer(f, (uint8_t *)buf, size);
> -}
> -
> -static inline int qemu_get_sbe16(QEMUFile *f)
> -{
> - return (int)qemu_get_be16(f);
> -}
> -
> -static inline int qemu_get_sbe32(QEMUFile *f)
> -{
> - return (int)qemu_get_be32(f);
> -}
> -
> -static inline int64_t qemu_get_sbe64(QEMUFile *f)
> -{
> - return (int64_t)qemu_get_be64(f);
> -}
> -
> -static inline void qemu_put_s8s(QEMUFile *f, const int8_t *pv)
> -{
> - qemu_put_8s(f, (const uint8_t *)pv);
> -}
> -
> -static inline void qemu_put_sbe16s(QEMUFile *f, const int16_t *pv)
> -{
> - qemu_put_be16s(f, (const uint16_t *)pv);
> -}
> -
> -static inline void qemu_put_sbe32s(QEMUFile *f, const int32_t *pv)
> -{
> - qemu_put_be32s(f, (const uint32_t *)pv);
> -}
> -
> -static inline void qemu_put_sbe64s(QEMUFile *f, const int64_t *pv)
> -{
> - qemu_put_be64s(f, (const uint64_t *)pv);
> -}
> -
> -static inline void qemu_get_s8s(QEMUFile *f, int8_t *pv)
> -{
> - qemu_get_8s(f, (uint8_t *)pv);
> -}
> -
> -static inline void qemu_get_sbe16s(QEMUFile *f, int16_t *pv)
> -{
> - qemu_get_be16s(f, (uint16_t *)pv);
> -}
> -
> -static inline void qemu_get_sbe32s(QEMUFile *f, int32_t *pv)
> -{
> - qemu_get_be32s(f, (uint32_t *)pv);
> -}
> -
> -static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
> -{
> - qemu_get_be64s(f, (uint64_t *)pv);
> -}
> -
> size_t qemu_get_counted_string(QEMUFile *f, char buf[256]);
>
> +
> #endif
> diff --git a/migration/ram.c b/migration/ram.c
> index 26e03a5..390f714 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -37,7 +37,7 @@
> #include "qemu/main-loop.h"
> #include "xbzrle.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "migration/vmstate.h"
> #include "postcopy-ram.h"
> #include "exec/address-spaces.h"
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 166cd60..4cb5bf8 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -18,7 +18,7 @@
> #include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "exec/cpu-common.h"
> #include "qemu-file-channel.h"
> #include "qemu/error-report.h"
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 2d1d4bc..bb3f9ec 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -36,6 +36,7 @@
> #include "qemu/timer.h"
> #include "migration/migration.h"
> #include "qemu-file-channel.h"
> +#include "qemu-file.h"
> #include "savevm.h"
> #include "postcopy-ram.h"
> #include "qapi/qmp/qerror.h"
> diff --git a/migration/socket.c b/migration/socket.c
> index 53f9d61..3f8ffc9 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -21,7 +21,7 @@
> #include "qapi/error.h"
> #include "channel.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> +#include "qemu-file.h"
> #include "io/channel-socket.h"
> #include "trace.h"
>
> diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
> index cc95e47..7287c6b 100644
> --- a/migration/vmstate-types.c
> +++ b/migration/vmstate-types.c
> @@ -12,8 +12,9 @@
>
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> +#include "exec/cpu-common.h"
> +#include "qemu-file.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> #include "migration/vmstate.h"
> #include "qemu/error-report.h"
> #include "qemu/queue.h"
> diff --git a/migration/vmstate.c b/migration/vmstate.c
> index ff54531..51a19b6 100644
> --- a/migration/vmstate.c
> +++ b/migration/vmstate.c
> @@ -13,8 +13,8 @@
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> #include "migration/migration.h"
> -#include "migration/qemu-file.h"
> #include "migration/vmstate.h"
> +#include "qemu-file.h"
> #include "qemu/bitops.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
> index 25389bc..c52aff9 100644
> --- a/tests/test-vmstate.c
> +++ b/tests/test-vmstate.c
> @@ -27,7 +27,8 @@
> #include "qemu-common.h"
> #include "migration/migration.h"
> #include "migration/vmstate.h"
> -#include "migration/qemu-file.h"
> +#include "migration/qemu-file-types.h"
> +#include "../migration/qemu-file.h"
> #include "../migration/qemu-file-channel.h"
> #include "qemu/coroutine.h"
> #include "io/channel-file.h"
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h
2017-06-01 12:21 ` Dr. David Alan Gilbert
@ 2017-06-01 15:19 ` Juan Quintela
0 siblings, 0 replies; 26+ messages in thread
From: Juan Quintela @ 2017-06-01 15:19 UTC (permalink / raw)
To: Dr. David Alan Gilbert; +Cc: qemu-devel, lvivier, peterx
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> * Juan Quintela (quintela@redhat.com) wrote:
>> Split the file into public and internal interfaces. I have to rename
>> the external one because we can't have two include files with the same
>> name in the same directory. Build system gets confused. The only
>> exported functions are the ones that handle basic types.
>>
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>
> Hmm, ok, but I'd like to make qemu-file-types.h private eventually;
> we're down to 193 qemu_put_b*'s outside of migration - of those 72 will
> go when Halil's set goes in.
Be my guest O:-)
I was just trying to make sure that the other stuff is not used outside.
Later, Juan.
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 03/10] migration: Export exec.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 01/10] migration: Remove unneeded includes of migration/vmstate.h Juan Quintela
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 02/10] migration: Split qemu-file.h Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:28 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 04/10] migration: Export fd.c " Juan Quintela
` (6 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/migration.h | 4 ----
migration/exec.c | 1 +
migration/exec.h | 26 ++++++++++++++++++++++++++
migration/migration.c | 1 +
4 files changed, 28 insertions(+), 4 deletions(-)
create mode 100644 migration/exec.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d1a353a..d04f045 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -163,10 +163,6 @@ void migration_tls_channel_connect(MigrationState *s,
uint64_t migrate_max_downtime(void);
-void exec_start_incoming_migration(const char *host_port, Error **errp);
-
-void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
-
void tcp_start_incoming_migration(const char *host_port, Error **errp);
void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
diff --git a/migration/exec.c b/migration/exec.c
index 57a9335..9077024 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -21,6 +21,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "channel.h"
+#include "exec.h"
#include "migration/migration.h"
#include "io/channel-command.h"
#include "trace.h"
diff --git a/migration/exec.h b/migration/exec.h
new file mode 100644
index 0000000..b210ffd
--- /dev/null
+++ b/migration/exec.h
@@ -0,0 +1,26 @@
+/*
+ * QEMU live migration
+ *
+ * Copyright IBM, Corp. 2008
+ * Copyright Dell MessageOne 2008
+ * Copyright Red Hat, Inc. 2015-2016
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ * Charles Duffy <charles_duffy@messageone.com>
+ * Daniel P. Berrange <berrange@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#ifndef QEMU_MIGRATION_EXEC_H
+#define QEMU_MIGRATION_EXEC_H
+void exec_start_incoming_migration(const char *host_port, Error **errp);
+
+void exec_start_outgoing_migration(MigrationState *s, const char *host_port,
+ Error **errp);
+#endif
diff --git a/migration/migration.c b/migration/migration.c
index ea61650..31fa56f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -18,6 +18,7 @@
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "migration/blocker.h"
+#include "exec.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 03/10] migration: Export exec.c functions in its own file
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 03/10] migration: Export exec.c functions in its own file Juan Quintela
@ 2017-06-01 12:28 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:28 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> include/migration/migration.h | 4 ----
> migration/exec.c | 1 +
> migration/exec.h | 26 ++++++++++++++++++++++++++
> migration/migration.c | 1 +
> 4 files changed, 28 insertions(+), 4 deletions(-)
> create mode 100644 migration/exec.h
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index d1a353a..d04f045 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -163,10 +163,6 @@ void migration_tls_channel_connect(MigrationState *s,
>
> uint64_t migrate_max_downtime(void);
>
> -void exec_start_incoming_migration(const char *host_port, Error **errp);
> -
> -void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
> -
> void tcp_start_incoming_migration(const char *host_port, Error **errp);
>
> void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
> diff --git a/migration/exec.c b/migration/exec.c
> index 57a9335..9077024 100644
> --- a/migration/exec.c
> +++ b/migration/exec.c
> @@ -21,6 +21,7 @@
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "channel.h"
> +#include "exec.h"
> #include "migration/migration.h"
> #include "io/channel-command.h"
> #include "trace.h"
> diff --git a/migration/exec.h b/migration/exec.h
> new file mode 100644
> index 0000000..b210ffd
> --- /dev/null
> +++ b/migration/exec.h
> @@ -0,0 +1,26 @@
> +/*
> + * QEMU live migration
> + *
> + * Copyright IBM, Corp. 2008
> + * Copyright Dell MessageOne 2008
> + * Copyright Red Hat, Inc. 2015-2016
> + *
> + * Authors:
> + * Anthony Liguori <aliguori@us.ibm.com>
> + * Charles Duffy <charles_duffy@messageone.com>
> + * Daniel P. Berrange <berrange@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.
> + */
> +
> +#ifndef QEMU_MIGRATION_EXEC_H
> +#define QEMU_MIGRATION_EXEC_H
> +void exec_start_incoming_migration(const char *host_port, Error **errp);
> +
> +void exec_start_outgoing_migration(MigrationState *s, const char *host_port,
> + Error **errp);
> +#endif
> diff --git a/migration/migration.c b/migration/migration.c
> index ea61650..31fa56f 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -18,6 +18,7 @@
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "migration/blocker.h"
> +#include "exec.h"
> #include "migration/migration.h"
> #include "savevm.h"
> #include "qemu-file-channel.h"
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 04/10] migration: Export fd.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (2 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 03/10] migration: Export exec.c functions in its own file Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:29 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 05/10] migration: Export socket.c " Juan Quintela
` (5 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/migration.h | 4 ----
migration/fd.c | 1 +
migration/fd.h | 23 +++++++++++++++++++++++
migration/migration.c | 1 +
4 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 migration/fd.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d04f045..d249c13 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -171,10 +171,6 @@ void unix_start_incoming_migration(const char *path, Error **errp);
void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
-void fd_start_incoming_migration(const char *path, Error **errp);
-
-void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp);
-
void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
void rdma_start_incoming_migration(const char *host_port, Error **errp);
diff --git a/migration/fd.c b/migration/fd.c
index 05e0a5c..0077a50 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -18,6 +18,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "channel.h"
+#include "fd.h"
#include "migration/migration.h"
#include "monitor/monitor.h"
#include "io/channel-util.h"
diff --git a/migration/fd.h b/migration/fd.h
new file mode 100644
index 0000000..a14a63c
--- /dev/null
+++ b/migration/fd.h
@@ -0,0 +1,23 @@
+/*
+ * QEMU live migration via generic fd
+ *
+ * Copyright Red Hat, Inc. 2009-2016
+ *
+ * Authors:
+ * Chris Lalancette <clalance@redhat.com>
+ * Daniel P. Berrange <berrange@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#ifndef QEMU_MIGRATION_FD_H
+#define QEMU_MIGRATION_FD_H
+void fd_start_incoming_migration(const char *path, Error **errp);
+
+void fd_start_outgoing_migration(MigrationState *s, const char *fdname,
+ Error **errp);
+#endif
diff --git a/migration/migration.c b/migration/migration.c
index 31fa56f..f3a1236 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -19,6 +19,7 @@
#include "qemu/main-loop.h"
#include "migration/blocker.h"
#include "exec.h"
+#include "fd.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 04/10] migration: Export fd.c functions in its own file
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 04/10] migration: Export fd.c " Juan Quintela
@ 2017-06-01 12:29 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:29 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> include/migration/migration.h | 4 ----
> migration/fd.c | 1 +
> migration/fd.h | 23 +++++++++++++++++++++++
> migration/migration.c | 1 +
> 4 files changed, 25 insertions(+), 4 deletions(-)
> create mode 100644 migration/fd.h
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index d04f045..d249c13 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -171,10 +171,6 @@ void unix_start_incoming_migration(const char *path, Error **errp);
>
> void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
>
> -void fd_start_incoming_migration(const char *path, Error **errp);
> -
> -void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp);
> -
> void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
>
> void rdma_start_incoming_migration(const char *host_port, Error **errp);
> diff --git a/migration/fd.c b/migration/fd.c
> index 05e0a5c..0077a50 100644
> --- a/migration/fd.c
> +++ b/migration/fd.c
> @@ -18,6 +18,7 @@
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "channel.h"
> +#include "fd.h"
> #include "migration/migration.h"
> #include "monitor/monitor.h"
> #include "io/channel-util.h"
> diff --git a/migration/fd.h b/migration/fd.h
> new file mode 100644
> index 0000000..a14a63c
> --- /dev/null
> +++ b/migration/fd.h
> @@ -0,0 +1,23 @@
> +/*
> + * QEMU live migration via generic fd
> + *
> + * Copyright Red Hat, Inc. 2009-2016
> + *
> + * Authors:
> + * Chris Lalancette <clalance@redhat.com>
> + * Daniel P. Berrange <berrange@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.
> + */
> +
> +#ifndef QEMU_MIGRATION_FD_H
> +#define QEMU_MIGRATION_FD_H
> +void fd_start_incoming_migration(const char *path, Error **errp);
> +
> +void fd_start_outgoing_migration(MigrationState *s, const char *fdname,
> + Error **errp);
> +#endif
> diff --git a/migration/migration.c b/migration/migration.c
> index 31fa56f..f3a1236 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -19,6 +19,7 @@
> #include "qemu/main-loop.h"
> #include "migration/blocker.h"
> #include "exec.h"
> +#include "fd.h"
> #include "migration/migration.h"
> #include "savevm.h"
> #include "qemu-file-channel.h"
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 05/10] migration: Export socket.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (3 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 04/10] migration: Export fd.c " Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:37 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c " Juan Quintela
` (4 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/migration.h | 8 --------
migration/migration.c | 1 +
migration/socket.c | 1 +
migration/socket.h | 28 ++++++++++++++++++++++++++++
4 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 migration/socket.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d249c13..9d311ed 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -163,14 +163,6 @@ void migration_tls_channel_connect(MigrationState *s,
uint64_t migrate_max_downtime(void);
-void tcp_start_incoming_migration(const char *host_port, Error **errp);
-
-void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
-
-void unix_start_incoming_migration(const char *path, Error **errp);
-
-void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
-
void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
void rdma_start_incoming_migration(const char *host_port, Error **errp);
diff --git a/migration/migration.c b/migration/migration.c
index f3a1236..f5140d2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -20,6 +20,7 @@
#include "migration/blocker.h"
#include "exec.h"
#include "fd.h"
+#include "socket.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
diff --git a/migration/socket.c b/migration/socket.c
index 3f8ffc9..85bfdcc 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -20,6 +20,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "channel.h"
+#include "socket.h"
#include "migration/migration.h"
#include "qemu-file.h"
#include "io/channel-socket.h"
diff --git a/migration/socket.h b/migration/socket.h
new file mode 100644
index 0000000..6b91e9d
--- /dev/null
+++ b/migration/socket.h
@@ -0,0 +1,28 @@
+/*
+ * QEMU live migration via socket
+ *
+ * Copyright Red Hat, Inc. 2009-2016
+ *
+ * Authors:
+ * Chris Lalancette <clalance@redhat.com>
+ * Daniel P. Berrange <berrange@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#ifndef QEMU_MIGRATION_SOCKET_H
+#define QEMU_MIGRATION_SOCKET_H
+void tcp_start_incoming_migration(const char *host_port, Error **errp);
+
+void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
+ Error **errp);
+
+void unix_start_incoming_migration(const char *path, Error **errp);
+
+void unix_start_outgoing_migration(MigrationState *s, const char *path,
+ Error **errp);
+#endif
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 05/10] migration: Export socket.c functions in its own file
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 05/10] migration: Export socket.c " Juan Quintela
@ 2017-06-01 12:37 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:37 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> include/migration/migration.h | 8 --------
> migration/migration.c | 1 +
> migration/socket.c | 1 +
> migration/socket.h | 28 ++++++++++++++++++++++++++++
> 4 files changed, 30 insertions(+), 8 deletions(-)
> create mode 100644 migration/socket.h
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index d249c13..9d311ed 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -163,14 +163,6 @@ void migration_tls_channel_connect(MigrationState *s,
>
> uint64_t migrate_max_downtime(void);
>
> -void tcp_start_incoming_migration(const char *host_port, Error **errp);
> -
> -void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
> -
> -void unix_start_incoming_migration(const char *path, Error **errp);
> -
> -void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
> -
> void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
>
> void rdma_start_incoming_migration(const char *host_port, Error **errp);
> diff --git a/migration/migration.c b/migration/migration.c
> index f3a1236..f5140d2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -20,6 +20,7 @@
> #include "migration/blocker.h"
> #include "exec.h"
> #include "fd.h"
> +#include "socket.h"
> #include "migration/migration.h"
> #include "savevm.h"
> #include "qemu-file-channel.h"
> diff --git a/migration/socket.c b/migration/socket.c
> index 3f8ffc9..85bfdcc 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -20,6 +20,7 @@
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "channel.h"
> +#include "socket.h"
> #include "migration/migration.h"
> #include "qemu-file.h"
> #include "io/channel-socket.h"
> diff --git a/migration/socket.h b/migration/socket.h
> new file mode 100644
> index 0000000..6b91e9d
> --- /dev/null
> +++ b/migration/socket.h
> @@ -0,0 +1,28 @@
> +/*
> + * QEMU live migration via socket
> + *
> + * Copyright Red Hat, Inc. 2009-2016
> + *
> + * Authors:
> + * Chris Lalancette <clalance@redhat.com>
> + * Daniel P. Berrange <berrange@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.
> + */
> +
> +#ifndef QEMU_MIGRATION_SOCKET_H
> +#define QEMU_MIGRATION_SOCKET_H
> +void tcp_start_incoming_migration(const char *host_port, Error **errp);
> +
> +void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
> + Error **errp);
> +
> +void unix_start_incoming_migration(const char *path, Error **errp);
> +
> +void unix_start_outgoing_migration(MigrationState *s, const char *path,
> + Error **errp);
> +#endif
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (4 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 05/10] migration: Export socket.c " Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:41 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c " Juan Quintela
` (3 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Just for the functions exported from tls.c. Notice that we can't
remove the migration/migration.h include from tls.c because it access
directly MigrationState for the tls params.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/migration.h | 10 ----------
migration/channel.c | 1 +
migration/migration.c | 1 -
migration/tls.c | 1 +
migration/tls.h | 34 ++++++++++++++++++++++++++++++++++
5 files changed, 36 insertions(+), 11 deletions(-)
create mode 100644 migration/tls.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 9d311ed..29fda5b 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -18,7 +18,6 @@
#include "qemu-common.h"
#include "qemu/thread.h"
#include "qemu/notify.h"
-#include "io/channel.h"
#include "qapi-types.h"
#include "exec/cpu-common.h"
#include "qemu/coroutine_int.h"
@@ -152,15 +151,6 @@ void migration_fd_process_incoming(QEMUFile *f);
void qemu_start_incoming_migration(const char *uri, Error **errp);
-void migration_tls_channel_process_incoming(MigrationState *s,
- QIOChannel *ioc,
- Error **errp);
-
-void migration_tls_channel_connect(MigrationState *s,
- QIOChannel *ioc,
- const char *hostname,
- Error **errp);
-
uint64_t migrate_max_downtime(void);
void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
diff --git a/migration/channel.c b/migration/channel.c
index 2e78905cc..eae1d9e 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "channel.h"
+#include "tls.h"
#include "migration/migration.h"
#include "qemu-file-channel.h"
#include "trace.h"
diff --git a/migration/migration.c b/migration/migration.c
index f5140d2..6e11db2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -43,7 +43,6 @@
#include "exec/address-spaces.h"
#include "exec/target_page.h"
#include "io/channel-buffer.h"
-#include "io/channel-tls.h"
#include "migration/colo.h"
#define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
diff --git a/migration/tls.c b/migration/tls.c
index 34ad121..bae9aca 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "channel.h"
#include "migration/migration.h"
+#include "tls.h"
#include "io/channel-tls.h"
#include "crypto/tlscreds.h"
#include "qemu/error-report.h"
diff --git a/migration/tls.h b/migration/tls.h
new file mode 100644
index 0000000..cdd7000
--- /dev/null
+++ b/migration/tls.h
@@ -0,0 +1,34 @@
+/*
+ * QEMU migration TLS support
+ *
+ * Copyright (c) 2015 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef QEMU_MIGRATION_TLS_H
+#define QEMU_MIGRATION_TLS_H
+
+#include "io/channel.h"
+
+void migration_tls_channel_process_incoming(MigrationState *s,
+ QIOChannel *ioc,
+ Error **errp);
+
+void migration_tls_channel_connect(MigrationState *s,
+ QIOChannel *ioc,
+ const char *hostname,
+ Error **errp);
+#endif
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c functions in its own file
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c " Juan Quintela
@ 2017-06-01 12:41 ` Dr. David Alan Gilbert
2017-06-01 15:20 ` Juan Quintela
0 siblings, 1 reply; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:41 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Just for the functions exported from tls.c. Notice that we can't
> remove the migration/migration.h include from tls.c because it access
> directly MigrationState for the tls params.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> include/migration/migration.h | 10 ----------
> migration/channel.c | 1 +
> migration/migration.c | 1 -
> migration/tls.c | 1 +
> migration/tls.h | 34 ++++++++++++++++++++++++++++++++++
> 5 files changed, 36 insertions(+), 11 deletions(-)
> create mode 100644 migration/tls.h
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 9d311ed..29fda5b 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -18,7 +18,6 @@
> #include "qemu-common.h"
> #include "qemu/thread.h"
> #include "qemu/notify.h"
> -#include "io/channel.h"
> #include "qapi-types.h"
> #include "exec/cpu-common.h"
> #include "qemu/coroutine_int.h"
> @@ -152,15 +151,6 @@ void migration_fd_process_incoming(QEMUFile *f);
>
> void qemu_start_incoming_migration(const char *uri, Error **errp);
>
> -void migration_tls_channel_process_incoming(MigrationState *s,
> - QIOChannel *ioc,
> - Error **errp);
> -
> -void migration_tls_channel_connect(MigrationState *s,
> - QIOChannel *ioc,
> - const char *hostname,
> - Error **errp);
> -
> uint64_t migrate_max_downtime(void);
>
> void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
> diff --git a/migration/channel.c b/migration/channel.c
> index 2e78905cc..eae1d9e 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -12,6 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "channel.h"
> +#include "tls.h"
> #include "migration/migration.h"
> #include "qemu-file-channel.h"
> #include "trace.h"
> diff --git a/migration/migration.c b/migration/migration.c
> index f5140d2..6e11db2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -43,7 +43,6 @@
> #include "exec/address-spaces.h"
> #include "exec/target_page.h"
> #include "io/channel-buffer.h"
> -#include "io/channel-tls.h"
> #include "migration/colo.h"
>
> #define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
> diff --git a/migration/tls.c b/migration/tls.c
> index 34ad121..bae9aca 100644
> --- a/migration/tls.c
> +++ b/migration/tls.c
> @@ -21,6 +21,7 @@
> #include "qemu/osdep.h"
> #include "channel.h"
> #include "migration/migration.h"
> +#include "tls.h"
> #include "io/channel-tls.h"
> #include "crypto/tlscreds.h"
> #include "qemu/error-report.h"
> diff --git a/migration/tls.h b/migration/tls.h
> new file mode 100644
> index 0000000..cdd7000
> --- /dev/null
> +++ b/migration/tls.h
> @@ -0,0 +1,34 @@
> +/*
> + * QEMU migration TLS support
> + *
> + * Copyright (c) 2015 Red Hat, Inc.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + *
> + */
Can you clarify why this is LGPLv2 or later please?
Is this to follow the io/* rather than the migration/migration.h it came
out of.
Anyway, I did see Dan's post saying it was OK to update licenses, but
it's worth a comment in the commit message as to why.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Dave
> +
> +#ifndef QEMU_MIGRATION_TLS_H
> +#define QEMU_MIGRATION_TLS_H
> +
> +#include "io/channel.h"
> +
> +void migration_tls_channel_process_incoming(MigrationState *s,
> + QIOChannel *ioc,
> + Error **errp);
> +
> +void migration_tls_channel_connect(MigrationState *s,
> + QIOChannel *ioc,
> + const char *hostname,
> + Error **errp);
> +#endif
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c functions in its own file
2017-06-01 12:41 ` Dr. David Alan Gilbert
@ 2017-06-01 15:20 ` Juan Quintela
2017-06-01 15:56 ` Dr. David Alan Gilbert
0 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-06-01 15:20 UTC (permalink / raw)
To: Dr. David Alan Gilbert; +Cc: qemu-devel, lvivier, peterx
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> * Juan Quintela (quintela@redhat.com) wrote:
>> Just for the functions exported from tls.c. Notice that we can't
>> remove the migration/migration.h include from tls.c because it access
>> directly MigrationState for the tls params.
>> +++ b/migration/tls.h
>> @@ -0,0 +1,34 @@
>> +/*
>> + * QEMU migration TLS support
>> + *
>> + * Copyright (c) 2015 Red Hat, Inc.
>> + *
>> + * This library is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2 of the License, or (at your option) any later version.
>> + *
>> + * This library is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
>> + *
>> + */
>
> Can you clarify why this is LGPLv2 or later please?
> Is this to follow the io/* rather than the migration/migration.h it came
> out of.
THis is the license of tls.c
And this are only the two functions that are exported from that file, so
....
And anyways, this code is posterior to the cut-off when everything new
is GPL2 or later.
Or I am missing something?
Later, Juan.
>
> Anyway, I did see Dan's post saying it was OK to update licenses, but
> it's worth a comment in the commit message as to why.
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
>
> Dave
>
>> +
>> +#ifndef QEMU_MIGRATION_TLS_H
>> +#define QEMU_MIGRATION_TLS_H
>> +
>> +#include "io/channel.h"
>> +
>> +void migration_tls_channel_process_incoming(MigrationState *s,
>> + QIOChannel *ioc,
>> + Error **errp);
>> +
>> +void migration_tls_channel_connect(MigrationState *s,
>> + QIOChannel *ioc,
>> + const char *hostname,
>> + Error **errp);
>> +#endif
>> --
>> 2.9.4
>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c functions in its own file
2017-06-01 15:20 ` Juan Quintela
@ 2017-06-01 15:56 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 15:56 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> "Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> > * Juan Quintela (quintela@redhat.com) wrote:
> >> Just for the functions exported from tls.c. Notice that we can't
> >> remove the migration/migration.h include from tls.c because it access
> >> directly MigrationState for the tls params.
>
> >> +++ b/migration/tls.h
> >> @@ -0,0 +1,34 @@
> >> +/*
> >> + * QEMU migration TLS support
> >> + *
> >> + * Copyright (c) 2015 Red Hat, Inc.
> >> + *
> >> + * This library is free software; you can redistribute it and/or
> >> + * modify it under the terms of the GNU Lesser General Public
> >> + * License as published by the Free Software Foundation; either
> >> + * version 2 of the License, or (at your option) any later version.
> >> + *
> >> + * This library is distributed in the hope that it will be useful,
> >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> >> + * Lesser General Public License for more details.
> >> + *
> >> + * You should have received a copy of the GNU Lesser General Public
> >> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> >> + *
> >> + */
> >
> > Can you clarify why this is LGPLv2 or later please?
> > Is this to follow the io/* rather than the migration/migration.h it came
> > out of.
>
> THis is the license of tls.c
>
> And this are only the two functions that are exported from that file, so
> ....
>
> And anyways, this code is posterior to the cut-off when everything new
> is GPL2 or later.
>
> Or I am missing something?
No, that's fair, I was following migration.h rather than the .c, but
that's OK.
Dave
> Later, Juan.
>
>
> >
> > Anyway, I did see Dan's post saying it was OK to update licenses, but
> > it's worth a comment in the commit message as to why.
> >
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> >
> >
> > Dave
> >
> >> +
> >> +#ifndef QEMU_MIGRATION_TLS_H
> >> +#define QEMU_MIGRATION_TLS_H
> >> +
> >> +#include "io/channel.h"
> >> +
> >> +void migration_tls_channel_process_incoming(MigrationState *s,
> >> + QIOChannel *ioc,
> >> + Error **errp);
> >> +
> >> +void migration_tls_channel_connect(MigrationState *s,
> >> + QIOChannel *ioc,
> >> + const char *hostname,
> >> + Error **errp);
> >> +#endif
> >> --
> >> 2.9.4
> >>
> > --
> > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (5 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 06/10] migration: Export tls.c " Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:46 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 08/10] migration: Create include for migration snapshots Juan Quintela
` (2 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/migration.h | 4 ----
migration/migration.c | 1 +
migration/rdma.c | 1 +
migration/rdma.h | 25 +++++++++++++++++++++++++
4 files changed, 27 insertions(+), 4 deletions(-)
create mode 100644 migration/rdma.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 29fda5b..8d29bc9 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -153,10 +153,6 @@ void qemu_start_incoming_migration(const char *uri, Error **errp);
uint64_t migrate_max_downtime(void);
-void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
-
-void rdma_start_incoming_migration(const char *host_port, Error **errp);
-
void migrate_fd_error(MigrationState *s, const Error *error);
void migrate_fd_connect(MigrationState *s);
diff --git a/migration/migration.c b/migration/migration.c
index 6e11db2..3face58 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -21,6 +21,7 @@
#include "exec.h"
#include "fd.h"
#include "socket.h"
+#include "rdma.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
diff --git a/migration/rdma.c b/migration/rdma.c
index 4cb5bf8..fab30ea 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -17,6 +17,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/cutils.h"
+#include "rdma.h"
#include "migration/migration.h"
#include "qemu-file.h"
#include "exec/cpu-common.h"
diff --git a/migration/rdma.h b/migration/rdma.h
new file mode 100644
index 0000000..de2ba09
--- /dev/null
+++ b/migration/rdma.h
@@ -0,0 +1,25 @@
+/*
+ * RDMA protocol and interfaces
+ *
+ * Copyright IBM, Corp. 2010-2013
+ * Copyright Red Hat, Inc. 2015-2016
+ *
+ * Authors:
+ * Michael R. Hines <mrhines@us.ibm.com>
+ * Jiuxing Liu <jl@us.ibm.com>
+ * Daniel P. Berrange <berrange@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later. See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_MIGRATION_RDMA_H
+#define QEMU_MIGRATION_RDMA_H
+
+void rdma_start_outgoing_migration(void *opaque, const char *host_port,
+ Error **errp);
+
+void rdma_start_incoming_migration(const char *host_port, Error **errp);
+
+#endif
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c functions in its own file
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c " Juan Quintela
@ 2017-06-01 12:46 ` Dr. David Alan Gilbert
2017-06-01 15:22 ` Juan Quintela
0 siblings, 1 reply; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:46 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> include/migration/migration.h | 4 ----
> migration/migration.c | 1 +
> migration/rdma.c | 1 +
> migration/rdma.h | 25 +++++++++++++++++++++++++
> 4 files changed, 27 insertions(+), 4 deletions(-)
> create mode 100644 migration/rdma.h
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 29fda5b..8d29bc9 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -153,10 +153,6 @@ void qemu_start_incoming_migration(const char *uri, Error **errp);
>
> uint64_t migrate_max_downtime(void);
>
> -void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
> -
> -void rdma_start_incoming_migration(const char *host_port, Error **errp);
> -
> void migrate_fd_error(MigrationState *s, const Error *error);
>
> void migrate_fd_connect(MigrationState *s);
> diff --git a/migration/migration.c b/migration/migration.c
> index 6e11db2..3face58 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -21,6 +21,7 @@
> #include "exec.h"
> #include "fd.h"
> #include "socket.h"
> +#include "rdma.h"
> #include "migration/migration.h"
> #include "savevm.h"
> #include "qemu-file-channel.h"
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 4cb5bf8..fab30ea 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -17,6 +17,7 @@
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "qemu/cutils.h"
> +#include "rdma.h"
> #include "migration/migration.h"
> #include "qemu-file.h"
> #include "exec/cpu-common.h"
> diff --git a/migration/rdma.h b/migration/rdma.h
> new file mode 100644
> index 0000000..de2ba09
> --- /dev/null
> +++ b/migration/rdma.h
> @@ -0,0 +1,25 @@
> +/*
> + * RDMA protocol and interfaces
> + *
> + * Copyright IBM, Corp. 2010-2013
> + * Copyright Red Hat, Inc. 2015-2016
> + *
> + * Authors:
> + * Michael R. Hines <mrhines@us.ibm.com>
> + * Jiuxing Liu <jl@us.ibm.com>
> + * Daniel P. Berrange <berrange@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * later. See the COPYING file in the top-level directory.
> + *
> + */
Hmm, are we allowed to v2-or-later that? migration.h is v2
Dave
> +#ifndef QEMU_MIGRATION_RDMA_H
> +#define QEMU_MIGRATION_RDMA_H
> +
> +void rdma_start_outgoing_migration(void *opaque, const char *host_port,
> + Error **errp);
> +
> +void rdma_start_incoming_migration(const char *host_port, Error **errp);
> +
> +#endif
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c functions in its own file
2017-06-01 12:46 ` Dr. David Alan Gilbert
@ 2017-06-01 15:22 ` Juan Quintela
2017-06-01 15:51 ` Dr. David Alan Gilbert
0 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-06-01 15:22 UTC (permalink / raw)
To: Dr. David Alan Gilbert; +Cc: qemu-devel, lvivier, peterx
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> * Juan Quintela (quintela@redhat.com) wrote:
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>> include/migration/migration.h | 4 ----
>> migration/migration.c | 1 +
>> migration/rdma.c | 1 +
>> migration/rdma.h | 25 +++++++++++++++++++++++++
>> 4 files changed, 27 insertions(+), 4 deletions(-)
>> create mode 100644 migration/rdma.h
>>
>> diff --git a/include/migration/migration.h b/include/migration/migration.h
>> index 29fda5b..8d29bc9 100644
>> --- a/include/migration/migration.h
>> +++ b/include/migration/migration.h
>> @@ -153,10 +153,6 @@ void qemu_start_incoming_migration(const char
>> *uri, Error **errp);
>>
>> uint64_t migrate_max_downtime(void);
>>
>> -void rdma_start_outgoing_migration(void *opaque, const char
>> *host_port, Error **errp);
>> -
>> -void rdma_start_incoming_migration(const char *host_port, Error **errp);
>> -
>> void migrate_fd_error(MigrationState *s, const Error *error);
>>
>> void migrate_fd_connect(MigrationState *s);
>> diff --git a/migration/migration.c b/migration/migration.c
>> index 6e11db2..3face58 100644
>> --- a/migration/migration.c
>> +++ b/migration/migration.c
>> @@ -21,6 +21,7 @@
>> #include "exec.h"
>> #include "fd.h"
>> #include "socket.h"
>> +#include "rdma.h"
>> #include "migration/migration.h"
>> #include "savevm.h"
>> #include "qemu-file-channel.h"
>> diff --git a/migration/rdma.c b/migration/rdma.c
>> index 4cb5bf8..fab30ea 100644
>> --- a/migration/rdma.c
>> +++ b/migration/rdma.c
>> @@ -17,6 +17,7 @@
>> #include "qapi/error.h"
>> #include "qemu-common.h"
>> #include "qemu/cutils.h"
>> +#include "rdma.h"
>> #include "migration/migration.h"
>> #include "qemu-file.h"
>> #include "exec/cpu-common.h"
>> diff --git a/migration/rdma.h b/migration/rdma.h
>> new file mode 100644
>> index 0000000..de2ba09
>> --- /dev/null
>> +++ b/migration/rdma.h
>> @@ -0,0 +1,25 @@
>> +/*
>> + * RDMA protocol and interfaces
>> + *
>> + * Copyright IBM, Corp. 2010-2013
>> + * Copyright Red Hat, Inc. 2015-2016
>> + *
>> + * Authors:
>> + * Michael R. Hines <mrhines@us.ibm.com>
>> + * Jiuxing Liu <jl@us.ibm.com>
>> + * Daniel P. Berrange <berrange@redhat.com>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or
>> + * later. See the COPYING file in the top-level directory.
>> + *
>> + */
>
> Hmm, are we allowed to v2-or-later that? migration.h is v2
That is the header file of rdma.c
And we only have two functions exported from that file, so I think that
it is a safe assumption that they are covered by that copyright.
Later, Juan.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c functions in its own file
2017-06-01 15:22 ` Juan Quintela
@ 2017-06-01 15:51 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 15:51 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> "Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> > * Juan Quintela (quintela@redhat.com) wrote:
> >> Signed-off-by: Juan Quintela <quintela@redhat.com>
> >> ---
> >> include/migration/migration.h | 4 ----
> >> migration/migration.c | 1 +
> >> migration/rdma.c | 1 +
> >> migration/rdma.h | 25 +++++++++++++++++++++++++
> >> 4 files changed, 27 insertions(+), 4 deletions(-)
> >> create mode 100644 migration/rdma.h
> >>
> >> diff --git a/include/migration/migration.h b/include/migration/migration.h
> >> index 29fda5b..8d29bc9 100644
> >> --- a/include/migration/migration.h
> >> +++ b/include/migration/migration.h
> >> @@ -153,10 +153,6 @@ void qemu_start_incoming_migration(const char
> >> *uri, Error **errp);
> >>
> >> uint64_t migrate_max_downtime(void);
> >>
> >> -void rdma_start_outgoing_migration(void *opaque, const char
> >> *host_port, Error **errp);
> >> -
> >> -void rdma_start_incoming_migration(const char *host_port, Error **errp);
> >> -
> >> void migrate_fd_error(MigrationState *s, const Error *error);
> >>
> >> void migrate_fd_connect(MigrationState *s);
> >> diff --git a/migration/migration.c b/migration/migration.c
> >> index 6e11db2..3face58 100644
> >> --- a/migration/migration.c
> >> +++ b/migration/migration.c
> >> @@ -21,6 +21,7 @@
> >> #include "exec.h"
> >> #include "fd.h"
> >> #include "socket.h"
> >> +#include "rdma.h"
> >> #include "migration/migration.h"
> >> #include "savevm.h"
> >> #include "qemu-file-channel.h"
> >> diff --git a/migration/rdma.c b/migration/rdma.c
> >> index 4cb5bf8..fab30ea 100644
> >> --- a/migration/rdma.c
> >> +++ b/migration/rdma.c
> >> @@ -17,6 +17,7 @@
> >> #include "qapi/error.h"
> >> #include "qemu-common.h"
> >> #include "qemu/cutils.h"
> >> +#include "rdma.h"
> >> #include "migration/migration.h"
> >> #include "qemu-file.h"
> >> #include "exec/cpu-common.h"
> >> diff --git a/migration/rdma.h b/migration/rdma.h
> >> new file mode 100644
> >> index 0000000..de2ba09
> >> --- /dev/null
> >> +++ b/migration/rdma.h
> >> @@ -0,0 +1,25 @@
> >> +/*
> >> + * RDMA protocol and interfaces
> >> + *
> >> + * Copyright IBM, Corp. 2010-2013
> >> + * Copyright Red Hat, Inc. 2015-2016
> >> + *
> >> + * Authors:
> >> + * Michael R. Hines <mrhines@us.ibm.com>
> >> + * Jiuxing Liu <jl@us.ibm.com>
> >> + * Daniel P. Berrange <berrange@redhat.com>
> >> + *
> >> + * This work is licensed under the terms of the GNU GPL, version 2 or
> >> + * later. See the COPYING file in the top-level directory.
> >> + *
> >> + */
> >
> > Hmm, are we allowed to v2-or-later that? migration.h is v2
>
> That is the header file of rdma.c
>
> And we only have two functions exported from that file, so I think that
> it is a safe assumption that they are covered by that copyright.
OK, that's fair:
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Later, Juan.
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 08/10] migration: Create include for migration snapshots
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (6 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c " Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:43 ` Dr. David Alan Gilbert
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 09/10] migration: Export ram.c functions in its own file Juan Quintela
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 10/10] migration: Move include/migration/block.h into migration/ Juan Quintela
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Start removing migration code from sysemu/sysemu.h.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
hmp.c | 5 +++--
include/block/block_int.h | 4 ++--
include/migration/snapshot.h | 21 +++++++++++++++++++++
include/sysemu/sysemu.h | 3 ---
migration/savevm.c | 5 +++--
replay/replay-snapshot.c | 5 +++--
vl.c | 3 ++-
7 files changed, 34 insertions(+), 12 deletions(-)
create mode 100644 include/migration/snapshot.h
diff --git a/hmp.c b/hmp.c
index 20f5dab..ad72390 100644
--- a/hmp.c
+++ b/hmp.c
@@ -42,6 +42,7 @@
#include "qemu/error-report.h"
#include "exec/ramlist.h"
#include "hw/intc/intc.h"
+#include "migration/snapshot.h"
#ifdef CONFIG_SPICE
#include <spice/enums.h>
@@ -1284,7 +1285,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)
vm_stop(RUN_STATE_RESTORE_VM);
- if (load_vmstate(name, &err) == 0 && saved_vm_running) {
+ if (load_snapshot(name, &err) == 0 && saved_vm_running) {
vm_start();
}
hmp_handle_error(mon, &err);
@@ -1294,7 +1295,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
- save_vmstate(qdict_get_try_str(qdict, "name"), &err);
+ save_snapshot(qdict_get_try_str(qdict, "name"), &err);
hmp_handle_error(mon, &err);
}
diff --git a/include/block/block_int.h b/include/block/block_int.h
index e5eb473..cb78c4f 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -601,8 +601,8 @@ struct BlockDriverState {
int copy_on_read;
/* If we are reading a disk image, give its size in sectors.
- * Generally read-only; it is written to by load_vmstate and save_vmstate,
- * but the block layer is quiescent during those.
+ * Generally read-only; it is written to by load_snapshot and
+ * save_snaphost, but the block layer is quiescent during those.
*/
int64_t total_sectors;
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
new file mode 100644
index 0000000..c85b6ec
--- /dev/null
+++ b/include/migration/snapshot.h
@@ -0,0 +1,21 @@
+/*
+ * QEMU snapshots
+ *
+ * Copyright (c) 2004-2008 Fabrice Bellard
+ * Copyright (c) 2009-2015 Red Hat Inc
+ *
+ * Authors:
+ * Juan Quintela <quintela@redhat.com>
+ *
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef QEMU_MIGRATION_SNAPSHOT_H
+#define QEMU_MIGRATION_SNAPSHOT_H
+
+int save_snapshot(const char *name, Error **errp);
+int load_snapshot(const char *name, Error **errp);
+
+#endif
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 723c8dc..9841a52 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -92,9 +92,6 @@ void qemu_remove_exit_notifier(Notifier *notify);
void qemu_add_machine_init_done_notifier(Notifier *notify);
void qemu_remove_machine_init_done_notifier(Notifier *notify);
-int save_vmstate(const char *name, Error **errp);
-int load_vmstate(const char *name, Error **errp);
-
void qemu_announce_self(void);
extern int autostart;
diff --git a/migration/savevm.c b/migration/savevm.c
index bb3f9ec..f2664f3 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -35,6 +35,7 @@
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "migration/migration.h"
+#include "migration/snapshot.h"
#include "qemu-file-channel.h"
#include "qemu-file.h"
#include "savevm.h"
@@ -2067,7 +2068,7 @@ int qemu_loadvm_state(QEMUFile *f)
return ret;
}
-int save_vmstate(const char *name, Error **errp)
+int save_snapshot(const char *name, Error **errp)
{
BlockDriverState *bs, *bs1;
QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
@@ -2224,7 +2225,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)
migration_incoming_state_destroy();
}
-int load_vmstate(const char *name, Error **errp)
+int load_snapshot(const char *name, Error **errp)
{
BlockDriverState *bs, *bs_vm_state;
QEMUSnapshotInfo sn;
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index c75cd38..a4ded29 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -19,6 +19,7 @@
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h"
#include "migration/vmstate.h"
+#include "migration/snapshot.h"
static void replay_pre_save(void *opaque)
{
@@ -66,13 +67,13 @@ void replay_vmstate_init(void)
if (replay_snapshot) {
if (replay_mode == REPLAY_MODE_RECORD) {
- if (save_vmstate(replay_snapshot, &err) != 0) {
+ if (save_snapshot(replay_snapshot, &err) != 0) {
error_report_err(err);
error_report("Could not create snapshot for icount record");
exit(1);
}
} else if (replay_mode == REPLAY_MODE_PLAY) {
- if (load_vmstate(replay_snapshot, &err) != 0) {
+ if (load_snapshot(replay_snapshot, &err) != 0) {
error_report_err(err);
error_report("Could not load snapshot for icount replay");
exit(1);
diff --git a/vl.c b/vl.c
index 993690d..86f6c71 100644
--- a/vl.c
+++ b/vl.c
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "migration/block.h"
+#include "migration/snapshot.h"
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
#include "hw/audio/soundhw.h"
@@ -4722,7 +4723,7 @@ int main(int argc, char **argv, char **envp)
replay_vmstate_init();
} else if (loadvm) {
Error *local_err = NULL;
- if (load_vmstate(loadvm, &local_err) < 0) {
+ if (load_snapshot(loadvm, &local_err) < 0) {
error_report_err(local_err);
autostart = 0;
}
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 08/10] migration: Create include for migration snapshots
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 08/10] migration: Create include for migration snapshots Juan Quintela
@ 2017-06-01 12:43 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:43 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> Start removing migration code from sysemu/sysemu.h.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Yes, the names always confused me.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hmp.c | 5 +++--
> include/block/block_int.h | 4 ++--
> include/migration/snapshot.h | 21 +++++++++++++++++++++
> include/sysemu/sysemu.h | 3 ---
> migration/savevm.c | 5 +++--
> replay/replay-snapshot.c | 5 +++--
> vl.c | 3 ++-
> 7 files changed, 34 insertions(+), 12 deletions(-)
> create mode 100644 include/migration/snapshot.h
>
> diff --git a/hmp.c b/hmp.c
> index 20f5dab..ad72390 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -42,6 +42,7 @@
> #include "qemu/error-report.h"
> #include "exec/ramlist.h"
> #include "hw/intc/intc.h"
> +#include "migration/snapshot.h"
>
> #ifdef CONFIG_SPICE
> #include <spice/enums.h>
> @@ -1284,7 +1285,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)
>
> vm_stop(RUN_STATE_RESTORE_VM);
>
> - if (load_vmstate(name, &err) == 0 && saved_vm_running) {
> + if (load_snapshot(name, &err) == 0 && saved_vm_running) {
> vm_start();
> }
> hmp_handle_error(mon, &err);
> @@ -1294,7 +1295,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
> {
> Error *err = NULL;
>
> - save_vmstate(qdict_get_try_str(qdict, "name"), &err);
> + save_snapshot(qdict_get_try_str(qdict, "name"), &err);
> hmp_handle_error(mon, &err);
> }
>
> diff --git a/include/block/block_int.h b/include/block/block_int.h
> index e5eb473..cb78c4f 100644
> --- a/include/block/block_int.h
> +++ b/include/block/block_int.h
> @@ -601,8 +601,8 @@ struct BlockDriverState {
> int copy_on_read;
>
> /* If we are reading a disk image, give its size in sectors.
> - * Generally read-only; it is written to by load_vmstate and save_vmstate,
> - * but the block layer is quiescent during those.
> + * Generally read-only; it is written to by load_snapshot and
> + * save_snaphost, but the block layer is quiescent during those.
> */
> int64_t total_sectors;
>
> diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
> new file mode 100644
> index 0000000..c85b6ec
> --- /dev/null
> +++ b/include/migration/snapshot.h
> @@ -0,0 +1,21 @@
> +/*
> + * QEMU snapshots
> + *
> + * Copyright (c) 2004-2008 Fabrice Bellard
> + * Copyright (c) 2009-2015 Red Hat Inc
> + *
> + * Authors:
> + * Juan Quintela <quintela@redhat.com>
> + *
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef QEMU_MIGRATION_SNAPSHOT_H
> +#define QEMU_MIGRATION_SNAPSHOT_H
> +
> +int save_snapshot(const char *name, Error **errp);
> +int load_snapshot(const char *name, Error **errp);
> +
> +#endif
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index 723c8dc..9841a52 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -92,9 +92,6 @@ void qemu_remove_exit_notifier(Notifier *notify);
> void qemu_add_machine_init_done_notifier(Notifier *notify);
> void qemu_remove_machine_init_done_notifier(Notifier *notify);
>
> -int save_vmstate(const char *name, Error **errp);
> -int load_vmstate(const char *name, Error **errp);
> -
> void qemu_announce_self(void);
>
> extern int autostart;
> diff --git a/migration/savevm.c b/migration/savevm.c
> index bb3f9ec..f2664f3 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -35,6 +35,7 @@
> #include "sysemu/sysemu.h"
> #include "qemu/timer.h"
> #include "migration/migration.h"
> +#include "migration/snapshot.h"
> #include "qemu-file-channel.h"
> #include "qemu-file.h"
> #include "savevm.h"
> @@ -2067,7 +2068,7 @@ int qemu_loadvm_state(QEMUFile *f)
> return ret;
> }
>
> -int save_vmstate(const char *name, Error **errp)
> +int save_snapshot(const char *name, Error **errp)
> {
> BlockDriverState *bs, *bs1;
> QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
> @@ -2224,7 +2225,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)
> migration_incoming_state_destroy();
> }
>
> -int load_vmstate(const char *name, Error **errp)
> +int load_snapshot(const char *name, Error **errp)
> {
> BlockDriverState *bs, *bs_vm_state;
> QEMUSnapshotInfo sn;
> diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
> index c75cd38..a4ded29 100644
> --- a/replay/replay-snapshot.c
> +++ b/replay/replay-snapshot.c
> @@ -19,6 +19,7 @@
> #include "qapi/qmp/qstring.h"
> #include "qemu/error-report.h"
> #include "migration/vmstate.h"
> +#include "migration/snapshot.h"
>
> static void replay_pre_save(void *opaque)
> {
> @@ -66,13 +67,13 @@ void replay_vmstate_init(void)
>
> if (replay_snapshot) {
> if (replay_mode == REPLAY_MODE_RECORD) {
> - if (save_vmstate(replay_snapshot, &err) != 0) {
> + if (save_snapshot(replay_snapshot, &err) != 0) {
> error_report_err(err);
> error_report("Could not create snapshot for icount record");
> exit(1);
> }
> } else if (replay_mode == REPLAY_MODE_PLAY) {
> - if (load_vmstate(replay_snapshot, &err) != 0) {
> + if (load_snapshot(replay_snapshot, &err) != 0) {
> error_report_err(err);
> error_report("Could not load snapshot for icount replay");
> exit(1);
> diff --git a/vl.c b/vl.c
> index 993690d..86f6c71 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -87,6 +87,7 @@ int main(int argc, char **argv)
> #include "sysemu/blockdev.h"
> #include "hw/block/block.h"
> #include "migration/block.h"
> +#include "migration/snapshot.h"
> #include "sysemu/tpm.h"
> #include "sysemu/dma.h"
> #include "hw/audio/soundhw.h"
> @@ -4722,7 +4723,7 @@ int main(int argc, char **argv, char **envp)
> replay_vmstate_init();
> } else if (loadvm) {
> Error *local_err = NULL;
> - if (load_vmstate(loadvm, &local_err) < 0) {
> + if (load_snapshot(loadvm, &local_err) < 0) {
> error_report_err(local_err);
> autostart = 0;
> }
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread
* [Qemu-devel] [PATCH v2 09/10] migration: Export ram.c functions in its own file
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (7 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 08/10] migration: Create include for migration snapshots Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 10/10] migration: Move include/migration/block.h into migration/ Juan Quintela
9 siblings, 0 replies; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
All functions are internal except for ram_mig_init(). Create
migration/misc.h for this kind of functions.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
include/migration/migration.h | 38 -----------------------
include/migration/misc.h | 21 +++++++++++++
migration/migration.c | 1 +
migration/postcopy-ram.c | 1 +
migration/ram.c | 2 ++
migration/ram.h | 70 +++++++++++++++++++++++++++++++++++++++++++
migration/rdma.c | 2 +-
migration/savevm.c | 1 +
vl.c | 1 +
9 files changed, 98 insertions(+), 39 deletions(-)
create mode 100644 include/migration/misc.h
create mode 100644 migration/ram.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 8d29bc9..79b5484 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -171,38 +171,6 @@ bool migration_in_postcopy(void);
bool migration_in_postcopy_after_devices(MigrationState *);
MigrationState *migrate_get_current(void);
-void migrate_compress_threads_create(void);
-void migrate_compress_threads_join(void);
-void migrate_decompress_threads_create(void);
-void migrate_decompress_threads_join(void);
-uint64_t ram_bytes_remaining(void);
-uint64_t ram_bytes_transferred(void);
-uint64_t ram_bytes_total(void);
-uint64_t ram_dirty_sync_count(void);
-uint64_t ram_dirty_pages_rate(void);
-uint64_t ram_postcopy_requests(void);
-void free_xbzrle_decoded_buf(void);
-
-void acct_update_position(QEMUFile *f, size_t size, bool zero);
-
-uint64_t dup_mig_pages_transferred(void);
-uint64_t norm_mig_pages_transferred(void);
-uint64_t xbzrle_mig_bytes_transferred(void);
-uint64_t xbzrle_mig_pages_transferred(void);
-uint64_t xbzrle_mig_pages_overflow(void);
-uint64_t xbzrle_mig_pages_cache_miss(void);
-double xbzrle_mig_cache_miss_rate(void);
-
-void ram_handle_compressed(void *host, uint8_t ch, uint64_t size);
-void ram_debug_dump_bitmap(unsigned long *todump, bool expected,
- unsigned long pages);
-/* For outgoing discard bitmap */
-int ram_postcopy_send_discard_bitmap(MigrationState *ms);
-/* For incoming postcopy discard */
-int ram_discard_range(const char *block_name, uint64_t start, size_t length);
-int ram_postcopy_incoming_init(MigrationIncomingState *mis);
-void ram_postcopy_migrated_memory_release(MigrationState *ms);
-
bool migrate_release_ram(void);
bool migrate_postcopy_ram(void);
bool migrate_zero_blocks(void);
@@ -213,8 +181,6 @@ int migrate_use_xbzrle(void);
int64_t migrate_xbzrle_cache_size(void);
bool migrate_colo_enabled(void);
-int64_t xbzrle_cache_resize(int64_t new_size);
-
bool migrate_use_block(void);
bool migrate_use_block_incremental(void);
@@ -253,7 +219,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
ram_addr_t offset, size_t size,
uint64_t *bytes_sent);
-void ram_mig_init(void);
void savevm_skip_section_footers(void);
void register_global_state(void);
void global_state_set_optional(void);
@@ -261,7 +226,4 @@ void savevm_skip_configuration(void);
int global_state_store(void);
void global_state_store_running(void);
-void migration_page_queue_free(void);
-int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
-uint64_t ram_pagesize_summary(void);
#endif
diff --git a/include/migration/misc.h b/include/migration/misc.h
new file mode 100644
index 0000000..0b37714
--- /dev/null
+++ b/include/migration/misc.h
@@ -0,0 +1,21 @@
+/*
+ * QEMU migration miscellaneus exported functions
+ *
+ * Copyright IBM, Corp. 2008
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef MIGRATION_MISC_H
+#define MIGRATION_MISC_H
+
+/* migration/ram.c */
+
+void ram_mig_init(void);
+
+#endif
diff --git a/migration/migration.c b/migration/migration.c
index 3face58..1399c4b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -22,6 +22,7 @@
#include "fd.h"
#include "socket.h"
#include "rdma.h"
+#include "ram.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 6f239f9..230b5dc 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -24,6 +24,7 @@
#include "qemu-file.h"
#include "savevm.h"
#include "postcopy-ram.h"
+#include "ram.h"
#include "sysemu/sysemu.h"
#include "sysemu/balloon.h"
#include "qemu/error-report.h"
diff --git a/migration/ram.c b/migration/ram.c
index 390f714..f387e9c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -36,7 +36,9 @@
#include "qemu/timer.h"
#include "qemu/main-loop.h"
#include "xbzrle.h"
+#include "ram.h"
#include "migration/migration.h"
+#include "migration/misc.h"
#include "qemu-file.h"
#include "migration/vmstate.h"
#include "postcopy-ram.h"
diff --git a/migration/ram.h b/migration/ram.h
new file mode 100644
index 0000000..c9563d1
--- /dev/null
+++ b/migration/ram.h
@@ -0,0 +1,70 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright (c) 2011-2015 Red Hat Inc
+ *
+ * Authors:
+ * Juan Quintela <quintela@redhat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef QEMU_MIGRATION_RAM_H
+#define QEMU_MIGRATION_RAM_H
+
+#include "qemu-common.h"
+#include "exec/cpu-common.h"
+
+int64_t xbzrle_cache_resize(int64_t new_size);
+uint64_t dup_mig_pages_transferred(void);
+uint64_t norm_mig_pages_transferred(void);
+uint64_t xbzrle_mig_bytes_transferred(void);
+uint64_t xbzrle_mig_pages_transferred(void);
+uint64_t xbzrle_mig_pages_cache_miss(void);
+double xbzrle_mig_cache_miss_rate(void);
+uint64_t xbzrle_mig_pages_overflow(void);
+uint64_t ram_bytes_transferred(void);
+uint64_t ram_bytes_remaining(void);
+uint64_t ram_dirty_sync_count(void);
+uint64_t ram_dirty_pages_rate(void);
+uint64_t ram_postcopy_requests(void);
+uint64_t ram_bytes_total(void);
+
+void migrate_compress_threads_create(void);
+void migrate_compress_threads_join(void);
+void migrate_decompress_threads_create(void);
+void migrate_decompress_threads_join(void);
+
+uint64_t ram_pagesize_summary(void);
+void migration_page_queue_free(void);
+int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
+void acct_update_position(QEMUFile *f, size_t size, bool zero);
+void free_xbzrle_decoded_buf(void);
+void ram_debug_dump_bitmap(unsigned long *todump, bool expected,
+ unsigned long pages);
+void ram_postcopy_migrated_memory_release(MigrationState *ms);
+/* For outgoing discard bitmap */
+int ram_postcopy_send_discard_bitmap(MigrationState *ms);
+/* For incoming postcopy discard */
+int ram_discard_range(const char *block_name, uint64_t start, size_t length);
+int ram_postcopy_incoming_init(MigrationIncomingState *mis);
+
+void ram_handle_compressed(void *host, uint8_t ch, uint64_t size);
+#endif
diff --git a/migration/rdma.c b/migration/rdma.c
index fab30ea..e446c6f 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -20,7 +20,7 @@
#include "rdma.h"
#include "migration/migration.h"
#include "qemu-file.h"
-#include "exec/cpu-common.h"
+#include "ram.h"
#include "qemu-file-channel.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index f2664f3..9c320f5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -36,6 +36,7 @@
#include "qemu/timer.h"
#include "migration/migration.h"
#include "migration/snapshot.h"
+#include "ram.h"
#include "qemu-file-channel.h"
#include "qemu-file.h"
#include "savevm.h"
diff --git a/vl.c b/vl.c
index 86f6c71..13deeba 100644
--- a/vl.c
+++ b/vl.c
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "migration/block.h"
+#include "migration/misc.h"
#include "migration/snapshot.h"
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [Qemu-devel] [PATCH v2 10/10] migration: Move include/migration/block.h into migration/
2017-05-31 10:34 [Qemu-devel] [PATCH v2 00/10] Another cleanup of includes Juan Quintela
` (8 preceding siblings ...)
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 09/10] migration: Export ram.c functions in its own file Juan Quintela
@ 2017-05-31 10:35 ` Juan Quintela
2017-06-01 12:44 ` Dr. David Alan Gilbert
9 siblings, 1 reply; 26+ messages in thread
From: Juan Quintela @ 2017-05-31 10:35 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
All functions were internal, except blk_mig_init() that is exported in
misc.h now.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
include/migration/misc.h | 8 ++++++++
migration/block.c | 3 ++-
{include/migration => migration}/block.h | 2 --
migration/colo.c | 2 +-
migration/migration.c | 2 +-
vl.c | 1 -
6 files changed, 12 insertions(+), 6 deletions(-)
rename {include/migration => migration}/block.h (93%)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 0b37714..d7892b7 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -18,4 +18,12 @@
void ram_mig_init(void);
+/* migration/block.c */
+
+#ifdef CONFIG_LIVE_BLOCK_MIGRATION
+void blk_mig_init(void);
+#else
+static inline void blk_mig_init(void) {}
+#endif
+
#endif
diff --git a/migration/block.c b/migration/block.c
index 3e27499..4d8c2e9 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -23,7 +23,8 @@
#include "qemu/cutils.h"
#include "qemu/queue.h"
#include "qemu/timer.h"
-#include "migration/block.h"
+#include "block.h"
+#include "migration/misc.h"
#include "migration/migration.h"
#include "sysemu/blockdev.h"
#include "qemu-file.h"
diff --git a/include/migration/block.h b/migration/block.h
similarity index 93%
rename from include/migration/block.h
rename to migration/block.h
index 28cff53..22ebe94 100644
--- a/include/migration/block.h
+++ b/migration/block.h
@@ -15,14 +15,12 @@
#define MIGRATION_BLOCK_H
#ifdef CONFIG_LIVE_BLOCK_MIGRATION
-void blk_mig_init(void);
int blk_mig_active(void);
uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void);
#else
-static inline void blk_mig_init(void) { }
static inline int blk_mig_active(void)
{
return false;
diff --git a/migration/colo.c b/migration/colo.c
index 4f1f3b8..111b715 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -18,7 +18,7 @@
#include "qemu-file.h"
#include "savevm.h"
#include "migration/colo.h"
-#include "migration/block.h"
+#include "block.h"
#include "io/channel-buffer.h"
#include "trace.h"
#include "qemu/error-report.h"
diff --git a/migration/migration.c b/migration/migration.c
index 1399c4b..bdd3f16 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -34,7 +34,7 @@
#include "qapi/util.h"
#include "qemu/sockets.h"
#include "qemu/rcu.h"
-#include "migration/block.h"
+#include "block.h"
#include "postcopy-ram.h"
#include "qemu/thread.h"
#include "qmp-commands.h"
diff --git a/vl.c b/vl.c
index 13deeba..80b86c0 100644
--- a/vl.c
+++ b/vl.c
@@ -86,7 +86,6 @@ int main(int argc, char **argv)
#include "qemu/log.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
-#include "migration/block.h"
#include "migration/misc.h"
#include "migration/snapshot.h"
#include "sysemu/tpm.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [Qemu-devel] [PATCH v2 10/10] migration: Move include/migration/block.h into migration/
2017-05-31 10:35 ` [Qemu-devel] [PATCH v2 10/10] migration: Move include/migration/block.h into migration/ Juan Quintela
@ 2017-06-01 12:44 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 26+ messages in thread
From: Dr. David Alan Gilbert @ 2017-06-01 12:44 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, lvivier, peterx
* Juan Quintela (quintela@redhat.com) wrote:
> All functions were internal, except blk_mig_init() that is exported in
> misc.h now.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> include/migration/misc.h | 8 ++++++++
> migration/block.c | 3 ++-
> {include/migration => migration}/block.h | 2 --
> migration/colo.c | 2 +-
> migration/migration.c | 2 +-
> vl.c | 1 -
> 6 files changed, 12 insertions(+), 6 deletions(-)
> rename {include/migration => migration}/block.h (93%)
>
> diff --git a/include/migration/misc.h b/include/migration/misc.h
> index 0b37714..d7892b7 100644
> --- a/include/migration/misc.h
> +++ b/include/migration/misc.h
> @@ -18,4 +18,12 @@
>
> void ram_mig_init(void);
>
> +/* migration/block.c */
> +
> +#ifdef CONFIG_LIVE_BLOCK_MIGRATION
> +void blk_mig_init(void);
> +#else
> +static inline void blk_mig_init(void) {}
> +#endif
> +
> #endif
> diff --git a/migration/block.c b/migration/block.c
> index 3e27499..4d8c2e9 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -23,7 +23,8 @@
> #include "qemu/cutils.h"
> #include "qemu/queue.h"
> #include "qemu/timer.h"
> -#include "migration/block.h"
> +#include "block.h"
> +#include "migration/misc.h"
> #include "migration/migration.h"
> #include "sysemu/blockdev.h"
> #include "qemu-file.h"
> diff --git a/include/migration/block.h b/migration/block.h
> similarity index 93%
> rename from include/migration/block.h
> rename to migration/block.h
> index 28cff53..22ebe94 100644
> --- a/include/migration/block.h
> +++ b/migration/block.h
> @@ -15,14 +15,12 @@
> #define MIGRATION_BLOCK_H
>
> #ifdef CONFIG_LIVE_BLOCK_MIGRATION
> -void blk_mig_init(void);
> int blk_mig_active(void);
> uint64_t blk_mig_bytes_transferred(void);
> uint64_t blk_mig_bytes_remaining(void);
> uint64_t blk_mig_bytes_total(void);
>
> #else
> -static inline void blk_mig_init(void) { }
> static inline int blk_mig_active(void)
> {
> return false;
> diff --git a/migration/colo.c b/migration/colo.c
> index 4f1f3b8..111b715 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -18,7 +18,7 @@
> #include "qemu-file.h"
> #include "savevm.h"
> #include "migration/colo.h"
> -#include "migration/block.h"
> +#include "block.h"
> #include "io/channel-buffer.h"
> #include "trace.h"
> #include "qemu/error-report.h"
> diff --git a/migration/migration.c b/migration/migration.c
> index 1399c4b..bdd3f16 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -34,7 +34,7 @@
> #include "qapi/util.h"
> #include "qemu/sockets.h"
> #include "qemu/rcu.h"
> -#include "migration/block.h"
> +#include "block.h"
> #include "postcopy-ram.h"
> #include "qemu/thread.h"
> #include "qmp-commands.h"
> diff --git a/vl.c b/vl.c
> index 13deeba..80b86c0 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -86,7 +86,6 @@ int main(int argc, char **argv)
> #include "qemu/log.h"
> #include "sysemu/blockdev.h"
> #include "hw/block/block.h"
> -#include "migration/block.h"
> #include "migration/misc.h"
> #include "migration/snapshot.h"
> #include "sysemu/tpm.h"
> --
> 2.9.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 26+ messages in thread