From: Cédric Bosdonnat Date: Tue, 28 Oct 2014 20:42:34 +0000 (-0600) Subject: Teach virt-aa-helper to use TEMPLATE.qemu if the domain is kvm or kqemu X-Git-Tag: v1.2.10-rc2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16d2bc8b98563f801f111795250515fcbd39ab46;p=thirdparty%2Flibvirt.git Teach virt-aa-helper to use TEMPLATE.qemu if the domain is kvm or kqemu --- diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 9afc8db15c..1f299a056d 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -341,15 +341,25 @@ create_profile(const char *profile, const char *profile_name, int tlen, plen; int fd; int rc = -1; + const char *driver_name = NULL; if (virFileExists(profile)) { vah_error(NULL, 0, _("profile exists")); goto end; } + switch (virtType) { + case VIR_DOMAIN_VIRT_QEMU: + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_KVM: + driver_name = "qemu"; + break; + default: + driver_name = virDomainVirtTypeToString(virtType); + } if (virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", - virDomainVirtTypeToString(virtType)) < 0) { + driver_name) < 0) { vah_error(NULL, 0, _("template name exceeds maximum length")); goto end; }