NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Update qemu-img flag checking

Browse Source 
For newer qemu-img, the help string for "backing file format" is
"[-F backing_fmt]".

Fix the wrong logic error by commit e997c268.

* src/storage/storage_backend.c
This commit is contained in:
Osier Yang 2011-03-10 15:02:28 +08:00
parent e997c268ef
commit d999376954
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/storage_backend.c
View File

@ -595,7 +595,8 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg)
start = strstr(help, " create "); start = strstr(help, " create ");
end = strstr(start, "\n"); end = strstr(start, "\n");
if ((tmp = strstr(start, "-F fmt")) && tmp < end) if (((tmp = strstr(start, "-F fmt")) && tmp < end) ||
((tmp = strstr(start, "-F backing_fmt")) && tmp < end))
ret = QEMU_IMG_BACKING_FORMAT_FLAG; ret = QEMU_IMG_BACKING_FORMAT_FLAG;
else if ((tmp = strstr(start, "[-o options]")) && tmp < end) else if ((tmp = strstr(start, "[-o options]")) && tmp < end)
ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; ret = QEMU_IMG_BACKING_FORMAT_OPTIONS;
@ -757,7 +758,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
}; };
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) {
imgargv[8] = "-o"; imgargv[8] = "-o";
imgargv[9] = "encryption=on"; imgargv[9] = "encryption=on";
} else { } else {
@ -837,7 +838,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
}; };
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) {
imgargv[6] = "-o"; imgargv[6] = "-o";
imgargv[7] = "encryption=on"; imgargv[7] = "encryption=on";
} else { } else {