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
11 changes: 5 additions & 6 deletions src/windows/wslaservice/exe/WSLAVirtualMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,13 @@ void WSLAVirtualMachine::Start()
}
else
{
hcs::VirtualPMemController pmemController;
pmemController.MaximumCount = 0;
pmemController.MaximumSizeBytes = 0;
hcs::VirtualPMemController pmemController{};
pmemController.Backing = hcs::VirtualPMemBackingType::Virtual;
ULONG nextDeviceId = 0;
auto attachPmemDisk = [&](PCWSTR path) {
ULONG deviceId = pmemController.MaximumCount;
pmemController.MaximumCount += 1;
hcs::VirtualPMemDevice vhd;
auto deviceId = nextDeviceId;
nextDeviceId += 1;
hcs::VirtualPMemDevice vhd{};
vhd.HostPath = path;
vhd.ReadOnly = true;
vhd.ImageFormat = hcs::VirtualPMemImageFormat::Vhd1;
Expand Down
3 changes: 0 additions & 3 deletions test/windows/WSLATests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1028,9 +1028,6 @@ class WSLATests
{
WSL2_TEST_ONLY();

LogSkipped("Skipping pmem test since mounting the WSLA VHD currently fails");
return;

// Test with SCSI boot VHDs.
{
auto settings = GetDefaultSessionSettings();
Expand Down