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

qemu: Don't duplicate virGetLastErrorMessage

Browse Source 
These uses of virGetLastError message are just duplicating
virGetLastErrorMessage.
This commit is contained in:
Jovanka Gulicoska 2016-03-23 19:31:50 +01:00 committed by Cole Robinson
parent 98354e362c
commit 2c20574d5b
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_capabilities.c
View File

@ -3089,10 +3089,8 @@ virQEMUCapsInitCached(virQEMUCapsPtr qemuCaps, const char *cacheDir)
if (virQEMUCapsLoadCache(qemuCaps, capsfile, &qemuctime, &selfctime, if (virQEMUCapsLoadCache(qemuCaps, capsfile, &qemuctime, &selfctime,
&selfvers) < 0) { &selfvers) < 0) {
virErrorPtr err = virGetLastError();
VIR_WARN("Failed to load cached caps from '%s' for '%s': %s", VIR_WARN("Failed to load cached caps from '%s' for '%s': %s",
capsfile, qemuCaps->binary, err ? NULLSTR(err->message) : capsfile, qemuCaps->binary, virGetLastErrorMessage());
_("unknown error"));
virResetLastError(); virResetLastError();
ret = 0; ret = 0;
virQEMUCapsReset(qemuCaps); virQEMUCapsReset(qemuCaps);
@ -3320,9 +3318,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
/* @mon is supposed to be locked by callee */ /* @mon is supposed to be locked by callee */
if (qemuMonitorSetCapabilities(mon) < 0) { if (qemuMonitorSetCapabilities(mon) < 0) {
virErrorPtr err = virGetLastError();
VIR_DEBUG("Failed to set monitor capabilities %s", VIR_DEBUG("Failed to set monitor capabilities %s",
err ? err->message : "<unknown problem>"); virGetLastErrorMessage());
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
@ -3330,9 +3327,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
if (qemuMonitorGetVersion(mon, if (qemuMonitorGetVersion(mon,
&major, &minor, &micro, &major, &minor, &micro,
&package) < 0) { &package) < 0) {
virErrorPtr err = virGetLastError();
VIR_DEBUG("Failed to query monitor version %s", VIR_DEBUG("Failed to query monitor version %s",
err ? err->message : "<unknown problem>"); virGetLastErrorMessage());
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
@ -3561,15 +3557,13 @@ virQEMUCapsLogProbeFailure(const char *binary)
{ .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 }, { .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 },
{ .key = NULL }, { .key = NULL },
}; };
virErrorPtr err = virGetLastError();
virLogMessage(&virLogSelf, virLogMessage(&virLogSelf,
VIR_LOG_WARN, VIR_LOG_WARN,
__FILE__, __LINE__, __func__, __FILE__, __LINE__, __func__,
meta, meta,
_("Failed to probe capabilities for %s: %s"), _("Failed to probe capabilities for %s: %s"),
binary, err && err->message ? err->message : binary, virGetLastErrorMessage());
_("unknown failure"));
} }

9
src/qemu/qemu_driver.c
View File

@ -276,7 +276,6 @@ qemuAutostartDomain(virDomainObjPtr vm,
void *opaque) void *opaque)
{ {
struct qemuAutostartData *data = opaque; struct qemuAutostartData *data = opaque;
virErrorPtr err;
int flags = 0; int flags = 0;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(data->driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(data->driver);
int ret = -1; int ret = -1;
@ -290,19 +289,15 @@ qemuAutostartDomain(virDomainObjPtr vm,
if (vm->autostart && if (vm->autostart &&
!virDomainObjIsActive(vm)) { !virDomainObjIsActive(vm)) {
if (qemuProcessBeginJob(data->driver, vm) < 0) { if (qemuProcessBeginJob(data->driver, vm) < 0) {
err = virGetLastError();
VIR_ERROR(_("Failed to start job on VM '%s': %s"), VIR_ERROR(_("Failed to start job on VM '%s': %s"),
vm->def->name, vm->def->name, virGetLastErrorMessage());
err ? err->message : _("unknown error"));
goto cleanup; goto cleanup;
} }
if (qemuDomainObjStart(data->conn, data->driver, vm, flags, if (qemuDomainObjStart(data->conn, data->driver, vm, flags,
QEMU_ASYNC_JOB_START) < 0) { QEMU_ASYNC_JOB_START) < 0) {
err = virGetLastError();
VIR_ERROR(_("Failed to autostart VM '%s': %s"), VIR_ERROR(_("Failed to autostart VM '%s': %s"),
vm->def->name, vm->def->name, virGetLastErrorMessage());
err ? err->message : _("unknown error"));
} }
qemuProcessEndJob(data->driver, vm); qemuProcessEndJob(data->driver, vm);