提交 0f5e3f13 编写于 作者: D Daniel P. Berrange

Initialize qemuImageBinary path at startup

上级 34589575
...@@ -177,7 +177,7 @@ struct _virQEMUDriver { ...@@ -177,7 +177,7 @@ struct _virQEMUDriver {
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virDomainObjListPtr domains; virDomainObjListPtr domains;
/* Lazy-load on first use. Unsafe. XXX */ /* Immutable pointer */
char *qemuImgBinary; char *qemuImgBinary;
/* Immutable pointer, lockless APIs. Pointless abstraction */ /* Immutable pointer, lockless APIs. Pointless abstraction */
......
...@@ -1612,14 +1612,9 @@ cleanup: ...@@ -1612,14 +1612,9 @@ cleanup:
const char * const char *
qemuFindQemuImgBinary(virQEMUDriverPtr driver) qemuFindQemuImgBinary(virQEMUDriverPtr driver)
{ {
if (!driver->qemuImgBinary) { if (!driver->qemuImgBinary)
driver->qemuImgBinary = virFindFileInPath("kvm-img"); virReportError(VIR_ERR_INTERNAL_ERROR,
if (!driver->qemuImgBinary) "%s", _("unable to find kvm-img or qemu-img"));
driver->qemuImgBinary = virFindFileInPath("qemu-img");
if (!driver->qemuImgBinary)
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("unable to find kvm-img or qemu-img"));
}
return driver->qemuImgBinary; return driver->qemuImgBinary;
} }
......
...@@ -738,6 +738,9 @@ qemuStartup(bool privileged, ...@@ -738,6 +738,9 @@ qemuStartup(bool privileged,
virStrerror(-rc, ebuf, sizeof(ebuf))); virStrerror(-rc, ebuf, sizeof(ebuf)));
} }
qemu_driver->qemuImgBinary = virFindFileInPath("kvm-img");
if (!qemu_driver->qemuImgBinary)
qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img");
if (!(qemu_driver->lockManager = if (!(qemu_driver->lockManager =
virLockManagerPluginNew(cfg->lockManagerName ? virLockManagerPluginNew(cfg->lockManagerName ?
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册