parallels: substitute parallels with vz spec file and Makefile

Since we have changed the name of the driver to vz, let's
reference it as vz everywhere.

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

diff --git a/configure.ac b/configure.ac
index 76236742a302b356a9cdaed12c8aad7e821da9c1..408ee114173614e4a53c39adb17239e9381555f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -562,10 +562,10 @@ AC_ARG_WITH([hyperv],
   [AS_HELP_STRING([--with-hyperv],
     [add Hyper-V support @<:@default=check@:>@])])
 m4_divert_text([DEFAULTS], [with_hyperv=check])
-AC_ARG_WITH([parallels],
-  [AS_HELP_STRING([--with-parallels],
-    [add Parallels Cloud Server support @<:@default=check@:>@])])
-m4_divert_text([DEFAULTS], [with_parallels=check])
+AC_ARG_WITH([vz],
+  [AS_HELP_STRING([--with-vz],
+    [add Virtuozzo support @<:@default=check@:>@])])
+m4_divert_text([DEFAULTS], [with_vz=check])
 AC_ARG_WITH([test],
   [AS_HELP_STRING([--with-test],
     [add test driver support @<:@default=yes@:>@])])
@@ -1082,22 +1082,22 @@ dnl Checks for the Parallels driver
 dnl
 
 
-if test "$with_parallels" = "yes" ||
-   test "$with_parallels" = "check"; then
+if test "$with_vz" = "yes" ||
+   test "$with_vz" = "check"; then
     PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk],
                       [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no])
 
-    if test "$with_parallels" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
+    if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
         AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Parallels driver.])
     fi
 
-    with_parallels=$PARALLELS_SDK_FOUND
-    if test "$with_parallels" = "yes"; then
-        AC_DEFINE_UNQUOTED([WITH_PARALLELS], 1,
-                           [whether Parallels driver is enabled])
+    with_vz=$PARALLELS_SDK_FOUND
+    if test "$with_vz" = "yes"; then
+        AC_DEFINE_UNQUOTED([WITH_VZ], 1,
+                           [whether vz driver is enabled])
     fi
 fi
-AM_CONDITIONAL([WITH_PARALLELS], [test "$with_parallels" = "yes"])
+AM_CONDITIONAL([WITH_VZ], [test "$with_vz" = "yes"])
 
 dnl
 dnl Checks for bhyve driver
@@ -2833,7 +2833,7 @@ AC_MSG_NOTICE([      LXC: $with_lxc])
 AC_MSG_NOTICE([     PHYP: $with_phyp])
 AC_MSG_NOTICE([      ESX: $with_esx])
 AC_MSG_NOTICE([  Hyper-V: $with_hyperv])
-AC_MSG_NOTICE([Parallels: $with_parallels])
+AC_MSG_NOTICE([       vz: $with_vz])
 LIBVIRT_DRIVER_RESULT_BHYVE
 AC_MSG_NOTICE([     Test: $with_test])
 AC_MSG_NOTICE([   Remote: $with_remote])

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 3a7d6138a70bb699f269a215b1b0c7898e817833..592e9b9b46259f9e6ee3c1ac59742638339ee46c 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -97,7 +97,7 @@
 %define with_esx           0%{!?_without_esx:1}
 %define with_hyperv        0%{!?_without_hyperv:1}
 %define with_xenapi        0%{!?_without_xenapi:1}
-%define with_parallels     0%{!?_without_parallels:1}
+%define with_vz            0%{!?_without_vz:1}
 # No test for bhyve, because it does not build on Linux
 
 # Then the secondary host drivers, which run inside libvirtd
@@ -201,7 +201,7 @@
     %define with_xenapi 0
     %define with_libxl 0
     %define with_hyperv 0
-    %define with_parallels 0
+    %define with_vz 0
 %endif
 
 # Fedora 17 / RHEL-7 are first where we use systemd. Although earlier
@@ -1317,8 +1317,8 @@ rm -f $PATCHLIST
     %define _without_vmware --without-vmware
 %endif
 
-%if ! %{with_parallels}
-    %define _without_parallels --without-parallels
+%if ! %{with_vz}
+    %define _without_vz --without-vz
 %endif
 
 %if ! %{with_polkit}
@@ -1500,7 +1500,7 @@ rm -f po/stamp-po
            %{?_without_esx} \
            %{?_without_hyperv} \
            %{?_without_vmware} \
-           %{?_without_parallels} \
+           %{?_without_vz} \
            --without-bhyve \
            %{?_without_interface} \
            %{?_without_network} \

diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index a7b38541664b0d8ae85ee43aa972f87606a4b693..6f958320b41066365767eb6c6e5f32e6828c799c 100644 (file)
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -13,7 +13,7 @@
 # missing libwsman, so can't build hyper-v
 %define with_hyperv        0%{!?_without_hyperv:0}
 %define with_xenapi        0%{!?_without_xenapi:1}
-%define with_parallels           0%{!?_without_parallels:0}
+%define with_vz            0%{!?_without_vz:0}
 
 # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi)
 %if 0%{?rhel}
@@ -126,8 +126,8 @@ MinGW Windows libvirt virtualization library, static version.
     %define _without_xenapi --without-xenapi
 %endif
 
-%if ! %{with_parallels}
-    %define _without_parallels --without-parallels
+%if ! %{with_vz}
+    %define _without_vz --without-vz
 %endif
 
 %if 0%{?enable_autotools}

diff --git a/src/Makefile.am b/src/Makefile.am
index 47b6d61b2f1985921419bd6ffcbd05d94cfac85b..be63e26abe2fc251013c048785877287af7c3020 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1414,7 +1414,7 @@ libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
 libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
 endif WITH_HYPERV
 
-if WITH_PARALLELS
+if WITH_VZ
 noinst_LTLIBRARIES += libvirt_driver_vz.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_vz.la
 libvirt_driver_vz_la_CFLAGS = \
@@ -1422,7 +1422,7 @@ libvirt_driver_vz_la_CFLAGS = \
                $(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS)
 libvirt_driver_vz_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
 libvirt_driver_vz_la_SOURCES = $(VZ_DRIVER_SOURCES)
-endif WITH_PARALLELS
+endif WITH_VZ
 
 if WITH_BHYVE
 noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la

diff --git a/src/libvirt.c b/src/libvirt.c
index 4204446ebb9a41ce95687727727e8172c14c8587..2602dde803a67516ddd0d85a804a02becfcdecb6 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -92,7 +92,7 @@
 #ifdef WITH_XENAPI
 # include "xenapi/xenapi_driver.h"
 #endif
-#ifdef WITH_PARALLELS
+#ifdef WITH_VZ
 # include "vz/vz_driver.h"
 #endif
 #ifdef WITH_BHYVE
@@ -433,7 +433,7 @@ virGlobalInit(void)
     if (xenapiRegister() == -1)
         goto error;
 # endif
-# ifdef WITH_PARALLELS
+# ifdef WITH_VZ
     if (vzRegister() == -1)
         goto error;
 # endif
@@ -1164,7 +1164,7 @@ do_open(const char *name,
 #ifndef WITH_XENAPI
              STRCASEEQ(ret->uri->scheme, "xenapi") ||
 #endif
-#ifndef WITH_PARALLELS
+#ifndef WITH_VZ
              STRCASEEQ(ret->uri->scheme, "parallels") ||
 #endif
              false)) {