9:50 a.m.
This patch moves all src/parallels/parallels* files to vz/vz*
and fixes build accordingly.
No functional changes.
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
po/POTFILES.in | 12 ++++----
src/Makefile.am | 32 +++++++++++-----------
src/libvirt.c | 2 +-
.../parallels_driver.c => vz/vz_driver.c} | 8 +++---
.../parallels_driver.h => vz/vz_driver.h} | 2 +-
.../parallels_network.c => vz/vz_network.c} | 4 +--
src/{parallels/parallels_sdk.c => vz/vz_sdk.c} | 4 +--
src/{parallels/parallels_sdk.h => vz/vz_sdk.h} | 4 +--
.../parallels_storage.c => vz/vz_storage.c} | 4 +--
src/{parallels/parallels_utils.c => vz/vz_utils.c} | 4 +--
src/{parallels/parallels_utils.h => vz/vz_utils.h} | 2 +-
11 files changed, 39 insertions(+), 39 deletions(-)
rename src/{parallels/parallels_driver.c => vz/vz_driver.c} (99%)
rename src/{parallels/parallels_driver.h => vz/vz_driver.h} (93%)
rename src/{parallels/parallels_network.c => vz/vz_network.c} (99%)
rename src/{parallels/parallels_sdk.c => vz/vz_sdk.c} (99%)
rename src/{parallels/parallels_sdk.h => vz/vz_sdk.h} (96%)
rename src/{parallels/parallels_storage.c => vz/vz_storage.c} (99%)
rename src/{parallels/parallels_utils.c => vz/vz_utils.c} (98%)
rename src/{parallels/parallels_utils.h => vz/vz_utils.h} (98%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb0f6e1..ae41b34 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -104,12 +104,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 0d1f58b..dc9ed1d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -534,7 +534,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) \
@@ -802,15 +802,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 \
@@ -1390,13 +1390,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
@@ -1762,7 +1762,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 f1e8d3f..4204446 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 5a18b06..985a478 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 173764b..3c76106 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 6e18707..3a5a3ff 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 4dafe7c..f9cde44 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 5de6473..dd4fecf 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 b0dac50..7183db4 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 995ef79..08b7f5a 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 ce540b6..9b46bf9 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.
--
2.1.0