]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix build after recent patches
authorPeter Krempa <pkrempa@redhat.com>
Thu, 4 Feb 2016 15:33:06 +0000 (16:33 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 4 Feb 2016 15:34:28 +0000 (16:34 +0100)
Few build breaking mistakes in less-popular parts of our code.

src/security/security_apparmor.c
src/xenapi/xenapi_driver.c

index 2cf333defc46ee40e867c88b6383d3a2f9d79bdd..af2b639ea35438ab45c9b4fff9255714d05499fa 100644 (file)
@@ -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;
 
index c4f33b991149a04ceb1812c5e8ced60095817623..f75f1389d94654d87359a542096cbbceeddb5da0 100644 (file)
@@ -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;