From: Maxim Nestratov <mnestratov@parallels.com>
Date: Wed, 10 Jun 2015 07:50:00 +0000 (+0300)
Subject: parallels: rename all parallels files and driver directory to vz
X-Git-Tag: v1.2.17-rc1~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6d180f07fb06af9088eb13fa418a4a36f4a3614;p=thirdparty%2Flibvirt.git

parallels: rename all parallels files and driver directory to vz

This patch moves all src/parallels/parallels* files to vz/vz*
and fixes build accordingly.
No functional changes.

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com>
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 189e2cc2f4..1d5917d10c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,12 +106,12 @@ src/nwfilter/nwfilter_learnipaddr.c
 src/openvz/openvz_conf.c
 src/openvz/openvz_driver.c
 src/openvz/openvz_util.c
-src/parallels/parallels_driver.c
-src/parallels/parallels_network.c
-src/parallels/parallels_sdk.c
-src/parallels/parallels_utils.c
-src/parallels/parallels_utils.h
-src/parallels/parallels_storage.c
+src/vz/vz_driver.c
+src/vz/vz_network.c
+src/vz/vz_sdk.c
+src/vz/vz_utils.c
+src/vz/vz_utils.h
+src/vz/vz_storage.c
 src/phyp/phyp_driver.c
 src/qemu/qemu_agent.c
 src/qemu/qemu_blockjob.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e1b841ca9..47b6d61b2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -558,7 +558,7 @@ DRIVER_SOURCE_FILES = \
 	$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
 	$(NWFILTER_DRIVER_SOURCES) \
 	$(OPENVZ_DRIVER_SOURCES) \
-	$(PARALLELS_DRIVER_SOURCES) \
+	$(VZ_DRIVER_SOURCES) \
 	$(PHYP_DRIVER_SOURCES) \
 	$(QEMU_DRIVER_SOURCES) \
 	$(REMOTE_DRIVER_SOURCES) \
@@ -826,15 +826,15 @@ HYPERV_DRIVER_EXTRA_DIST =							\
 		hyperv/hyperv_wmi_generator.py					\
 		$(HYPERV_DRIVER_GENERATED)
 
-PARALLELS_DRIVER_SOURCES =					\
-		parallels/parallels_driver.h			\
-		parallels/parallels_driver.c			\
-		parallels/parallels_utils.c			\
-		parallels/parallels_utils.h			\
-		parallels/parallels_storage.c		\
-		parallels/parallels_network.c		\
-		parallels/parallels_sdk.h			\
-		parallels/parallels_sdk.c
+VZ_DRIVER_SOURCES =					\
+		vz/vz_driver.h			\
+		vz/vz_driver.c			\
+		vz/vz_utils.c			\
+		vz/vz_utils.h			\
+		vz/vz_storage.c		\
+		vz/vz_network.c		\
+		vz/vz_sdk.h			\
+		vz/vz_sdk.c
 
 BHYVE_DRIVER_SOURCES =						\
 		bhyve/bhyve_capabilities.c			\
@@ -1415,13 +1415,13 @@ libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
 endif WITH_HYPERV
 
 if WITH_PARALLELS
-noinst_LTLIBRARIES += libvirt_driver_parallels.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la
-libvirt_driver_parallels_la_CFLAGS = \
+noinst_LTLIBRARIES += libvirt_driver_vz.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_vz.la
+libvirt_driver_vz_la_CFLAGS = \
 		-I$(srcdir)/conf $(AM_CFLAGS) \
 		$(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS)
-libvirt_driver_parallels_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
-libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES)
+libvirt_driver_vz_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
+libvirt_driver_vz_la_SOURCES = $(VZ_DRIVER_SOURCES)
 endif WITH_PARALLELS
 
 if WITH_BHYVE
@@ -1787,7 +1787,7 @@ EXTRA_DIST +=							\
 		$(ESX_DRIVER_EXTRA_DIST)			\
 		$(HYPERV_DRIVER_SOURCES)			\
 		$(HYPERV_DRIVER_EXTRA_DIST)			\
-		$(PARALLELS_DRIVER_SOURCES)			\
+		$(VZ_DRIVER_SOURCES)				\
 		$(BHYVE_DRIVER_SOURCES)				\
 		$(NETWORK_DRIVER_SOURCES)			\
 		$(INTERFACE_DRIVER_SOURCES)			\
diff --git a/src/libvirt.c b/src/libvirt.c
index f1e8d3f885..4204446ebb 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -93,7 +93,7 @@
 # include "xenapi/xenapi_driver.h"
 #endif
 #ifdef WITH_PARALLELS
-# include "parallels/parallels_driver.h"
+# include "vz/vz_driver.h"
 #endif
 #ifdef WITH_BHYVE
 # include "bhyve/bhyve_driver.h"
diff --git a/src/parallels/parallels_driver.c b/src/vz/vz_driver.c
similarity index 99%
rename from src/parallels/parallels_driver.c
rename to src/vz/vz_driver.c
index 8edddc409c..cef3c7714e 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/vz/vz_driver.c
@@ -1,5 +1,5 @@
 /*
- * parallels_driver.c: core driver functions for managing
+ * vz_driver.c: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2014-2015 Red Hat, Inc.
@@ -53,9 +53,9 @@
 #include "cpu/cpu.h"
 #include "virtypedparam.h"
 
-#include "parallels_driver.h"
-#include "parallels_utils.h"
-#include "parallels_sdk.h"
+#include "vz_driver.h"
+#include "vz_utils.h"
+#include "vz_sdk.h"
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
 
diff --git a/src/parallels/parallels_driver.h b/src/vz/vz_driver.h
similarity index 93%
rename from src/parallels/parallels_driver.h
rename to src/vz/vz_driver.h
index 173764b67a..3c7610637f 100644
--- a/src/parallels/parallels_driver.h
+++ b/src/vz/vz_driver.h
@@ -1,5 +1,5 @@
 /*
- * parallels_driver.h: core driver functions for managing
+ * vz_driver.h: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2012 Parallels, Inc.
diff --git a/src/parallels/parallels_network.c b/src/vz/vz_network.c
similarity index 99%
rename from src/parallels/parallels_network.c
rename to src/vz/vz_network.c
index 6e1870763f..3a5a3ffaf5 100644
--- a/src/parallels/parallels_network.c
+++ b/src/vz/vz_network.c
@@ -1,5 +1,5 @@
 /*
- * parallels_network.c: core privconn functions for managing
+ * vz_network.c: core privconn functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2013-2014 Red Hat, Inc.
@@ -30,7 +30,7 @@
 #include "virfile.h"
 #include "virnetdev.h"
 #include "md5.h"
-#include "parallels_utils.h"
+#include "vz_utils.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
diff --git a/src/parallels/parallels_sdk.c b/src/vz/vz_sdk.c
similarity index 99%
rename from src/parallels/parallels_sdk.c
rename to src/vz/vz_sdk.c
index 4dafe7c43a..f9cde44475 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1,5 +1,5 @@
 /*
- * parallels_sdk.c: core driver functions for managing
+ * vz_sdk.c: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2014 Parallels, Inc.
@@ -32,7 +32,7 @@
 #include "domain_conf.h"
 #include "virtime.h"
 
-#include "parallels_sdk.h"
+#include "vz_sdk.h"
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
 #define JOB_INFINIT_WAIT_TIMEOUT UINT_MAX
diff --git a/src/parallels/parallels_sdk.h b/src/vz/vz_sdk.h
similarity index 96%
rename from src/parallels/parallels_sdk.h
rename to src/vz/vz_sdk.h
index 5de6473f2a..dd4fecfef7 100644
--- a/src/parallels/parallels_sdk.h
+++ b/src/vz/vz_sdk.h
@@ -1,5 +1,5 @@
 /*
- * parallels_sdk.h: core driver functions for managing
+ * vz_sdk.h: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2014 Parallels, Inc.
@@ -22,7 +22,7 @@
 
 #include <Parallels.h>
 
-#include "parallels_utils.h"
+#include "vz_utils.h"
 
 int prlsdkInit(void);
 void prlsdkDeinit(void);
diff --git a/src/parallels/parallels_storage.c b/src/vz/vz_storage.c
similarity index 99%
rename from src/parallels/parallels_storage.c
rename to src/vz/vz_storage.c
index b0dac50bcc..7183db4823 100644
--- a/src/parallels/parallels_storage.c
+++ b/src/vz/vz_storage.c
@@ -1,5 +1,5 @@
 /*
- * parallels_storage.c: core driver functions for managing
+ * vz_storage.c: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2013-2014 Red Hat, Inc.
@@ -37,7 +37,7 @@
 #include "virstoragefile.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "parallels_utils.h"
+#include "vz_utils.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
diff --git a/src/parallels/parallels_utils.c b/src/vz/vz_utils.c
similarity index 98%
rename from src/parallels/parallels_utils.c
rename to src/vz/vz_utils.c
index 995ef79960..08b7f5af86 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/vz/vz_utils.c
@@ -1,5 +1,5 @@
 /*
- * parallels_utils.c: core driver functions for managing
+ * vz_utils.c: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2012 Parallels, Inc.
@@ -28,7 +28,7 @@
 #include "virerror.h"
 #include "viralloc.h"
 #include "virjson.h"
-#include "parallels_utils.h"
+#include "vz_utils.h"
 #include "virstring.h"
 #include "datatypes.h"
 
diff --git a/src/parallels/parallels_utils.h b/src/vz/vz_utils.h
similarity index 98%
rename from src/parallels/parallels_utils.h
rename to src/vz/vz_utils.h
index ce540b6a38..9b46bf9ed1 100644
--- a/src/parallels/parallels_utils.h
+++ b/src/vz/vz_utils.h
@@ -1,5 +1,5 @@
 /*
- * parallels_utils.h: core driver functions for managing
+ * vz_utils.h: core driver functions for managing
  * Parallels Cloud Server hosts
  *
  * Copyright (C) 2012 Parallels, Inc.