From: kremlin <ian@kremlin.cc>
Date: Thu, 7 Aug 2014 09:21:11 +0000 (-0500)
Subject: recatagorize QEMU/KVM/etc. to correct baremetal classification
X-Git-Tag: gsoc-final~29
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=commitdiff_plain;h=87df323fc6fbf4b68d402340eacbc1d8cc43af13;p=systembsd.git

recatagorize QEMU/KVM/etc. to correct baremetal classification
---

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 432c53b..69c7cc2 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -90,14 +90,15 @@ gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS;
  * but we will worry about those later */
 const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
 {
-    { "QEMU Virtual CPU",        "container", NULL,              FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
+    { "QEMU Virtual CPU",        "vm",        NULL,              FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
     { "KVM",                     "vm",        "drive-multidisk", FALSE, FALSE },
     { "SmartDC HVM",             "vm",        "drive-multidisk", TRUE,  TRUE  }, /* oracle solaris kvm */
-    { "VirtualBox",              "container", "drive-optical",   TRUE,  TRUE  },
-    { "VMware, Inc.",            "container", "drive-optical",   TRUE,  TRUE  },
-    { "VMware Virtual Platform", "container", "drive-optical",   TRUE,  TRUE  },
-    { "Parallels",               "container", "drive-optical",   TRUE,  TRUE  } /* need verification */
-};
+    { "VirtualBox",              "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "VMware, Inc.",            "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "VMware Virtual Platform", "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "Parallels",               "vm",        "drive-multidisk", TRUE,  TRUE  }, /* need verification */
+    { "Xen",                     "vm",        "drive-multidisk", TRUE,  TRUE  } 
+}; /* TODO: chroots, etc. are the actual "containers", add them */
 
 /* archs to check against when determining if machine is server */
 const gchar *server_archs[] = {