From 991fe81dff4c54e3b02e2cb09ee2906f33cbf382 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 22 Mar 2018 02:52:12 +0000 Subject: [PATCH] vendor: update govmm package To include support for qemu initrd config. Signed-off-by: Peng Tao --- Gopkg.lock | 4 ++-- Gopkg.toml | 2 +- vendor/github.com/intel/govmm/qemu/qemu.go | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 308ddac5c7..d111131745 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -86,7 +86,7 @@ [[projects]] name = "github.com/intel/govmm" packages = ["qemu"] - revision = "e87160f8ea39dfe558bf6761f74717d191d82493" + revision = "82c67ab9b21e8cd0042b6c2d3be2d3705a511603" [[projects]] name = "github.com/kata-containers/agent" @@ -250,6 +250,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "a50c12d36c3881a8fdc1c46a9a2ef78edc27ae1a1ec0c448799f37c589209108" + inputs-digest = "bb2ac1696f8e90526e492a6d54362549094fa844c17fbd06c727198bff6667ef" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 9d2ab2ec7d..81c3705509 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -56,7 +56,7 @@ [[constraint]] name = "github.com/intel/govmm" - revision = "e87160f8ea39dfe558bf6761f74717d191d82493" + revision = "82c67ab9b21e8cd0042b6c2d3be2d3705a511603" [[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 218507808d..89d053fe95 100644 --- a/vendor/github.com/intel/govmm/qemu/qemu.go +++ b/vendor/github.com/intel/govmm/qemu/qemu.go @@ -1117,6 +1117,9 @@ type Kernel struct { // Path is the guest kernel path on the host filesystem. Path string + // InitrdPath is the guest initrd path on the host filesystem. + InitrdPath string + // Params is the kernel parameters string. Params string } @@ -1395,6 +1398,11 @@ func (config *Config) appendKernel() { config.qemuParams = append(config.qemuParams, "-kernel") config.qemuParams = append(config.qemuParams, config.Kernel.Path) + if config.Kernel.InitrdPath != "" { + config.qemuParams = append(config.qemuParams, "-initrd") + config.qemuParams = append(config.qemuParams, config.Kernel.InitrdPath) + } + if config.Kernel.Params != "" { config.qemuParams = append(config.qemuParams, "-append") config.qemuParams = append(config.qemuParams, config.Kernel.Params)