Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func NewVirtualMachineConfiguration(bootLoader BootLoader, cpu uint, memorySize
config := &VirtualMachineConfiguration{
pointer: vzbridge.NewVZVirtualMachineConfiguration(
bootLoader,
uint32(cpu),
uint64(cpu),
uint64(memorySize),
),
}
Expand Down
42 changes: 42 additions & 0 deletions configuration_cpu_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package vz_test

import (
"path/filepath"
"testing"

"github.com/Code-Hex/vz/v4"
)

func TestVirtualMachineConfigurationCPUCount(t *testing.T) {
if vz.Available(12) {
t.Skip("requires macOS 12")
}
store, err := vz.NewEFIVariableStore(filepath.Join(t.TempDir(), "efi"), vz.WithCreatingEFIVariableStore())
if err != nil {
t.Fatal(err)
}
boot, err := vz.NewEFIBootLoader(vz.WithEFIVariableStore(store))
if err != nil {
t.Fatal(err)
}
minimumCPUCount := vz.VirtualMachineConfigurationMinimumAllowedCPUCount()
for _, tc := range []struct {
name string
cpu uint
valid bool
}{
{name: "minimum", cpu: minimumCPUCount, valid: true},
{name: "exceeds 32 bits", cpu: 1<<32 + minimumCPUCount, valid: false},
} {
t.Run(tc.name, func(t *testing.T) {
config, err := vz.NewVirtualMachineConfiguration(boot, tc.cpu, vz.VirtualMachineConfigurationMinimumAllowedMemorySize())
if err != nil {
t.Fatal(err)
}
valid, err := config.Validate()
if valid != tc.valid || (err == nil) != tc.valid {
t.Fatalf("CPU count %d: Validate() = %t, %v; want valid = %t", tc.cpu, valid, err, tc.valid)
}
})
}
}
4 changes: 2 additions & 2 deletions internal/vzbridge/direct_adapters.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ func NewVZGenericMachineIdentifierWithBytes(bytes unsafe.Pointer, length int32)
return VZGenericMachineIdentifier_InitWithDataRepresentation(data)
}

func NewVZVirtualMachineConfiguration(bootLoader objc.NSObject, cpuCount uint32, memorySize uint64) *objc.Pointer {
func NewVZVirtualMachineConfiguration(bootLoader objc.NSObject, cpuCount uint64, memorySize uint64) *objc.Pointer {
config := VZVirtualMachineConfiguration_New()
VZVirtualMachineConfiguration_SetBootLoader(config, bootLoader)
VZVirtualMachineConfiguration_SetCPUCount(config, uint64(cpuCount))
VZVirtualMachineConfiguration_SetCPUCount(config, cpuCount)
VZVirtualMachineConfiguration_SetMemorySize(config, memorySize)
return config
}
Expand Down
Loading