Identify kvm + hv_passthrough as "kvm"

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 8cea4367a07491058567c01484e7ca1eaeac2bae..4cf8691c27d979cc200cadf414d55fe176a7915c 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -32,6 +32,7 @@ enum {
 static const char *const vm_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_XEN]       = "XenVMMXenVMM",
         [VIRTUALIZATION_KVM]       = "KVMKVMKVM",
+        [VIRTUALIZATION_HV_KVM]    = "Linux KVM Hv",
         [VIRTUALIZATION_QEMU]      = "TCGTCGTCGTCG",
         /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
         [VIRTUALIZATION_VMWARE]    = "VMwareVMware",
@@ -995,6 +996,7 @@ bool has_cpu_with_flag(const char *flag) {
 static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_NONE] = "none",
         [VIRTUALIZATION_KVM] = "kvm",
+        [VIRTUALIZATION_HV_KVM] = "kvm",
         [VIRTUALIZATION_AMAZON] = "amazon",
         [VIRTUALIZATION_QEMU] = "qemu",
         [VIRTUALIZATION_BOCHS] = "bochs",

diff --git a/src/basic/virt.h b/src/basic/virt.h
index 1eafbe2cbecfc92bbc730430f39b5a6423a8a581..0b78d1baa368f91f2afd023c13476f9d54ab3072 100644 (file)
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -10,6 +10,7 @@ enum {
 
         VIRTUALIZATION_VM_FIRST,
         VIRTUALIZATION_KVM = VIRTUALIZATION_VM_FIRST,
+        VIRTUALIZATION_HV_KVM,
         VIRTUALIZATION_AMAZON,
         VIRTUALIZATION_QEMU,
         VIRTUALIZATION_BOCHS,

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 3e5df0459004a8b04030899270449acb9bc96b8d..62b0ba9411b61a4e65504e6df1189098e153587c 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -121,7 +121,6 @@ int main(int argc, char **argv) {
         test_table(unit_file_state, UNIT_FILE_STATE);
         test_table(unit_load_state, UNIT_LOAD_STATE);
         test_table(unit_type, UNIT_TYPE);
-        test_table(virtualization, VIRTUALIZATION);
 
         test_table_sparse(object_compressed, OBJECT_COMPRESSED);