Skip to content

[ms/release/0.1] backport a few fixes #2489

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

Merged
anmaxvl merged 3 commits into from
Jul 31, 2025
Merged

[ms/release/0.1] backport a few fixes #2489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8651792
lcow: disable virtio-vsock init (#2461)
anmaxvl Jul 2, 2025
e00a172
log `mkfs.ext4` stderr output (#2474)
anmaxvl Jul 10, 2025
6f9af87
remove WS2019 runner
anmaxvl Jul 31, 2025
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
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,8 @@ jobs:
fail-fast: false
matrix:
name:
[windows-2022, windows-2019]
[windows-2022]
include:
- name: "windows-2019"
runner: [self-hosted, 1ES.Pool=containerplat-github-runner-pool-east-us-2, 1ES.ImageOverride=github-mms-ws2019-containers-enabled]
- name: "windows-2022"
runner: [self-hosted, 1ES.Pool=containerplat-github-runner-pool-east-us-2, 1ES.ImageOverride=github-mms-ws2022-containers-enabled]
steps:
Expand Down Expand Up @@ -404,7 +402,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022]

steps:
- name: Checkout hcsshim
Expand Down
1 change: 1 addition & 0 deletions internal/lcow/scratch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ func CreateScratch(ctx context.Context, lcowUVM *uvm.UtilityVM, destFile string,
err = cmd.Run()
cancel()
if err != nil {
log.G(ctx).WithError(err).WithField("stderr", mkfsStderr.String()).Error("mkfs.ext4 failed")
return fmt.Errorf("failed to `%+v` following hot-add %s to utility VM: %w", cmd.Spec.Args, destFile, err)
}

Expand Down
4 changes: 4 additions & 0 deletions internal/uvm/create_lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,10 @@ func makeLCOWDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_ *hcs
}
}

// Explicitly disable virtio_vsock_init, to make sure that we use hv_sock transport. For kernels built without
// virtio-vsock this is a no-op.
kernelArgs += " initcall_blacklist=virtio_vsock_init"

vmDebugging := false
if opts.ConsolePipe != "" {
vmDebugging = true
Expand Down