From 5b5525ad79a4c7e4efd03edf10d0e2deca604594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 14 Dec 2022 13:37:47 +0100
Subject: [PATCH] kola: Rename qemu-unpriv to qemu

There is only one qemu platform now and it is unprivileged.
---
 mantle/cmd/kola/kola.go    | 2 +-
 mantle/cmd/kola/options.go | 8 ++++----
 mantle/kola/harness.go     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mantle/cmd/kola/kola.go b/mantle/cmd/kola/kola.go
index 5fa299bcd9..59be489aed 100644
--- a/mantle/cmd/kola/kola.go
+++ b/mantle/cmd/kola/kola.go
@@ -583,7 +583,7 @@ func syncFindParentImageOptions() error {
 	// Here we handle the --fetch-parent-image --> platform-specific options
 	// based on its cosa build metadata
 	switch kolaPlatform {
-	case "qemu-unpriv":
+	case "qemu":
 		if qemuImageDir == "" {
 			if qemuImageDir, err = ioutil.TempDir("/var/tmp", "kola-run-upgrade"); err != nil {
 				return err
diff --git a/mantle/cmd/kola/options.go b/mantle/cmd/kola/options.go
index c455b75816..050a785ffb 100644
--- a/mantle/cmd/kola/options.go
+++ b/mantle/cmd/kola/options.go
@@ -177,14 +177,14 @@ func syncOptionsImpl(useCosa bool) error {
 		if kola.QEMUIsoOptions.IsoPath != "" {
 			kolaPlatform = "qemu-iso"
 		} else {
-			kolaPlatform = "qemu-unpriv"
+			kolaPlatform = "qemu"
 		}
 	}
 
 	// There used to be a "privileged" qemu path, it is no longer supported.
-	// Alias qemu to qemu-unpriv.
-	if kolaPlatform == "qemu" {
-		kolaPlatform = "qemu-unpriv"
+	// Alias qemu-unpriv to qemu.
+	if kolaPlatform == "qemu-unpriv" {
+		kolaPlatform = "qemu"
 	} else if kolaPlatform == "iso" {
 		kolaPlatform = "qemu-iso"
 	}
diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go
index 7dcb3d65c6..80b97a4fc6 100644
--- a/mantle/kola/harness.go
+++ b/mantle/kola/harness.go
@@ -274,7 +274,7 @@ func NewFlight(pltfrm string) (flight platform.Flight, err error) {
 		flight, err = openstack.NewFlight(&OpenStackOptions)
 	case "packet":
 		flight, err = packet.NewFlight(&PacketOptions)
-	case "qemu-unpriv":
+	case "qemu":
 		flight, err = unprivqemu.NewFlight(&QEMUOptions)
 	case "qemu-iso":
 		flight, err = qemuiso.NewFlight(&QEMUIsoOptions)
@@ -458,8 +458,8 @@ func filterTests(tests map[string]*register.Test, patterns []string, pltfrm stri
 
 	checkPlatforms := []string{pltfrm}
 
-	// qemu-unpriv has the same restrictions as QEMU but might also want additional restrictions due to the lack of a Local cluster
-	if pltfrm == "qemu-unpriv" {
+	// qemu has additional restrictions due to the lack of a Local cluster
+	if pltfrm == "qemu" {
 		checkPlatforms = append(checkPlatforms, "qemu")
 	}
 
@@ -616,7 +616,7 @@ func filterTests(tests map[string]*register.Test, patterns []string, pltfrm stri
 		if allowed, excluded := isAllowed(Options.Distribution, t.Distros, t.ExcludeDistros); !allowed || excluded {
 			continue
 		}
-		if pltfrm == "qemu-unpriv" {
+		if pltfrm == "qemu" {
 			if allowed, excluded := isAllowed(QEMUOptions.Firmware, t.Firmwares, t.ExcludeFirmwares); !allowed || excluded {
 				continue
 			}