From 3d316546bf6609f3b0a430b02224a1445cca57aa Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 7 Jul 2022 14:36:15 +0530 Subject: [PATCH 1/2] kvm: skip test that can't run and pass on M1 mac (#6537) This fixes the build issue on M1 mac/osx. Signed-off-by: Rohit Yadav --- .../hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 1054c76f887..6741c61eb81 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -5590,6 +5590,9 @@ public class LibvirtComputingResourceTest { @Test public void getMemoryFreeInKBsTestDomainReturningIncompleteArray() throws LibvirtException { + if (!System.getProperty("os.name").equals("Linux")) { + return; + } LibvirtComputingResource libvirtComputingResource = new LibvirtComputingResource(); MemoryStatistic[] mem = createMemoryStatisticFreeMemory100(); From d8da5e650d6c33cc4c1c4c4a0edea90190c290a6 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 7 Jul 2022 14:36:36 +0530 Subject: [PATCH 2/2] kvm: add support nicAdapter detail for vm and template settings for KVM (#6536) Fixes #6533 Signed-off-by: Rohit Yadav --- server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 430bb0e117f..2f8ca01516d 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -4031,6 +4031,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q options.put(VmDetailConstants.ROOT_DISK_SIZE, Collections.emptyList()); if (HypervisorType.KVM.equals(hypervisorType)) { + options.put(VmDetailConstants.NIC_ADAPTER, Arrays.asList("e1000", "virtio", "rtl8139", "vmxnet3", "ne2k_pci")); options.put(VmDetailConstants.ROOT_DISK_CONTROLLER, Arrays.asList("osdefault", "ide", "scsi", "virtio")); options.put(VmDetailConstants.VIDEO_HARDWARE, Arrays.asList("cirrus", "vga", "qxl", "virtio")); options.put(VmDetailConstants.VIDEO_RAM, Collections.emptyList());