[Qemu-stable] [Qemu-devel] [PATCH 3/3] Header cleanups Moved the qemu-hexdump declaration from qemu-common.h to qemu/hexdump.h

[Aruna Jayasena]

Qemu-hexdump declaration was moved from qemu-common.h to qemu/hexdump.h

Signed-off-by: Aruna Jayasena <address@hidden>

---
 hw/dma/pl330.c        | 1 +
 hw/dma/xlnx_dpdma.c   | 1 +
 include/qemu-common.h | 6 ------
 net/colo-compare.c    | 2 +-
 util/hexdump.c        | 2 +-
 util/iov.c            | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index d071049233..6f7c79324d 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -20,6 +20,7 @@
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/hexdump.h"
 
 #ifndef PL330_ERR_DEBUG
 #define PL330_ERR_DEBUG 0
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index 077c7da9cc..c937384b54 100644
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/dma/xlnx_dpdma.h"
+#include "qemu/hexdump.h"
 
 #ifndef DEBUG_DPDMA
 #define DEBUG_DPDMA 0
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 0066e45a6b..bdd65914b8 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -130,12 +130,6 @@ int os_parse_cmd_args(int index, const char *optarg);
 
 #include "qemu/module.h"
 
-/*
- * Hexdump a buffer to a file. An optional string prefix is added to every line
- */
-
-void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
-
 /*
  * helper to parse debug environment variables
  */
diff --git a/net/colo-compare.c b/net/colo-compare.c
index bf10526f05..f654ee5713 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "qemu-common.h"
 #include "qapi/error.h"
 #include "net/net.h"
 #include "net/eth.h"
@@ -31,6 +30,7 @@
 #include "migration/colo.h"
 #include "migration/migration.h"
 #include "util.h"
+#include "qemu/hexdump.h"
 
 #define TYPE_COLO_COMPARE "colo-compare"
 #define COLO_COMPARE(obj) \
diff --git a/util/hexdump.c b/util/hexdump.c
index f879ff0ad6..4917696a08 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/hexdump.h"
 
 void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
 {
diff --git a/util/iov.c b/util/iov.c
index 2f960fc38d..1293f7ad22 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -18,7 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
-#include "qemu-common.h"
+#include "qemu/hexdump.h"
 #include "qemu/sockets.h"
 #include "qemu/cutils.h"
 
-- 
2.17.1