github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

govmm: modify govmm to be compatible with qemu 2.8

Browse Source 
govmm has ExecuteBlockdevAdd() function and ExecuteBlockdevDel() function
doesn't compatible with qemu 2.8,because blockdev-add and x-blockdev-del usages
are different between qemu 2.7 and qemu 2.8

Follow the qemu 2.7 and qemu 2.8 qmp-commands.txt documents to modify ExecuteBlockdevAdd()
function and ExecuteBlockdevDel() function to be compatible with qemu 2.8

Signed-off-by: flyflypeng <jiangpengfei9@huawei.com>
This commit is contained in:
flyflypeng 2018-08-24 22:56:27 +08:00
parent cb112dba2c
commit ce070d11f7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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)
} }
if q.version.Major == 2 && q.version.Minor == 8 {
args["node-name"] = blockdevID
} else {
args["id"] = blockdevID args["id"] = blockdevID
}
return q.executeCommand(ctx, "x-blockdev-del", args, nil) return q.executeCommand(ctx, "x-blockdev-del", args, nil)
} }