Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to v2.5 schema GuestStateFileType to support release target OS #1318

Merged
merged 1 commit into from
Mar 11, 2022
Merged

Revert to v2.5 schema GuestStateFileType to support release target OS #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions internal/uvm/create_lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,13 @@ Example JSON document produced once the hcsschema.ComputeSytem returned by makeL
},
"GuestState": {
"GuestStateFilePath": "d:\\ken\\aug27\\gcsinitnew.vmgs",
"GuestStateFileType": "BlockStorage",
"GuestStateFileType": "FileMode",
"ForceTransientState": true
},
"SecuritySettings": {
"Isolation": {
"IsolationType": "SecureNestedPaging",
"LaunchData": "kBifgKNijdHjxdSUshmavrNofo2B01LiIi1cr8R4ytI=",
"HclEnabled": true
"LaunchData": "kBifgKNijdHjxdSUshmavrNofo2B01LiIi1cr8R4ytI="
}
},
"Version": {
Expand Down Expand Up @@ -381,7 +380,7 @@ func makeLCOWVMGSDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_

doc.VirtualMachine.GuestState = &hcsschema.GuestState{
GuestStateFilePath: vmgsFullPath,
GuestStateFileType: "BlockStorage",
GuestStateFileType: "FileMode",
ForceTransientState: true, // tell HCS that this is just the source of the images, not ongoing state
}

Expand Down Expand Up @@ -426,7 +425,7 @@ func makeLCOWSecurityDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM)
Isolation: &hcsschema.IsolationSettings{
IsolationType: "SecureNestedPaging",
LaunchData: securityPolicyHash,
HclEnabled: true,
// HclEnabled: true, /* Not available in schema 2.5 - REQUIRED when using BlockStorage in 2.6 */
},
}

Expand Down
9 changes: 4 additions & 5 deletions test/vendor/github.com/Microsoft/hcsshim/internal/uvm/create_lcow.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.