summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2021-08-16 11:45:23 +0200
committerManuel Bentele2021-08-16 11:45:23 +0200
commit5c212844969d75eb112eff767b71450115dbde16 (patch)
treea652f42f7353d806dcbba94853674d37325a9592
parent[qemu] Add Intel GVT-g (mdev) support to run-virt Java tool (diff)
downloadmltk-5c212844969d75eb112eff767b71450115dbde16.tar.gz
mltk-5c212844969d75eb112eff767b71450115dbde16.tar.xz
mltk-5c212844969d75eb112eff767b71450115dbde16.zip
[qemu] Fix issue in Nvidia GPU passthrough unit test
-rw-r--r--core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidia.java2
-rw-r--r--core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java15
2 files changed, 12 insertions, 5 deletions
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidia.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidia.java
index 86781525..e5d65c27 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidia.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidia.java
@@ -40,7 +40,7 @@ public class TransformationSpecificQemuGpuPassthroughNvidia
* Switch to turn patch for Nvidia GPU-Passthrough (enables Hyper-V enlightening) on or off to
* avoid driver error code 43 in guest system.
*/
- private static final boolean NVIDIA_PATCH = true;
+ public static final boolean NVIDIA_PATCH = true;
/**
* Vendor identifier of the Hyper-V enlightenment for hypervisor shadowing.
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java
index 8f50b7df..55e40221 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuGpuPassthroughNvidiaTest.java
@@ -85,10 +85,17 @@ public class TransformationSpecificQemuGpuPassthroughNvidiaTest
assertEquals( Shmem.Model.IVSHMEM_PLAIN, shmemDevice.getModel() );
assertEquals( BigInteger.valueOf( 67108864 ).toString(), shmemDevice.getSize().toString() );
- assertEquals( TransformationSpecificQemuGpuPassthroughNvidia.HYPERV_VENDOR_ID,
- config.getFeatureHypervVendorIdValue() );
- assertTrue( config.isFeatureHypervVendorIdStateOn() );
- assertTrue( config.isFeatureKvmHiddenStateOn() );
+ if ( TransformationSpecificQemuGpuPassthroughNvidia.NVIDIA_PATCH ) {
+ assertEquals( TransformationSpecificQemuGpuPassthroughNvidia.HYPERV_VENDOR_ID,
+ config.getFeatureHypervVendorIdValue() );
+ assertTrue( config.isFeatureHypervVendorIdStateOn() );
+ assertTrue( config.isFeatureKvmHiddenStateOn() );
+ } else {
+ assertNotEquals( TransformationSpecificQemuGpuPassthroughNvidia.HYPERV_VENDOR_ID,
+ config.getFeatureHypervVendorIdValue() );
+ assertFalse( config.isFeatureHypervVendorIdStateOn() );
+ assertFalse( config.isFeatureKvmHiddenStateOn() );
+ }
final List<Video> videoDevices = config.getVideoDevices();
assertNotNull( videoDevices );