External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: add ability to associate a string message with taint warning

Browse Source 
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-01-22 11:44:32 +00:00
parent 2273065746
commit 30626ed15b
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/qemu/qemu_domain.c
View File

@ -6197,22 +6197,51 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj,
virDomainTaintFlags taint,
qemuDomainLogContextPtr logCtxt)
{
qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL);
}
void qemuDomainObjTaintMsg(virQEMUDriverPtr driver,
virDomainObjPtr obj,
virDomainTaintFlags taint,
qemuDomainLogContextPtr logCtxt,
const char *fmt, ...)
{
virErrorPtr orig_err = NULL;
g_autofree char *timestamp = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN];
int rc;
g_autofree char *extra = NULL;
const char *extraprefix = "";
const char *extramsg = "";
const char *extrasuffix = "";
va_list args;
if (!virDomainObjTaint(obj, taint))
return;
if (virDomainObjTaint(obj, taint)) {
/* If an extra message was given we must always
* emit the taint warning, otherwise it is a
* one-time only warning per VM
*/
if (!fmt)
return;
}
virUUIDFormat(obj->def->uuid, uuidstr);
VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s",
if (fmt) {
va_start(args, fmt);
extraprefix = " (";
extramsg = extra = g_strdup_vprintf(fmt, args);
extrasuffix = ")";
va_end(args);
}
VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s%s%s%s",
obj->def->id,
obj->def->name,
uuidstr,
virDomainTaintTypeToString(taint));
virDomainTaintTypeToString(taint),
extraprefix, extramsg, extrasuffix);
/* We don't care about errors logging taint info, so
* preserve original error, and clear any error that
@ -6224,16 +6253,18 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver,
if (logCtxt) {
rc = qemuDomainLogContextWrite(logCtxt,
"%s: Domain id=%d is tainted: %s\n",
"%s: Domain id=%d is tainted: %s%s%s%s\n",
timestamp,
obj->def->id,
virDomainTaintTypeToString(taint));
virDomainTaintTypeToString(taint),
extraprefix, extramsg, extrasuffix);
} else {
rc = qemuDomainLogAppendMessage(driver, obj,
"%s: Domain id=%d is tainted: %s\n",
"%s: Domain id=%d is tainted: %s%s%s%s\n",
timestamp,
obj->def->id,
virDomainTaintTypeToString(taint));
virDomainTaintTypeToString(taint),
extraprefix, extramsg, extrasuffix);
}
if (rc < 0)

7
src/qemu/qemu_domain.h
View File

@ -565,6 +565,13 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver,
virDomainTaintFlags taint,
qemuDomainLogContextPtr logCtxt);
void qemuDomainObjTaintMsg(virQEMUDriverPtr driver,
virDomainObjPtr obj,
virDomainTaintFlags taint,
qemuDomainLogContextPtr logCtxt,
const char *msg,
...) G_GNUC_PRINTF(5, 6);
void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj,
qemuDomainLogContextPtr logCtxt,