5:55 a.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/parallels/parallels_utils.h | 2 +-
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_monitor.h | 2 +-
src/qemu/qemu_monitor_json.c | 2 +-
src/rpc/virnetserver.h | 2 +-
src/rpc/virnetserverclient.h | 2 +-
src/rpc/virnetsocket.h | 2 +-
src/util/{json.c => virjson.c} | 2 +-
src/util/{json.h => virjson.h} | 0
src/util/virlockspace.h | 2 +-
tests/jsontest.c | 2 +-
tools/virsh-host.c | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/util/{json.c => virjson.c} (99%)
rename src/util/{json.h => virjson.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d16d44..e39a4ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/json.c
src/util/pci.c
src/util/processinfo.c
src/util/sexpr.c
@@ -161,6 +160,7 @@ src/util/virhash.c
src/util/virhook.c
src/util/virinitctl.c
src/util/viriptables.c
+src/util/virjson.c
src/util/virkeyfile.c
src/util/virlockspace.c
src/util/virnetdev.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d8f20f0..d0c391e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
# These files are not related to driver APIs. Simply generic
# helper APIs for various purposes
UTIL_SOURCES = \
- util/json.c util/json.h \
util/logging.c util/logging.h \
util/memory.c util/memory.h \
util/pci.c util/pci.h \
@@ -85,6 +84,7 @@ UTIL_SOURCES = \
util/virhook.c util/virhook.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/viriptables.c util/viriptables.h \
+ util/virjson.c util/virjson.h \
util/virobject.c util/virobject.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index e47ff76..b032882 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -27,7 +27,7 @@
#include "vircommand.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "json.h"
+#include "virjson.h"
#include "parallels_utils.h"
diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
index 0010f85..7c31707 100644
--- a/src/parallels/parallels_utils.h
+++ b/src/parallels/parallels_utils.h
@@ -29,7 +29,7 @@
# include "conf/storage_conf.h"
# include "conf/domain_event.h"
# include "conf/network_conf.h"
-# include "json.h"
+# include "virjson.h"
# define parallelsParseError() \
virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 893f7f2..6727294 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -37,7 +37,7 @@
#include "memory.h"
#include "logging.h"
#include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
#include "virfile.h"
#include "virprocess.h"
#include "virtime.h"
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8c42b12..d7faa90 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -30,7 +30,7 @@
# include "domain_conf.h"
# include "virbitmap.h"
# include "virhash.h"
-# include "json.h"
+# include "virjson.h"
# include "device_conf.h"
typedef struct _qemuMonitor qemuMonitor;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0cd66b6..6181668 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -40,7 +40,7 @@
#include "driver.h"
#include "datatypes.h"
#include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
#ifdef WITH_DTRACE_PROBES
# include "libvirt_qemu_probes.h"
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 38cccfe..da7dc9e 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -31,7 +31,7 @@
# include "virnetserverclient.h"
# include "virnetserverservice.h"
# include "virobject.h"
-# include "json.h"
+# include "virjson.h"
virNetServerPtr virNetServerNew(size_t min_workers,
size_t max_workers,
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 041ffde..65084e2 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -27,7 +27,7 @@
# include "virnetsocket.h"
# include "virnetmessage.h"
# include "virobject.h"
-# include "json.h"
+# include "virjson.h"
typedef struct _virNetServerClient virNetServerClient;
typedef virNetServerClient *virNetServerClientPtr;
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index fcd54dd..7016c09 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -31,7 +31,7 @@
# ifdef HAVE_SASL
# include "virnetsaslcontext.h"
# endif
-# include "json.h"
+# include "virjson.h"
typedef struct _virNetSocket virNetSocket;
typedef virNetSocket *virNetSocketPtr;
diff --git a/src/util/json.c b/src/util/virjson.c
similarity index 99%
rename from src/util/json.c
rename to src/util/virjson.c
index 41e0311..a07dd5c 100644
--- a/src/util/json.c
+++ b/src/util/virjson.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "json.h"
+#include "virjson.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/json.h b/src/util/virjson.h
similarity index 100%
rename from src/util/json.h
rename to src/util/virjson.h
diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h
index 9c5128b..041cf20 100644
--- a/src/util/virlockspace.h
+++ b/src/util/virlockspace.h
@@ -23,7 +23,7 @@
# define __VIR_LOCK_SPACE_H__
# include "internal.h"
-# include "json.h"
+# include "virjson.h"
typedef struct _virLockSpace virLockSpace;
typedef virLockSpace *virLockSpacePtr;
diff --git a/tests/jsontest.c b/tests/jsontest.c
index 412f475..98a6069 100644
--- a/tests/jsontest.c
+++ b/tests/jsontest.c
@@ -6,7 +6,7 @@
#include <time.h>
#include "internal.h"
-#include "json.h"
+#include "virjson.h"
#include "testutils.h"
struct testInfo {
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index f687780..6f129d1 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -38,7 +38,7 @@
#include "virsh-domain.h"
#include "xml.h"
#include "virtypedparam.h"
-#include "json.h"
+#include "virjson.h"
/*
* "capabilities" command
--
1.7.11.7