From 7ea0e908e4e3d2a8f6a76e76850a471267a10dc5 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 11 Feb 2020 10:09:50 +0000 Subject: [PATCH 1/3] kvm: Enable virtio drivers based on guest os display name --- server/src/main/java/com/cloud/hypervisor/KVMGuru.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java index 2b84ff9b04df..64d542d26f13 100644 --- a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java @@ -132,7 +132,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) { guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion()); } if (guestOsMapping == null || host == null) { - to.setPlatformEmulator("Other"); + to.setPlatformEmulator(guestOS.getDisplayName()); } else { to.setPlatformEmulator(guestOsMapping.getGuestOsName()); } From d6fae5afbc6d147da81d6f186c5744b6110a520b Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 14 Feb 2020 16:24:43 +0100 Subject: [PATCH 2/3] fall back if null --- server/src/main/java/com/cloud/hypervisor/KVMGuru.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java index 64d542d26f13..f6abbe1f19fc 100644 --- a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java @@ -132,7 +132,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) { guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion()); } if (guestOsMapping == null || host == null) { - to.setPlatformEmulator(guestOS.getDisplayName()); + to.setPlatformEmulator(guestOS.getDisplayName() == null ? "unknown" : guestOS.getDisplayName()); } else { to.setPlatformEmulator(guestOsMapping.getGuestOsName()); } From 8d69839e6b20ccf056e13b291df286c934bbc7f8 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 14 Feb 2020 16:57:01 +0000 Subject: [PATCH 3/3] use Other instead unknown --- server/src/main/java/com/cloud/hypervisor/KVMGuru.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java index f6abbe1f19fc..cf29a1a55a93 100644 --- a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java @@ -132,7 +132,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) { guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion()); } if (guestOsMapping == null || host == null) { - to.setPlatformEmulator(guestOS.getDisplayName() == null ? "unknown" : guestOS.getDisplayName()); + to.setPlatformEmulator(guestOS.getDisplayName() == null ? "Other" : guestOS.getDisplayName()); } else { to.setPlatformEmulator(guestOsMapping.getGuestOsName()); }