github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-31 23:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42 from woshijpf/fix-qemu-2.8

Browse Source 
govmm: modify govmm to be compatible with qemu 2.8
This commit is contained in:
Julio Montes 2018-08-24 11:52:20 -05:00 committed by GitHub
commit 1a16b5f98f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qemu/qmp.go
View File

@ -657,7 +657,7 @@ func (q *QMP) ExecuteBlockdevAdd(ctx context.Context, device, blockdevID string)
}, },
} }
if q.version.Major > 2 || (q.version.Major == 2 && q.version.Minor >= 9) { if q.version.Major > 2 || (q.version.Major == 2 && q.version.Minor >= 8) {
blockdevArgs["node-name"] = blockdevID blockdevArgs["node-name"] = blockdevID
args = blockdevArgs args = blockdevArgs
} else { } else {
@ -746,7 +746,12 @@ func (q *QMP) ExecuteBlockdevDel(ctx context.Context, blockdevID string) error {
return q.executeCommand(ctx, "blockdev-del", args, nil) return q.executeCommand(ctx, "blockdev-del", args, nil)
} }
args["id"] = blockdevID if q.version.Major == 2 && q.version.Minor == 8 {
args["node-name"] = blockdevID
} else {
args["id"] = blockdevID
}
return q.executeCommand(ctx, "x-blockdev-del", args, nil) return q.executeCommand(ctx, "x-blockdev-del", args, nil)
} }