From: Peter Krempa Date: Wed, 1 Mar 2023 16:03:56 +0000 (+0100) Subject: qemu: domain: Unexport qemuDomainObjTaintMsg X-Git-Tag: v9.2.0-rc1~277 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ecd2181097d2614f5c7ee202ac16db6034b37ae;p=thirdparty%2Flibvirt.git qemu: domain: Unexport qemuDomainObjTaintMsg The function is used only inside qemu_domain.c, unexport it and move it above its user. Signed-off-by: Peter Krempa Reviewed-by: Laine Stump --- diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 40d5efd750..a083e7e1ef 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6638,20 +6638,12 @@ qemuDomainDefFormatLive(virQEMUDriver *driver, } -void qemuDomainObjTaint(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt) -{ - qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); - qemuDomainSaveStatus(obj); -} - -void qemuDomainObjTaintMsg(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt, - const char *fmt, ...) +static void G_GNUC_PRINTF(5, 6) +qemuDomainObjTaintMsg(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt, + const char *fmt, ...) { virErrorPtr orig_err = NULL; g_autofree char *timestamp = NULL; @@ -6725,6 +6717,16 @@ void qemuDomainObjTaintMsg(virQEMUDriver *driver, virErrorRestore(&orig_err); } + +void qemuDomainObjTaint(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt) +{ + qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); + qemuDomainSaveStatus(obj); +} + static void qemuDomainObjCheckMachineTaint(virQEMUDriver *driver, virDomainObj *obj, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6adc067681..54c2e02557 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -629,13 +629,6 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuDomainLogContext *logCtxt); -void qemuDomainObjTaintMsg(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt, - const char *msg, - ...) G_GNUC_PRINTF(5, 6); - char **qemuDomainObjGetTainting(virQEMUDriver *driver, virDomainObj *obj);