qemu: fix a const-correctness issue

Generally, functions which return malloc'd strings should be typed
as 'char *', not 'const char *', to make it obvious that the caller
is responsible to free things.  free(const char *) fails to compile,
and although we have a cast embedded in VIR_FREE to work around poor
code that frees const char *, it's better to not rely on that hack.

* src/qemu/qemu_driver.c (qemuDiskPathToAlias): Change return type.
(qemuDomainBlockJobImpl): Update caller.
This commit is contained in:
Eric Blake 2011-11-23 07:26:32 -07:00
parent 3ac26e2645
commit db2f680775

View File

@ -10565,8 +10565,9 @@ cleanup:
return ret;
}
static const char *
qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) {
static char *
qemuDiskPathToAlias(virDomainObjPtr vm, const char *path)
{
int i;
char *ret = NULL;
virDomainDiskDefPtr disk;
@ -10605,7 +10606,7 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path,
virDomainObjPtr vm = NULL;
qemuDomainObjPrivatePtr priv;
char uuidstr[VIR_UUID_STRING_BUFLEN];
const char *device = NULL;
char *device = NULL;
int ret = -1;
qemuDriverLock(driver);