External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: remove support for /usr/bin/kvm-img

Browse Source 
This an ubuntu/debian packaging convention. At one point it may have
been an actually different binary, but at least as of ubuntu precise
(the oldest supported ubuntu distro, released april 2012) kvm-img is
just a symlink to qemu-img for back compat.

I think it's safe to drop support for it
This commit is contained in:
Cole Robinson 2016-04-15 17:00:40 -04:00
parent 1196fed2e3
commit 487d211d20
6 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_domain.c
View File

@ -3072,7 +3072,7 @@ qemuFindQemuImgBinary(virQEMUDriverPtr driver)
{ {
if (!driver->qemuImgBinary) if (!driver->qemuImgBinary)
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("unable to find kvm-img or qemu-img")); "%s", _("unable to find qemu-img"));
return driver->qemuImgBinary; return driver->qemuImgBinary;
} }

2
src/qemu/qemu_driver.c
View File

@ -718,8 +718,6 @@ qemuStateInitialize(bool privileged,
goto error; goto error;
} }
qemu_driver->qemuImgBinary = virFindFileInPath("kvm-img");
if (!qemu_driver->qemuImgBinary)
qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img"); qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img");
if (!(qemu_driver->lockManager = if (!(qemu_driver->lockManager =

13
src/storage/storage_backend.c
View File

@ -153,7 +153,6 @@ static virStorageFileBackendPtr fileBackends[] = {
enum { enum {
TOOL_QEMU_IMG, TOOL_QEMU_IMG,
TOOL_KVM_IMG,
}; };
#define READ_BLOCK_SIZE_DEFAULT (1024 * 1024) #define READ_BLOCK_SIZE_DEFAULT (1024 * 1024)
@ -1234,14 +1233,10 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1); virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1);
/* KVM is usually ahead of qemu on features, so try that first */
create_tool = virFindFileInPath("kvm-img");
if (!create_tool)
create_tool = virFindFileInPath("qemu-img"); create_tool = virFindFileInPath("qemu-img");
if (!create_tool) { if (!create_tool) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("unable to find kvm-img or qemu-img")); "%s", _("unable to find qemu-img"));
return -1; return -1;
} }
@ -1266,7 +1261,6 @@ virStorageBackendBuildVolFrom
virStorageBackendFSImageToolTypeToFunc(int tool_type) virStorageBackendFSImageToolTypeToFunc(int tool_type)
{ {
switch (tool_type) { switch (tool_type) {
case TOOL_KVM_IMG:
case TOOL_QEMU_IMG: case TOOL_QEMU_IMG:
return virStorageBackendCreateQemuImg; return virStorageBackendCreateQemuImg;
default: default:
@ -1284,11 +1278,8 @@ virStorageBackendFindFSImageTool(char **tool)
int tool_type = -1; int tool_type = -1;
char *tmp = NULL; char *tmp = NULL;
if ((tmp = virFindFileInPath("kvm-img")) != NULL) { if ((tmp = virFindFileInPath("qemu-img")) != NULL)
tool_type = TOOL_KVM_IMG;
} else if ((tmp = virFindFileInPath("qemu-img")) != NULL) {
tool_type = TOOL_QEMU_IMG; tool_type = TOOL_QEMU_IMG;
}
if (tool) if (tool)
*tool = tmp; *tool = tmp;

6
src/storage/storage_backend_fs.c
View File

@ -1343,14 +1343,10 @@ virStorageBackendFilesystemResizeQemuImg(const char *path,
char *img_tool; char *img_tool;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
/* KVM is usually ahead of qemu on features, so try that first */
img_tool = virFindFileInPath("kvm-img");
if (!img_tool)
img_tool = virFindFileInPath("qemu-img"); img_tool = virFindFileInPath("qemu-img");
if (!img_tool) { if (!img_tool) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("unable to find kvm-img or qemu-img")); "%s", _("unable to find qemu-img"));
return -1; return -1;
} }

2
src/util/virfile.c
View File

@ -1580,7 +1580,7 @@ virFileIsLink(const char *linkpath)
/* /*
* Finds a requested executable file in the PATH env. e.g.: * Finds a requested executable file in the PATH env. e.g.:
* "kvm-img" will return "/usr/bin/kvm-img" * "qemu-img" will return "/usr/bin/qemu-img"
* *
* You must free the result * You must free the result
*/ */

2
tests/virstoragetest.c
View File

@ -137,8 +137,6 @@ testPrepImages(void)
char *buf = NULL; char *buf = NULL;
bool compat = false; bool compat = false;
qemuimg = virFindFileInPath("kvm-img");
if (!qemuimg)
qemuimg = virFindFileInPath("qemu-img"); qemuimg = virFindFileInPath("qemu-img");
if (!qemuimg) if (!qemuimg)
goto skip; goto skip;