treewide: migrate to qemu-kvm in toolchain-bundle
Change-Id: I42a10a9adf7bdccb83ef997c6d554140ffaade4b
Reviewed-on: https://review.monogon.dev/c/monogon/+/4052
Reviewed-by: Jan Schär <jan@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/test/launch/BUILD.bazel b/metropolis/test/launch/BUILD.bazel
index 6c76d5b..c03da7d 100644
--- a/metropolis/test/launch/BUILD.bazel
+++ b/metropolis/test/launch/BUILD.bazel
@@ -12,6 +12,7 @@
"swtpm.go",
],
data = [
+ "//build/toolchain/toolchain-bundle:qemu-kvm",
"//metropolis/cli/metroctl:metroctl_lite",
"//metropolis/node:oci_image_uncompressed",
"//metropolis/node/abloader",
@@ -40,6 +41,7 @@
"xInitramfsPath": "$(rlocationpath //metropolis/test/nanoswitch:initramfs )",
"xNodeImagePath": "$(rlocationpath //metropolis/node:oci_image_uncompressed )",
"xAbloaderPath": "$(rlocationpath //metropolis/node/abloader )",
+ "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
"//go/logging",
diff --git a/metropolis/test/launch/cluster.go b/metropolis/test/launch/cluster.go
index 118b82d..d2bbb4b 100644
--- a/metropolis/test/launch/cluster.go
+++ b/metropolis/test/launch/cluster.go
@@ -422,7 +422,7 @@
}
// Start the main qemu binary
- systemCmd := exec.CommandContext(options.Runtime.ctxT, "qemu-system-x86_64", qemuArgs...)
+ systemCmd := exec.CommandContext(options.Runtime.ctxT, xQEMUPath, qemuArgs...)
if options.ConnectToSocket != nil {
systemCmd.ExtraFiles = []*os.File{options.ConnectToSocket}
}
diff --git a/metropolis/test/launch/launch.go b/metropolis/test/launch/launch.go
index 3864eb2..c1453b5 100644
--- a/metropolis/test/launch/launch.go
+++ b/metropolis/test/launch/launch.go
@@ -23,6 +23,7 @@
xInitramfsPath string
xNodeImagePath string
xAbloaderPath string
+ xQEMUPath string
)
func init() {
@@ -32,6 +33,7 @@
&xSwtpmCertPath, &xCerttoolPath, &xMetroctlPath,
&xOvmfCodePath, &xOvmfVarsPath, &xKernelPath,
&xInitramfsPath, &xNodeImagePath, &xAbloaderPath,
+ &xQEMUPath,
} {
*path, err = runfiles.Rlocation(*path)
if err != nil {