mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-07 06:45:45 +00:00
qemu_capabilities: Log probe failure in virQEMUCapsInitQMPSingle
Let's push the call to virQEMUCapsLogProbeFailure down the stack to where the probing failure is detected. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
cf335683de
commit
b459fde50b
@ -4351,6 +4351,26 @@ virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#define MESSAGE_ID_CAPS_PROBE_FAILURE "8ae2f3fb-2dbe-498e-8fbd-012d40afa361"
|
||||||
|
|
||||||
|
static void
|
||||||
|
virQEMUCapsLogProbeFailure(const char *binary)
|
||||||
|
{
|
||||||
|
virLogMetadata meta[] = {
|
||||||
|
{ .key = "MESSAGE_ID", .s = MESSAGE_ID_CAPS_PROBE_FAILURE, .iv = 0 },
|
||||||
|
{ .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 },
|
||||||
|
{ .key = NULL },
|
||||||
|
};
|
||||||
|
|
||||||
|
virLogMessage(&virLogSelf,
|
||||||
|
VIR_LOG_WARN,
|
||||||
|
__FILE__, __LINE__, __func__,
|
||||||
|
meta,
|
||||||
|
_("Failed to probe capabilities for %s: %s"),
|
||||||
|
binary, virGetLastErrorMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virQEMUCapsInitQMPSingle(virQEMUCapsPtr qemuCaps,
|
virQEMUCapsInitQMPSingle(virQEMUCapsPtr qemuCaps,
|
||||||
const char *libDir,
|
const char *libDir,
|
||||||
@ -4375,6 +4395,9 @@ virQEMUCapsInitQMPSingle(virQEMUCapsPtr qemuCaps,
|
|||||||
ret = virQEMUCapsInitQMPMonitor(qemuCaps, proc->mon);
|
ret = virQEMUCapsInitQMPMonitor(qemuCaps, proc->mon);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
if (ret < 0)
|
||||||
|
virQEMUCapsLogProbeFailure(qemuCaps->binary);
|
||||||
|
|
||||||
qemuProcessQMPStop(proc);
|
qemuProcessQMPStop(proc);
|
||||||
qemuProcessQMPFree(proc);
|
qemuProcessQMPFree(proc);
|
||||||
return ret;
|
return ret;
|
||||||
@ -4404,26 +4427,6 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define MESSAGE_ID_CAPS_PROBE_FAILURE "8ae2f3fb-2dbe-498e-8fbd-012d40afa361"
|
|
||||||
|
|
||||||
static void
|
|
||||||
virQEMUCapsLogProbeFailure(const char *binary)
|
|
||||||
{
|
|
||||||
virLogMetadata meta[] = {
|
|
||||||
{ .key = "MESSAGE_ID", .s = MESSAGE_ID_CAPS_PROBE_FAILURE, .iv = 0 },
|
|
||||||
{ .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 },
|
|
||||||
{ .key = NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
virLogMessage(&virLogSelf,
|
|
||||||
VIR_LOG_WARN,
|
|
||||||
__FILE__, __LINE__, __func__,
|
|
||||||
meta,
|
|
||||||
_("Failed to probe capabilities for %s: %s"),
|
|
||||||
binary, virGetLastErrorMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virQEMUCapsPtr
|
virQEMUCapsPtr
|
||||||
virQEMUCapsNewForBinaryInternal(virArch hostArch,
|
virQEMUCapsNewForBinaryInternal(virArch hostArch,
|
||||||
const char *binary,
|
const char *binary,
|
||||||
@ -4462,10 +4465,8 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virQEMUCapsInitQMP(qemuCaps, libDir, runUid, runGid, &qmperr) < 0) {
|
if (virQEMUCapsInitQMP(qemuCaps, libDir, runUid, runGid, &qmperr) < 0)
|
||||||
virQEMUCapsLogProbeFailure(binary);
|
|
||||||
goto error;
|
goto error;
|
||||||
}
|
|
||||||
|
|
||||||
qemuCaps->libvirtCtime = virGetSelfLastChanged();
|
qemuCaps->libvirtCtime = virGetSelfLastChanged();
|
||||||
qemuCaps->libvirtVersion = LIBVIR_VERSION_NUMBER;
|
qemuCaps->libvirtVersion = LIBVIR_VERSION_NUMBER;
|
||||||
|
Loading…
Reference in New Issue
Block a user