From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 18 Apr 2018 13:37:27 +0000 (+0300)
Subject: vz: build fix
X-Git-Tag: v4.3.0-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489c4c688d5263dd09bec6b5d0391ea69b10cbb2;p=thirdparty%2Flibvirt.git

vz: build fix

Broken by [1] commit - trailing comma instead of semicolon. Fortunately
the issue did not get sneak in released 4.2 version. Note that uriSchemes
for parallelsConnectDriver should not be allocated on stack.

[1] 8e4f9a27: "driver: declare supported URI schemes in virConnectDriver struct"

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 4c30ee19c9..a9ee773023 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -4163,7 +4163,11 @@ static virStateDriver vzStateDriver = {
 
 /* Parallels domain type backward compatibility*/
 static virHypervisorDriver parallelsHypervisorDriver;
-static virConnectDriver parallelsConnectDriver;
+static virConnectDriver parallelsConnectDriver = {
+    .localOnly = true,
+    .uriSchemes = (const char *[]){ "parallels", NULL },
+    .hypervisorDriver = &parallelsHypervisorDriver,
+};
 
 /**
  * vzRegister:
@@ -4186,9 +4190,6 @@ vzRegister(void)
     /* Backward compatibility with Parallels domain type */
     parallelsHypervisorDriver = vzHypervisorDriver;
     parallelsHypervisorDriver.name = "Parallels";
-    parallelsConnectDriver = vzConnectDriver;
-    parallelsConnectDriver.hypervisorDriver = &parallelsHypervisorDriver;
-    parallelsConnectDriver.uriSchemes = (const char *[]){ "parallels", NULL },
     if (virRegisterConnectDriver(&parallelsConnectDriver, true) < 0)
         return -1;