Merge pull request #1749 from BlackHole1/add-apphv-host-type

refactor(machine): add applehv and hyperv host type

pkg/machine/machine.go

@@ -9,10 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// TODO: change name to MachineMarker since package is already called machine
-//
-//nolint:revive
-type MachineMarker struct {
+type Marker struct {
 	Enabled bool
 	Type    string
 }
@@ -21,11 +18,13 @@ const (
 	markerFile = "/etc/containers/podman-machine"
 	Wsl        = "wsl"
 	Qemu       = "qemu"
+	AppleHV    = "applehv"
+	HyperV     = "hyperv"
 )
 
 var (
-	markerSync    sync.Once
-	machineMarker *MachineMarker
+	markerSync sync.Once
+	marker     *Marker
 )
 
 func loadMachineMarker(file string) {
@@ -39,7 +38,7 @@ func loadMachineMarker(file string) {
 		kind = strings.TrimSpace(string(content))
 	}
 
-	machineMarker = &MachineMarker{enabled, kind}
+	marker = &Marker{enabled, kind}
 }
 
 func isLegacyConfigSet() bool {
@@ -57,20 +56,17 @@ func IsPodmanMachine() bool {
 	return GetMachineMarker().Enabled
 }
 
-// TODO: change name to HostType since package is already called machine
-//
-//nolint:revive
-func MachineHostType() string {
+func HostType() string {
 	return GetMachineMarker().Type
 }
 
 func IsGvProxyBased() bool {
-	return IsPodmanMachine() && MachineHostType() != Wsl
+	return IsPodmanMachine() && HostType() != Wsl
 }
 
-func GetMachineMarker() *MachineMarker {
+func GetMachineMarker() *Marker {
 	markerSync.Do(func() {
 		loadMachineMarker(markerFile)
 	})
-	return machineMarker
+	return marker
 }

pkg/machine/machine_test.go

@@ -21,34 +21,58 @@ var _ = Describe("Machine", func() {
 		loadMachineMarker("testdata/does-not-exist")
 
 		gomega.Expect(IsPodmanMachine()).To(gomega.BeFalse())
-		gomega.Expect(MachineHostType()).To(gomega.BeEmpty())
+		gomega.Expect(HostType()).To(gomega.BeEmpty())
 		gomega.Expect(IsGvProxyBased()).To(gomega.BeFalse())
 	})
 
 	It("generic machine", func() {
 		loadMachineMarker("testdata/empty-machine")
 
 		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
-		gomega.Expect(MachineHostType()).To(gomega.BeEmpty())
+		gomega.Expect(HostType()).To(gomega.BeEmpty())
 		gomega.Expect(IsGvProxyBased()).To(gomega.BeTrue())
 	})
 
 	It("wsl machine", func() {
 		loadMachineMarker("testdata/wsl-machine")
 
 		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
-		gomega.Expect(MachineHostType()).To(gomega.Equal(Wsl))
+		gomega.Expect(HostType()).To(gomega.Equal(Wsl))
 		gomega.Expect(IsGvProxyBased()).To(gomega.BeFalse())
 	})
 
+	It("qemu machine", func() {
+		loadMachineMarker("testdata/qemu-machine")
+
+		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
+		gomega.Expect(HostType()).To(gomega.Equal(Qemu))
+		gomega.Expect(IsGvProxyBased()).To(gomega.BeTrue())
+	})
+
+	It("applehv machine", func() {
+		loadMachineMarker("testdata/applehv-machine")
+
+		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
+		gomega.Expect(HostType()).To(gomega.Equal(AppleHV))
+		gomega.Expect(IsGvProxyBased()).To(gomega.BeTrue())
+	})
+
+	It("hyperv machine", func() {
+		loadMachineMarker("testdata/hyperv-machine")
+
+		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
+		gomega.Expect(HostType()).To(gomega.Equal(HyperV))
+		gomega.Expect(IsGvProxyBased()).To(gomega.BeTrue())
+	})
+
 	It("legacy config machine", func() {
 		config, _ := config.Default()
 		//nolint:staticcheck //lint:ignore SA1019 deprecated call
 		config.Engine.MachineEnabled = true
 		loadMachineMarker("testdata/does-not-exist")
 
 		gomega.Expect(IsPodmanMachine()).To(gomega.BeTrue())
-		gomega.Expect(MachineHostType()).To(gomega.BeEmpty())
+		gomega.Expect(HostType()).To(gomega.BeEmpty())
 		gomega.Expect(IsGvProxyBased()).To(gomega.BeTrue())
 	})
 })

pkg/machine/testdata/applehv-machine

@@ -0,0 +1 @@
+applehv

pkg/machine/testdata/hyperv-machine

@@ -0,0 +1 @@
+hyperv

pkg/machine/testdata/qemu-machine

@@ -0,0 +1 @@
+qemu