github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

vendor: update govmm

Browse Source 
s390x doesn't support memory backend file and needs to share the image instead

Fixes: #2049

details vendor changes:

cb9f640 virtio-blk: Add support for share-rw flag

Signed-off-by: Jan Schintag <jan.schintag@de.ibm.com>
This commit is contained in:
Jan Schintag 2019-09-16 10:14:30 +02:00
parent 74e7d3dba7
commit 7965baab62
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gopkg.lock generated
View File

@ -390,11 +390,11 @@
revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675" revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"
[[projects]] [[projects]]
digest = "1:1a7407072d9447e0e39148aa462f0be26261e29ff14679ccee4fbed106c1a766" digest = "1:b3ab3b3615583d7a374d4803ea2b71f173a4d8f4d594210e0fc8e9fc7c5a49c9"
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
packages = ["qemu"] packages = ["qemu"]
pruneopts = "NUT" pruneopts = "NUT"
revision = "ee460e3008d48043f8561628d1d5308357d72cf6" revision = "8cba5a8e5f2816f26f9dc34b8ea968279a5a76eb"
[[projects]] [[projects]]
digest = "1:22e399f891fccaac4700943a9465f2623bb361653d5e0d4a9974573cd5e69070" digest = "1:22e399f891fccaac4700943a9465f2623bb361653d5e0d4a9974573cd5e69070"

2
Gopkg.toml
View File

@ -48,7 +48,7 @@
[[constraint]] [[constraint]]
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
revision = "ee460e3008d48043f8561628d1d5308357d72cf6" revision = "8cba5a8e5f2816f26f9dc34b8ea968279a5a76eb"
[[constraint]] [[constraint]]
name = "github.com/kata-containers/agent" name = "github.com/kata-containers/agent"

7
vendor/github.com/intel/govmm/qemu/qemu.go generated vendored
View File

@ -728,6 +728,9 @@ type BlockDevice struct {
// DevNo identifies the ccw devices for s390x architecture // DevNo identifies the ccw devices for s390x architecture
DevNo string DevNo string
// ShareRW enables multiple qemu instances to share the File
ShareRW bool
} }
// Valid returns true if the BlockDevice structure is valid and complete. // Valid returns true if the BlockDevice structure is valid and complete.
@ -766,6 +769,10 @@ func (blkdev BlockDevice) QemuParams(config *Config) []string {
deviceParams = append(deviceParams, fmt.Sprintf(",devno=%s", blkdev.DevNo)) deviceParams = append(deviceParams, fmt.Sprintf(",devno=%s", blkdev.DevNo))
} }
if blkdev.ShareRW {
deviceParams = append(deviceParams, fmt.Sprintf(",share-rw=on"))
}
blkParams = append(blkParams, fmt.Sprintf("id=%s", blkdev.ID)) blkParams = append(blkParams, fmt.Sprintf("id=%s", blkdev.ID))
blkParams = append(blkParams, fmt.Sprintf(",file=%s", blkdev.File)) blkParams = append(blkParams, fmt.Sprintf(",file=%s", blkdev.File))
blkParams = append(blkParams, fmt.Sprintf(",aio=%s", blkdev.AIO)) blkParams = append(blkParams, fmt.Sprintf(",aio=%s", blkdev.AIO))