KVM memballooning requires free page reporting and autodeflate (apache#11932)

Author: bradh352

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -1388,7 +1388,13 @@ public String getMemBalloonStatsPeriod() {
         @Override
         public String toString() {
             StringBuilder memBalloonBuilder = new StringBuilder();
-            memBalloonBuilder.append("<memballoon model='" + memBalloonModel + "'>\n");
+            memBalloonBuilder.append("<memballoon model='" + memBalloonModel + "'");
+            /* Version integer format: major * 1,000,000 + minor * 1,000 + release.
+             * Require: libvirt 6.9.0, qemu 5.1.0 */
+            if (memBalloonModel != MemBalloonModel.NONE && s_qemuVersion >= 5001000 && s_libvirtVersion >= 6009000) {
+                memBalloonBuilder.append(" autodeflate='on' freePageReporting='on'");
+            }
+            memBalloonBuilder.append(">\n");
             if (StringUtils.isNotBlank(memBalloonStatsPeriod)) {
                 memBalloonBuilder.append("<stats period='" + memBalloonStatsPeriod +"'/>\n");
             }

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java

@@ -186,7 +186,7 @@ public void testDomainXMLParser() {
                      "<alias name='video0'/>" +
                      "<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>" +
                      "</video>" +
-                     "<memballoon model='virtio'>" +
+                     "<memballoon model='virtio' autodeflate='on' freePageReporting='on'>" +
                      "<stats period='60'/>" +
                      "<alias name='balloon0'/>" +
                      "<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>" +
@@ -369,7 +369,7 @@ public void testDomainXMLParserWithoutModelName() {
                 "    <redirdev bus='usb' type='spicevmc'>\n" +
                 "      <address type='usb' bus='0' port='3'/>\n" +
                 "    </redirdev>\n" +
-                "    <memballoon model='virtio'>\n" +
+                "    <memballoon model='virtio' autodeflate='on' freePageReporting='on'>\n" +
                 "      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>\n" +
                 "    </memballoon>\n" +
                 "  </devices>\n" +

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java

@@ -464,6 +464,21 @@ public void memBalloonDefTestNone() {
 
     @Test
     public void memBalloonDefTestVirtio() {
+        LibvirtVMDef.setGlobalQemuVersion(5001000L);
+        LibvirtVMDef.setGlobalLibvirtVersion(6009000L);
+        String expectedXml = "<memballoon model='virtio' autodeflate='on' freePageReporting='on'>\n<stats period='60'/>\n</memballoon>";
+        MemBalloonDef memBalloonDef = new MemBalloonDef();
+        memBalloonDef.defVirtioMemBalloon("60");
+
+        String xmlDef = memBalloonDef.toString();
+
+        assertEquals(expectedXml, xmlDef);
+    }
+
+    @Test
+    public void memBalloonDefTestVirtioOld() {
+        LibvirtVMDef.setGlobalQemuVersion(2006000L);
+        LibvirtVMDef.setGlobalLibvirtVersion(9008L);
         String expectedXml = "<memballoon model='virtio'>\n<stats period='60'/>\n</memballoon>";
         MemBalloonDef memBalloonDef = new MemBalloonDef();
         memBalloonDef.defVirtioMemBalloon("60");

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapperTest.java

@@ -208,7 +208,7 @@ public class LibvirtMigrateVolumeCommandWrapperTest {
             "      <alias name='watchdog0'/>\n" +
             "      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>\n" +
             "    </watchdog>\n" +
-            "    <memballoon model='virtio'>\n" +
+            "    <memballoon model='virtio' autodeflate='on' freePageReporting='on'>\n" +
             "      <alias name='balloon0'/>\n" +
             "      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>\n" +
             "    </memballoon>\n" +