From af7c18f7a2c9c410ed9c9b3eba7663f45294e51c Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 12 Feb 2010 00:09:59 +0100
Subject: [PATCH] Fix compliation of AppArmor related code

Broken by the latest commits to remove the virConnectPtr parameter
from internal functions.
---
 src/security/security_apparmor.c | 4 ++--
 src/security/virt-aa-helper.c    | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 23f40f8f83..db04d5c188 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -262,7 +262,7 @@ use_apparmor(void)
     char *libvirt_daemon = NULL;
 
     if (virFileResolveLink("/proc/self/exe", &libvirt_daemon) < 0) {
-        virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR,
+        virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
                                "%s", _("could not find libvirtd"));
         return rc;
     }
@@ -295,7 +295,7 @@ AppArmorSecurityDriverProbe(void)
     }
 
     if (!virFileExists(template)) {
-        virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR,
+        virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
                                _("template \'%s\' does not exist"), template);
         goto clean;
     }
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 619c8c3320..066e18b3f3 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -690,7 +690,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
         goto exit;
     }
 
-    ctl->def = virDomainDefParseString(NULL, ctl->caps, xmlStr, 0);
+    ctl->def = virDomainDefParseString(ctl->caps, xmlStr, 0);
     if (ctl->def == NULL) {
         vah_error(ctl, 0, "could not parse XML");
         goto exit;
@@ -767,8 +767,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
 }
 
 static int
-file_iterate_cb(virConnectPtr conn ATTRIBUTE_UNUSED,
-                usbDevice *dev ATTRIBUTE_UNUSED,
+file_iterate_cb(usbDevice *dev ATTRIBUTE_UNUSED,
                 const char *file, void *opaque)
 {
     virBufferPtr buf = opaque;
@@ -844,8 +843,7 @@ get_files(vahControl * ctl)
                 if (usb == NULL)
                     continue;
 
-                rc = usbDeviceFileIterate(NULL, usb,
-                                          file_iterate_cb, &buf);
+                rc = usbDeviceFileIterate(usb, file_iterate_cb, &buf);
                 usbFreeDevice(usb);
                 if (rc != 0)
                     goto clean;
-- 
GitLab