[libvirt] [PATCH] vz: fix vz driver compilation

Mikhail Feoktistov mfeoktistov at virtuozzo.com
Wed Jun 28 13:02:45 UTC 2017


- add argument xmlopt for virDomainDefCheckABIStability
- nseclabels is moved to virDomainChrSourceDefPtr
---
 src/vz/vz_driver.c | 2 +-
 src/vz/vz_sdk.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index d47774c..6f4aee3 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -872,7 +872,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
              * So forbid this operation, if config is changed. If it's
              * not changed - just do nothing. */
 
-            if (!virDomainDefCheckABIStability(dom->def, def)) {
+            if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) {
                 virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                                _("Can't change domain configuration "
                                  "in managed save state"));
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index a62b310..0aa1a30 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2894,7 +2894,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr)
         return -1;
     }
 
-    if (chr->nseclabels > 0) {
+    if (chr->source->nseclabels > 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Setting security labels is not "
                          "supported by vz driver."));
-- 
1.8.3.1




More information about the libvir-list mailing list