@@ -14,7 +14,7 @@ constexpr HRESULT c_notSupported = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
1414VmCreateRequest CreateRequest ()
1515{
1616 VmCreateRequest request;
17- THROW_IF_FAILED (CoCreateGuid (&request.VmId ));
17+ THROW_IF_FAILED (CoCreateGuid (&request.Identity . VmId ));
1818 request.Processor .Count = 2 ;
1919 request.Memory .SizeBytes = 512 * c_mib;
2020 request.Boot .KernelPath = L" C:\\ images\\ kernel" ;
@@ -28,7 +28,7 @@ VmCreateRequest CreateRunnableRequest()
2828 const auto basePath = wsl::windows::common::wslutil::GetBasePath ();
2929 request.Boot .KernelPath = basePath / L" kernel" ;
3030 request.Boot .InitrdPath = basePath / LXSS_VM_MODE_INITRD_NAME ;
31- request.Boot .GuestCommandLine = L" panic=-1" ;
31+ request.Boot .KernelCommandLine = L" panic=-1" ;
3232 return request;
3333}
3434
@@ -91,20 +91,19 @@ class OpenVmmVirtualMachineBackendTests
9191 {
9292 SKIP_TEST_ARM64 ();
9393 auto request = CreateRequest ();
94- request.Boot .GuestCommandLine = L" personality=caller console=hvc0" ;
95- request.Boot .UserCommandLine = L" console=ttyS0 custom=value" ;
94+ request.Boot .KernelCommandLine = L" personality=caller console=hvc0 console=ttyS0 custom=value" ;
9695 request.BootDisks .push_back (CreateDisk (L" arbitrary-key" ));
9796 request.BootDisks [0 ].Disk .ReadOnly = false ;
9897 const auto description = ValidateCreateRequest (request);
9998
100- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , description.Identity .VmId ));
99+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , description.Identity .VmId ));
101100 VERIFY_ARE_EQUAL (request.Processor .Count , description.Processor .Count );
102101 VERIFY_ARE_EQUAL (request.Memory .SizeBytes , description.Memory .SizeBytes );
103102 VERIFY_ARE_EQUAL (VmBootMethod::LinuxDirect, description.Boot .Method );
104- VERIFY_ARE_EQUAL (request.Boot .GuestCommandLine + L" " + request. Boot . UserCommandLine , description.Boot .KernelCommandLine );
103+ VERIFY_ARE_EQUAL (request.Boot .KernelCommandLine , description.Boot .KernelCommandLine );
105104 VERIFY_ARE_EQUAL (size_t {1 }, description.BootDisks .size ());
106105 const auto & disk = description.BootDisks .at (L" arbitrary-key" );
107- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , disk.Id .Owner .VmId ));
106+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , disk.Id .Owner .VmId ));
108107 VERIFY_ARE_EQUAL (UINT64 {1 }, disk.Id .Value );
109108 VERIFY_ARE_EQUAL (UINT32 {0 }, disk.GuestAddress .Lun );
110109 VERIFY_IS_FALSE (disk.ReadOnly );
@@ -153,13 +152,13 @@ class OpenVmmVirtualMachineBackendTests
153152 const auto description = ValidateCreateRequest (request);
154153 VERIFY_ARE_EQUAL (size_t {1 }, description.NetworkAdapters .size ());
155154 const auto & adapter = description.NetworkAdapters .at (L" eth0" );
156- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , adapter.Id .Owner .VmId ));
155+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , adapter.Id .Owner .VmId ));
157156 VERIFY_ARE_EQUAL (UINT64 {1 }, adapter.Id .Value );
158157 VERIFY_IS_TRUE (adapter.GuestInstanceId .has_value ());
159158 VERIFY_IS_FALSE (IsEqualGUID (GUID_NULL , adapter.GuestInstanceId .value ()));
160159 VERIFY_IS_TRUE (adapter.EffectiveConfiguration .ClientMac .Bytes == request.NetworkAdapters [0 ].Configuration .ClientMac .Bytes );
161160
162- THROW_IF_FAILED (CoCreateGuid (&request.VmId ));
161+ THROW_IF_FAILED (CoCreateGuid (&request.Identity . VmId ));
163162 const auto other = ValidateCreateRequest (request).NetworkAdapters .at (L" eth0" );
164163 VERIFY_ARE_EQUAL (adapter.Id .Value , other.Id .Value );
165164 VERIFY_IS_FALSE (IsEqualGUID (adapter.Id .Owner .VmId , other.Id .Owner .VmId ));
@@ -225,7 +224,7 @@ class OpenVmmVirtualMachineBackendTests
225224 }
226225 const auto first = ValidateCreateRequest (request);
227226 VERIFY_ARE_EQUAL (UINT32 {253 }, first.BootDisks .at (L" 253" ).GuestAddress .Lun );
228- THROW_IF_FAILED (CoCreateGuid (&request.VmId ));
227+ THROW_IF_FAILED (CoCreateGuid (&request.Identity . VmId ));
229228 const auto second = ValidateCreateRequest (request);
230229 VERIFY_ARE_EQUAL (first.BootDisks .at (L" 0" ).Id .Value , second.BootDisks .at (L" 0" ).Id .Value );
231230 VERIFY_IS_FALSE (IsEqualGUID (first.BootDisks .at (L" 0" ).Id .Owner .VmId , second.BootDisks .at (L" 0" ).Id .Owner .VmId ));
@@ -271,9 +270,9 @@ class OpenVmmVirtualMachineBackendTests
271270 {
272271 SKIP_TEST_ARM64 ();
273272 auto request = CreateRequest ();
274- request.VmId = GUID_NULL ;
273+ request.Identity . VmId = GUID_NULL ;
275274 VERIFY_ARE_EQUAL (E_INVALIDARG , DescribeResult (request));
276- THROW_IF_FAILED (CoCreateGuid (&request.VmId ));
275+ THROW_IF_FAILED (CoCreateGuid (&request.Identity . VmId ));
277276 request.Boot .KernelPath = L" relative-kernel" ;
278277 VERIFY_ARE_EQUAL (E_INVALIDARG , DescribeResult (request));
279278 request.Boot .KernelPath = L" C:\\ images\\ kernel" ;
@@ -318,7 +317,7 @@ class OpenVmmVirtualMachineBackendTests
318317 VERIFY_ARE_EQUAL (c_notSupported, OperationResult ([&] { backend->CreateFileSystemDevice (fileSystemRequest); }));
319318 fileSystemRequest.Transport .Layout = VmVirtioFsLayout::SingleShare;
320319 const auto fileSystemDevice = backend->CreateFileSystemDevice (fileSystemRequest);
321- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , fileSystemDevice.Id .Owner .VmId ));
320+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , fileSystemDevice.Id .Owner .VmId ));
322321 VERIFY_ARE_EQUAL (VmFileSystemDeviceState::Prepared, fileSystemDevice.State );
323322 VERIFY_ARE_EQUAL (
324323 HRESULT_FROM_WIN32 (ERROR_ALREADY_EXISTS ), OperationResult ([&] { backend->CreateFileSystemDevice (fileSystemRequest); }));
@@ -329,7 +328,7 @@ class OpenVmmVirtualMachineBackendTests
329328 VERIFY_ARE_EQUAL (c_notSupported, OperationResult ([&] { backend->AddFileSystemShare (fileSystemDevice.Id , shareRequest); }));
330329 shareRequest.Options .MountOptions .clear ();
331330 const auto share = backend->AddFileSystemShare (fileSystemDevice.Id , shareRequest);
332- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , share.Id .Owner .VmId ));
331+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , share.Id .Owner .VmId ));
333332 VERIFY_ARE_EQUAL (fileSystemDevice.Id .Value , share.Device .Value );
334333 VERIFY_ARE_EQUAL (fileSystemRequest.Transport .Tag , share.GuestAddress .Tag );
335334 VERIFY_ARE_EQUAL (HRESULT_FROM_WIN32 (ERROR_ALREADY_EXISTS ), OperationResult ([&] {
@@ -345,7 +344,7 @@ class OpenVmmVirtualMachineBackendTests
345344 backend->RemoveFileSystemShare (replacementShare.Id );
346345
347346 const auto network = backend->GetDescription ().NetworkAdapters .at (networkRequest.Tag );
348- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , network.Id .Owner .VmId ));
347+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , network.Id .Owner .VmId ));
349348 VERIFY_IS_TRUE (network.GuestInstanceId .has_value ());
350349 VERIFY_ARE_EQUAL (networkRequest.Tag , network.Tag );
351350 VERIFY_ARE_NOT_EQUAL (network.Id .Value , fileSystemDevice.Id .Value );
@@ -364,7 +363,7 @@ class OpenVmmVirtualMachineBackendTests
364363 THROW_IF_FAILED (CoCreateGuid (&invalidNetwork.Owner .VmId ));
365364 VERIFY_ARE_EQUAL (E_INVALIDARG , OperationResult ([&] { backend->BindPort (invalidNetwork, bindingRequest); }));
366365 const auto binding = backend->BindPort (network.Id , bindingRequest);
367- VERIFY_IS_TRUE (IsEqualGUID (request.VmId , binding.Id .Owner .VmId ));
366+ VERIFY_IS_TRUE (IsEqualGUID (request.Identity . VmId , binding.Id .Owner .VmId ));
368367 VERIFY_ARE_EQUAL (network.Id .Value , binding.Device .Value );
369368 VERIFY_ARE_EQUAL (bindingRequest.Listen .Port , binding.EffectiveListen .Port );
370369 VERIFY_ARE_EQUAL (
0 commit comments