From 1ee1b58fc39e512924aae9cb010c83df65b71eb2 Mon Sep 17 00:00:00 2001
From: Maxim Nestratov <mnestratov@virtuozzo.com>
Date: Wed, 6 Apr 2016 11:06:18 +0300
Subject: [PATCH] vz: add Hypervisor prefix to vz and parallels Driver
 structures

---
 src/vz/vz_driver.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 376611542f..1f4c3802e9 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1511,7 +1511,7 @@ static int vzDomainSetMemory(virDomainPtr domain, unsigned long memory)
     return vzDomainSetMemoryFlagsImpl(domain, memory, 0, false);
 }
 
-static virHypervisorDriver vzDriver = {
+static virHypervisorDriver vzHypervisorDriver = {
     .name = "vz",
     .connectOpen = vzConnectOpen,            /* 0.10.0 */
     .connectClose = vzConnectClose,          /* 0.10.0 */
@@ -1580,11 +1580,11 @@ static virHypervisorDriver vzDriver = {
 };
 
 static virConnectDriver vzConnectDriver = {
-    .hypervisorDriver = &vzDriver,
+    .hypervisorDriver = &vzHypervisorDriver,
 };
 
 /* Parallels domain type backward compatibility*/
-static virHypervisorDriver parallelsDriver;
+static virHypervisorDriver parallelsHypervisorDriver;
 static virConnectDriver parallelsConnectDriver;
 
 /**
@@ -1606,10 +1606,10 @@ vzRegister(void)
     VIR_FREE(prlctl_path);
 
     /* Backward compatibility with Parallels domain type */
-    parallelsDriver = vzDriver;
-    parallelsDriver.name = "Parallels";
+    parallelsHypervisorDriver = vzHypervisorDriver;
+    parallelsHypervisorDriver.name = "Parallels";
     parallelsConnectDriver = vzConnectDriver;
-    parallelsConnectDriver.hypervisorDriver = &parallelsDriver;
+    parallelsConnectDriver.hypervisorDriver = &parallelsHypervisorDriver;
     if (virRegisterConnectDriver(&parallelsConnectDriver, false) < 0)
         return -1;
 
-- 
GitLab