From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 7 Nov 2011 10:17:28 +0000 (+0000)
Subject: Add missing defaultConsoleTargetType callback for AppArmour
X-Git-Tag: v0.9.7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07bf96ee3f807900dd15859ab98b3487f48d40a1;p=thirdparty%2Flibvirt.git

Add missing defaultConsoleTargetType callback for AppArmour

Every instance of virCapsPtr must have the defaultConsoleTargetType
field set.

* src/security/virt-aa-helper.c: Add defaultConsoleTargetType to
  virCapsPtr
---

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 71a4586f31..ad0697424f 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -685,6 +685,11 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
     return rc;
 }
 
+static int aaDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED)
+{
+    return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
+}
+
 static int
 get_definition(vahControl * ctl, const char *xmlStr)
 {
@@ -703,6 +708,8 @@ get_definition(vahControl * ctl, const char *xmlStr)
         goto exit;
     }
 
+    ctl->caps->defaultConsoleTargetType = aaDefaultConsoleType;
+
     if ((guest = virCapabilitiesAddGuest(ctl->caps,
                                          ctl->hvm,
                                          ctl->arch,