From 0d5c05eac54cea775bf2af595ec30e44451e32d6 Mon Sep 17 00:00:00 2001 From: Liam Merwick Date: Wed, 29 Jul 2020 14:15:17 +0000 Subject: [PATCH] vendor: update govmm Bring support for '--no-reboot' QEMU parameter (intel/govmm#131) shortlog: qemu: Add NoReboot config Knob for qemuParams Signed-off-by: Liam Merwick --- Gopkg.lock | 4 ++-- Gopkg.toml | 2 +- vendor/github.com/intel/govmm/qemu/qemu.go | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1cf32d83a9..193b2c04ba 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -420,11 +420,11 @@ revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675" [[projects]] - digest = "1:ded834b4e437433e3f75a95041ca4e0013e1acd358218c833289986566108f67" + digest = "1:e800a48df8e5709baa6b78062d47d43829cddbc54871e049e8bbeb1aaf50fe40" name = "github.com/intel/govmm" packages = ["qemu"] pruneopts = "NUT" - revision = "af9e34b91ae99aff4b4ac126141259d34d98e9f2" + revision = "6c3315ba8a4262df4300b735b2c53ce3b15d21dd" [[projects]] digest = "1:dc74f6b065e6204ee3a90ce4209dae99126a110a4cd318f696a69a781916c849" diff --git a/Gopkg.toml b/Gopkg.toml index 87523bcfab..be8459e87e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -48,7 +48,7 @@ [[constraint]] name = "github.com/intel/govmm" - revision = "af9e34b91ae99aff4b4ac126141259d34d98e9f2" + revision = "6c3315ba8a4262df4300b735b2c53ce3b15d21dd" [[constraint]] name = "github.com/kata-containers/agent" diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go index 4716595cd7..d5a01c87a8 100644 --- a/vendor/github.com/intel/govmm/qemu/qemu.go +++ b/vendor/github.com/intel/govmm/qemu/qemu.go @@ -2122,6 +2122,9 @@ type Knobs struct { // Realtime will enable realtime QEMU Realtime bool + + // Exit instead of rebooting + NoReboot bool } // IOThread allows IO to be performed on a separate thread. @@ -2457,6 +2460,10 @@ func (config *Config) appendKnobs() { config.qemuParams = append(config.qemuParams, "-nographic") } + if config.Knobs.NoReboot { + config.qemuParams = append(config.qemuParams, "--no-reboot") + } + if config.Knobs.Daemonize { config.qemuParams = append(config.qemuParams, "-daemonize") }