提交 af7c18f7 编写于 作者: M Matthias Bolte

Fix compliation of AppArmor related code

Broken by the latest commits to remove the virConnectPtr parameter
from internal functions.
上级 618e1ab3
......@@ -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;
}
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册