From aa2c97263dbb6aefcef7d885db28236c2408f786 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 3 Mar 2009 09:59:02 +0000
Subject: [PATCH] virsh additions for sVirt support (James Morris & Dan Walsh)

---
 ChangeLog   |  8 +++++++-
 src/virsh.c | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0453790cc4..bb665f505b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Tue Mar  3 09:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	virsh additions for sVirt support (James Morris & Dan Walsh)
+	* src/virsh.c: Include security model / label information
+	in the 'dominfo' output
+
 Tue Mar  3 09:40:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
-	Core internal driver stub for sVirt support (Jams Morris & Dan Walsh)
+	Core internal driver stub for sVirt support (James Morris & Dan Walsh)
 	* Makefile.maint: Add virSecurityReportError as a msggen
 	function
 	* docs/schemas/capability.rng: Add <secmodel> element
diff --git a/src/virsh.c b/src/virsh.c
index c23fdda8c5..6a257ca2e4 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1539,6 +1539,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainInfo info;
     virDomainPtr dom;
+    virSecurityModel secmodel;
+    virSecurityLabel seclabel;
     int ret = TRUE, autostart;
     unsigned int id;
     char *str, uuid[VIR_UUID_STRING_BUFLEN];
@@ -1597,6 +1599,29 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd)
                  autostart ? _("enable") : _("disable") );
     }
 
+    /* Security model and label information */
+    memset(&secmodel, 0, sizeof secmodel);
+    if (virNodeGetSecurityModel(ctl->conn, &secmodel) == -1) {
+        virDomainFree(dom);
+        return FALSE;
+    } else {
+        /* Only print something if a security model is active */
+        if (secmodel.model[0] != '\0') {
+            vshPrint(ctl, "%-15s %s\n", _("Security model:"), secmodel.model);
+            vshPrint(ctl, "%-15s %s\n", _("Security DOI:"), secmodel.doi);
+
+            /* Security labels are only valid for active domains */
+            memset(&seclabel, 0, sizeof seclabel);
+            if (virDomainGetSecurityLabel(dom, &seclabel) == -1) {
+                virDomainFree(dom);
+                return FALSE;
+            } else {
+                if (seclabel.label[0] != '\0')
+                    vshPrint(ctl, "%-15s %s (%s)\n", _("Security label:"),
+                             seclabel.label, seclabel.enforcing ? "enforcing" : "permissive");
+            }
+        }
+    }
     virDomainFree(dom);
     return ret;
 }
-- 
GitLab