diff options
| author | Simon Rettberg | 2025-03-11 14:36:22 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2025-03-11 14:36:22 +0100 |
| commit | 2bc3bdce9eb7809a8517eb94eed5901e0e393a27 (patch) | |
| tree | cf4f11f8a59c2a9c3389ca84fa3045f19fb7723d | |
| parent | [qemu] Make sure qxl's vgamem is at least 48MB, ram at least 64MB (diff) | |
| download | mltk-2bc3bdce9eb7809a8517eb94eed5901e0e393a27.tar.gz mltk-2bc3bdce9eb7809a8517eb94eed5901e0e393a27.tar.xz mltk-2bc3bdce9eb7809a8517eb94eed5901e0e393a27.zip | |
[qemu] Add test case
2 files changed, 12 insertions, 2 deletions
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphics.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphics.java index ca947e1f..682a0fe8 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphics.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphics.java @@ -25,8 +25,8 @@ public class TransformationSpecificQemuGraphics extends TransformationSpecific<Domain, CommandLineArgs, LibvirtHypervisorQemu> { - private static final int MIN_VGA_MEM = 48 * 1024; - private static final int MIN_RAM = 16 * 1024; + public static final int MIN_VGA_MEM = 48 * 1024; + public static final int MIN_RAM = 16 * 1024; /** * Name of the configuration transformation. diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphicsTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphicsTest.java index c132f5a5..0347bb75 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphicsTest.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGraphicsTest.java @@ -3,6 +3,7 @@ package org.openslx.runvirt.plugin.qemu.configuration; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; @@ -14,6 +15,8 @@ import org.openslx.libvirt.domain.device.GraphicsSpice; import org.openslx.libvirt.domain.device.GraphicsSpice.ImageCompression; import org.openslx.libvirt.domain.device.GraphicsSpice.StreamingMode; import org.openslx.libvirt.domain.device.GraphicsVnc; +import org.openslx.libvirt.domain.device.Video; +import org.openslx.libvirt.domain.device.Video.Model; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; import org.openslx.virtualization.configuration.transformation.TransformationException; @@ -57,6 +60,13 @@ public class TransformationSpecificQemuGraphicsTest assertEquals( StreamingMode.OFF, spiceDeviceAfterTransformation.getStreamingMode() ); assertFalse( spiceDeviceAfterTransformation.isOpenGlEnabled() ); + for ( Video dev : config.getVideoDevices() ) { + if ( dev.getModel() == Model.QXL ) { + assertTrue( dev.getVgaMem() >= TransformationSpecificQemuGraphics.MIN_VGA_MEM ); + assertTrue( dev.getRam() >= dev.getVgaMem() + TransformationSpecificQemuGraphics.MIN_RAM ); + } + } + assertDoesNotThrow( () -> config.validateXml() ); } |