From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 4 Feb 2016 15:33:06 +0000 (+0100)
Subject: Fix build after recent patches
X-Git-Tag: v1.3.2-rc1~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c987b72da5d70fa862f1ae8e71716be4a009ec;p=thirdparty%2Flibvirt.git

Fix build after recent patches

Few build breaking mistakes in less-popular parts of our code.
---

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 2cf333defc..af2b639ea3 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -181,7 +181,7 @@ load_profile(virSecurityManagerPtr mgr,
     const char *probe = virSecurityManagerGetAllowDiskFormatProbing(mgr)
         ? "1" : "0";
 
-    xml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE);
+    xml = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE);
     if (!xml)
         goto cleanup;
 
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index c4f33b9911..f75f1389d9 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1402,7 +1402,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     xen_vm vm = NULL;
     xen_vm_set *vms;
     xen_string_string_map *result = NULL;
-    struct _xenapiPrivate *priv = conn->privateData;
+    struct _xenapiPrivate *priv = dom->conn->privateData;
     xen_session *session = priv->session;
     virDomainDefPtr defPtr = NULL;
     char *boot_policy = NULL;