drop vmx

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>

Author: nevermarine

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go

@@ -167,7 +167,6 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 		cpu.Model = GenericCPUModel
 		features := make([]virtv1.CPUFeature, 0, len(class.Status.CpuFeatures.Enabled)+2)
 		hasSvm := false
-		hasVMX := false
 		hasHT := false
 		for _, feature := range class.Status.CpuFeatures.Enabled {
 			policy := "require"
@@ -177,9 +176,6 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 			if feature == "svm" {
 				hasSvm = true
 			}
-			if feature == "vmx" {
-				hasVMX = true
-			}
 			if feature == HTCPUFeature {
 				hasHT = true
 			}
@@ -191,7 +187,7 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 		if !hasSvm {
 			features = append(features, virtv1.CPUFeature{Name: "svm", Policy: "optional"})
 		}
-		if hasVMX && !hasHT {
+		if !hasHT {
 			features = append(features, virtv1.CPUFeature{Name: HTCPUFeature, Policy: "optional"})
 		}
 		cpu.Features = features

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_test.go

@@ -229,14 +229,14 @@ func TestSetCPUModel(t *testing.T) {
 	name := "test-name"
 	namespace := "test-namespace"
 
-	t.Run("should add optional ht feature for intel x86 discovery cpu", func(t *testing.T) {
+	t.Run("should add optional ht feature for discovery cpu", func(t *testing.T) {
 		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
 		class := &v1alpha2.VirtualMachineClass{
 			Spec: v1alpha2.VirtualMachineClassSpec{
 				CPU: v1alpha2.CPU{Type: v1alpha2.CPUTypeDiscovery},
 			},
 			Status: v1alpha2.VirtualMachineClassStatus{
-				CpuFeatures: v1alpha2.CpuFeatures{Enabled: []string{"vmx", "aes"}},
+				CpuFeatures: v1alpha2.CpuFeatures{Enabled: []string{"aes"}},
 			},
 		}
 
@@ -250,27 +250,6 @@ func TestSetCPUModel(t *testing.T) {
 		}
 	})
 
-	t.Run("should not add ht feature for amd discovery cpu", func(t *testing.T) {
-		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
-		class := &v1alpha2.VirtualMachineClass{
-			Spec: v1alpha2.VirtualMachineClassSpec{
-				CPU: v1alpha2.CPU{Type: v1alpha2.CPUTypeDiscovery},
-			},
-			Status: v1alpha2.VirtualMachineClassStatus{
-				CpuFeatures: v1alpha2.CpuFeatures{Enabled: []string{"svm", "aes"}},
-			},
-		}
-
-		if err := builder.SetCPUModel(class); err != nil {
-			t.Fatalf("SetCPUModel() failed: %v", err)
-		}
-
-		features := builder.Resource.Spec.Template.Spec.Domain.CPU.Features
-		if containsCPUFeature(features, virtv1.CPUFeature{Name: HTCPUFeature, Policy: "optional"}) {
-			t.Fatalf("did not expect optional ht feature for amd cpu, got %#v", features)
-		}
-	})
-
 	t.Run("should keep existing ht feature policy when already present", func(t *testing.T) {
 		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
 		class := &v1alpha2.VirtualMachineClass{