From nobody Thu Nov 13 21:52:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582821217; cv=none; d=zohomail.com; s=zohoarc; b=GagCd/7+AgQFyFysbkgbiUMP+GgKTB6v7h5m+Q3tpa5ZbmnrlA7W+Y6CaGNAnaluluOBEWoDTQXc3ElE7qoY/e7h3Hua3m2jveZNG68UMEBpBuCexuEVa+ANCt38LbjK/VI4jN8LWxP4W4iVQ+MsXt8N6GF3yg5D9hLmnhy1St0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582821217; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O0FaYIaPmg1DzLaX55LBHB1O4cEilmCbUbK2SbynOMs=; b=KQvx8igVpoMJk5y1JTqLs06BNbPqW3XxraFgwfPoeTjUMbsDa3XTjt6fcZCk/YSRQXo/HxxZLAhiHtjwBfwH/NS8DP0NKrU2pu4RtfDepFRxNDv51uKNjUvFXWAPlad8N2IkQLKWITEmwtH1K/sDdlPI9X3vSPxdyVc8NvrTeXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582821217612775.6922803674299; Thu, 27 Feb 2020 08:33:37 -0800 (PST) Received: from localhost ([::1]:34228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M6S-00060e-B6 for importer@patchew.org; Thu, 27 Feb 2020 11:33:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40875) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M4l-0004Cj-RO for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:31:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7M4j-0002sS-U0 for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:31:51 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:48837 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7M4j-0002s4-NW for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:31:49 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-122-pgy7-kriOpagvecOAk1fAw-1; Thu, 27 Feb 2020 11:31:47 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C22FA8024DD; Thu, 27 Feb 2020 16:31:45 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-195.brq.redhat.com [10.40.205.195]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1D0090CD6; Thu, 27 Feb 2020 16:31:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582821109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0FaYIaPmg1DzLaX55LBHB1O4cEilmCbUbK2SbynOMs=; b=CYbrB21hA3pY9RVNSKL3X0gX0w1u0b3pL2yJP8y982e5f0pg1oqo6Rp5V5tSbvE2eSi5bm OPbu+dBgCwgucZ/irgZ3ezcwoiQJ+6LDiVDGDCYGkTBOiseOVf0SBIrlbfdA5ozoxjwKDp VYwezKuIdki8z5r+6Pn7wRg++QPPxFg= X-MC-Unique: pgy7-kriOpagvecOAk1fAw-1 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] util: Replace fprintf(stderr, "*\n" with error_report() Date: Thu, 27 Feb 2020 17:30:57 +0100 Message-Id: <20200227163101.414-3-philmd@redhat.com> In-Reply-To: <20200227163101.414-1-philmd@redhat.com> References: <20200227163101.414-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Weil , Alistair Francis , Markus Armbruster , Michael Roth , =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , Alistair Francis , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alistair Francis Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_= report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_re= port("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report= ("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("= \1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1= "\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\= 2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2)= ;|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|= Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig= }' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}'= \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + The error in aio_poll() was removed manually. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Alistair Francis [PMD: Rebased] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Alistair Francis Cc: Alistair Francis --- util/coroutine-sigaltstack.c | 3 ++- util/mmap-alloc.c | 11 ++++++----- util/module.c | 13 ++++++------- util/osdep.c | 4 ++-- util/oslib-posix.c | 3 ++- util/oslib-win32.c | 3 ++- util/qemu-coroutine.c | 10 +++++----- util/qemu-thread-posix.c | 5 +++-- util/qemu-thread-win32.c | 5 +++-- util/qemu-timer-common.c | 3 ++- 10 files changed, 33 insertions(+), 27 deletions(-) diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c index f6fc49a0e5..63decd4d1d 100644 --- a/util/coroutine-sigaltstack.c +++ b/util/coroutine-sigaltstack.c @@ -29,6 +29,7 @@ #include #include "qemu-common.h" #include "qemu/coroutine_int.h" +#include "qemu/error-report.h" =20 typedef struct { Coroutine base; @@ -80,7 +81,7 @@ static void __attribute__((constructor)) coroutine_init(v= oid) =20 ret =3D pthread_key_create(&thread_state_key, qemu_coroutine_thread_cl= eanup); if (ret !=3D 0) { - fprintf(stderr, "unable to create leader key: %s\n", strerror(errn= o)); + error_report("unable to create leader key: %s", strerror(errno)); abort(); } } diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 27dcccd8ec..3ac6e10404 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -18,6 +18,7 @@ #endif /* CONFIG_LINUX */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" =20 @@ -63,7 +64,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path) } while (ret !=3D 0 && errno =3D=3D EINTR); =20 if (ret !=3D 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", + error_report("Couldn't statfs() memory path: %s", strerror(errno)); exit(1); } @@ -160,10 +161,10 @@ void *qemu_ram_mmap(int fd, len =3D 0; } file_name[len] =3D '\0'; - fprintf(stderr, "Warning: requesting persistence across crashe= s " - "for backend file %s failed. Proceeding without " - "persistence, data might become corrupted in case of h= ost " - "crash.\n", file_name); + error_report("Warning: requesting persistence across crashes " + "for backend file %s failed. Proceeding without " + "persistence, data might become corrupted in case= " + "of host crash.", file_name); g_free(proc_link); g_free(file_name); } diff --git a/util/module.c b/util/module.c index 236a7bb52a..28efa1f891 100644 --- a/util/module.c +++ b/util/module.c @@ -19,6 +19,7 @@ #endif #include "qemu/queue.h" #include "qemu/module.h" +#include "qemu/error-report.h" =20 typedef struct ModuleEntry { @@ -130,19 +131,17 @@ static int module_load_file(const char *fname) =20 g_module =3D g_module_open(fname, G_MODULE_BIND_LAZY | G_MODULE_BIND_L= OCAL); if (!g_module) { - fprintf(stderr, "Failed to open module: %s\n", - g_module_error()); + error_report("Failed to open module: %s", g_module_error()); ret =3D -EINVAL; goto out; } if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) { - fprintf(stderr, "Failed to initialize module: %s\n", - fname); + error_report("Failed to initialize module: %s", fname); /* Print some info if this is a QEMU module (but from different bu= ild), * this will make debugging user problems easier. */ if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sy= m)) { - fprintf(stderr, - "Note: only modules from the same build can be loaded.= \n"); + error_report("Note: " + "only modules from the same build can be loaded."= ); } g_module_close(g_module); ret =3D -EINVAL; @@ -178,7 +177,7 @@ bool module_load_one(const char *prefix, const char *li= b_name) static GHashTable *loaded_modules; =20 if (!g_module_supported()) { - fprintf(stderr, "Module is not supported by system.\n"); + error_report("Module is not supported by system."); return false; } =20 diff --git a/util/osdep.c b/util/osdep.c index f7d06050f7..ef40ae512a 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -484,7 +484,7 @@ void fips_set_state(bool requested) #endif /* __linux__ */ =20 #ifdef _FIPS_DEBUG - fprintf(stderr, "FIPS mode %s (requested %s)\n", + error_report("FIPS mode %s (requested %s)", (fips_enabled ? "enabled" : "disabled"), (requested ? "enabled" : "disabled")); #endif @@ -511,7 +511,7 @@ int socket_init(void) ret =3D WSAStartup(MAKEWORD(2, 2), &Data); if (ret !=3D 0) { err =3D WSAGetLastError(); - fprintf(stderr, "WSAStartup: %d\n", err); + error_report("WSAStartup: %d", err); return -1; } atexit(socket_cleanup); diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 897e8f3ba6..4977594a43 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -35,6 +35,7 @@ #include "sysemu/sysemu.h" #include "trace.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/sockets.h" #include "qemu/thread.h" #include @@ -170,7 +171,7 @@ fail_close: void *qemu_oom_check(void *ptr) { if (ptr =3D=3D NULL) { - fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)= ); + error_report("Failed to allocate memory: %s", strerror(errno)); abort(); } return ptr; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index e9b14ab178..84b937865a 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -39,6 +39,7 @@ #include "trace.h" #include "qemu/sockets.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" =20 /* this must come after including "trace.h" */ #include @@ -46,7 +47,7 @@ void *qemu_oom_check(void *ptr) { if (ptr =3D=3D NULL) { - fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()= ); + error_report("Failed to allocate memory: %lu", GetLastError()); abort(); } return ptr; diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index c3caa6c770..62d1dd09df 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -14,6 +14,7 @@ =20 #include "qemu/osdep.h" #include "trace.h" +#include "qemu/error-report.h" #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/coroutine.h" @@ -125,14 +126,13 @@ void qemu_aio_coroutine_enter(AioContext *ctx, Corout= ine *co) * cause us to enter it twice, potentially even after the coroutin= e has * been deleted */ if (scheduled) { - fprintf(stderr, - "%s: Co-routine was already scheduled in '%s'\n", - __func__, scheduled); + error_report("%s: Co-routine was already scheduled in '%s'", + __func__, scheduled); abort(); } =20 if (to->caller) { - fprintf(stderr, "Co-routine re-entered recursively\n"); + error_report("Co-routine re-entered recursively"); abort(); } =20 @@ -185,7 +185,7 @@ void coroutine_fn qemu_coroutine_yield(void) trace_qemu_coroutine_yield(self, to); =20 if (!to) { - fprintf(stderr, "Co-routine is yielding to no one\n"); + error_report("Co-routine is yielding to no one"); abort(); } =20 diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 838980aaa5..b4d8de376c 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -14,6 +14,7 @@ #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/notify.h" +#include "qemu/error-report.h" #include "qemu-thread-common.h" =20 static bool name_threads; @@ -25,14 +26,14 @@ void qemu_thread_naming(bool enable) #ifndef CONFIG_THREAD_SETNAME_BYTHREAD /* This is a debugging option, not fatal */ if (enable) { - fprintf(stderr, "qemu: thread naming not supported on this host\n"= ); + error_report("qemu: thread naming not supported on this host"); } #endif } =20 static void error_exit(int err, const char *msg) { - fprintf(stderr, "qemu: %s: %s\n", msg, strerror(err)); + error_report("qemu: %s: %s", msg, strerror(err)); abort(); } =20 diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 56a83333da..9bed338d7e 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "qemu/thread.h" #include "qemu/notify.h" +#include "qemu/error-report.h" #include "qemu-thread-common.h" #include =20 @@ -25,7 +26,7 @@ void qemu_thread_naming(bool enable) /* But note we don't actually name them on Windows yet */ name_threads =3D enable; =20 - fprintf(stderr, "qemu: thread naming not supported on this host\n"); + error_report("qemu: thread naming not supported on this host"); } =20 static void error_exit(int err, const char *msg) @@ -34,7 +35,7 @@ static void error_exit(int err, const char *msg) =20 FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUF= FER, NULL, err, 0, (LPTSTR)&pstr, 2, NULL); - fprintf(stderr, "qemu: %s: %s\n", msg, pstr); + error_report("qemu: %s: %s", msg, pstr); LocalFree(pstr); abort(); } diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c index baf3317f74..527944da1c 100644 --- a/util/qemu-timer-common.c +++ b/util/qemu-timer-common.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" #include "qemu/timer.h" +#include "qemu/error-report.h" =20 /***********************************************************/ /* real time host monotonic timer */ @@ -37,7 +38,7 @@ static void __attribute__((constructor)) init_get_clock(v= oid) int ret; ret =3D QueryPerformanceFrequency(&freq); if (ret =3D=3D 0) { - fprintf(stderr, "Could not calibrate ticks\n"); + error_report("Could not calibrate ticks"); exit(1); } clock_freq =3D freq.QuadPart; --=20 2.21.1