From patchwork Mon Aug 5 19:40:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seiji Aguchi X-Patchwork-Id: 264766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 98A0F2C00A0 for ; Tue, 6 Aug 2013 05:41:25 +1000 (EST) Received: from localhost ([::1]:33120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6Qeg-0000Gk-JB for incoming@patchwork.ozlabs.org; Mon, 05 Aug 2013 15:41:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6QeI-0000G8-O8 for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:41:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6QeB-0004p4-U7 for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:40:58 -0400 Received: from usindpps03.hds.com ([207.126.252.16]:43500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6QeB-0004oj-Kx for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:40:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hds.com; h=message-id : date : from : mime-version : to : cc : subject : content-type : content-transfer-encoding; s=mail1; bh=DWyKgDK3K8eetccDjBdJO+ITIOTh6HgVR3s/k2uS5Eg=; b=WRmEt34hRe7wrWnZxLeYrrcpY9JiNQ9F/IWrbCv/kSShviYtivxrbPy1leC3tnt2hyil CVf3OWkLB8KB3X6z846Hyjd2ne3GGBxU8L9z4hLOeTp7mm6WMz2jg6i/gDGc9oFadYWM PeFrRkVyBARoq3mNwvAZF7ombAMMGaX0/W2FLrVoyFciEAKYKL6r3vzOlQxHcUsMZMvZ GvG1GD3CtGc35v9gllcw1cwG78msDy2utfzDD6u5ACNenaCBlkpvo0NfsTr6L1SUUUTo T6feXz4mxXzlV7xNzoFyazWZsvCSZfc/x1jJq+QrUWrTCvMMTSGIujs95jJ0qtGaIQaT bw== Received: from usindmail02.hds.com (usindmail02 [207.126.252.21]) by usindpps03.hds.com (8.14.5/8.14.5) with ESMTP id r75JelGu027281; Mon, 5 Aug 2013 15:40:47 -0400 Received: from [10.74.80.153] (usindnetf5d-vlan47float.corp.hds.com [10.74.73.11]) by usindmail02.hds.com (8.14.1/8.14.1) with ESMTP id r75Jei9r008520; Mon, 5 Aug 2013 15:40:45 -0400 (EDT) Message-ID: <51FFFFBC.6050101@hds.com> Date: Mon, 05 Aug 2013 15:40:44 -0400 From: Seiji Aguchi User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 mx ip4:207.126.244.0/26 ip4:207.126.252.0/25 include:mktomail.com include:cloud.hds.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794, 1.0.431, 0.0.0000 definitions=2013-08-05_05:2013-08-05, 2013-08-05, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=outbound_policy score=0 spamscore=0 suspectscore=21 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1308050182 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 207.126.252.16 Cc: lersek@redhat.com, armbru@redhat.com, tomoki.sekiyama@hds.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2] Convert stderr message calling error_get_pretty() to error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Convert stderr messages calling error_get_pretty() to error_report(). Timestamp is prepended by -msg timstamp option with it. Per Markus's comment below, A conversion from fprintf() to error_report() is always an improvement, regardless of error_get_pretty(). http://marc.info/?l=qemu-devel&m=137513283408601&w=2 But, it is not reasonable to convert them at one time because fprintf() is used everwhere in qemu. So, it should be done step by step with avoiding regression. Signed-off-by: Seiji Aguchi Reviewed-by: Laszlo Ersek --- Change from v2 - Remove "\n" from strings because error_report() appends it. Patch v1 http://marc.info/?l=qemu-devel&m=137452706024842&w=2 --- arch_init.c | 4 ++-- hw/char/serial.c | 5 +++-- hw/i386/pc.c | 6 +++--- qemu-char.c | 2 +- target-i386/cpu.c | 2 +- target-ppc/translate_init.c | 3 ++- vl.c | 9 +++++---- 7 files changed, 17 insertions(+), 14 deletions(-) -- 1.7.1 diff --git a/arch_init.c b/arch_init.c index 68a7ab7..94d45e1 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1125,8 +1125,8 @@ void do_acpitable_option(const QemuOpts *opts) acpi_table_add(opts, &err); if (err) { - fprintf(stderr, "Wrong acpi table provided: %s\n", - error_get_pretty(err)); + error_report("Wrong acpi table provided: %s", + error_get_pretty(err)); error_free(err); exit(1); } diff --git a/hw/char/serial.c b/hw/char/serial.c index 6025592..a31eb57 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -27,6 +27,7 @@ #include "sysemu/char.h" #include "qemu/timer.h" #include "exec/address-spaces.h" +#include "qemu/error-report.h" //#define DEBUG_SERIAL @@ -696,7 +697,7 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase, s->chr = chr; serial_realize_core(s, &err); if (err != NULL) { - fprintf(stderr, "%s\n", error_get_pretty(err)); + error_report("%s", error_get_pretty(err)); error_free(err); exit(1); } @@ -760,7 +761,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space, serial_realize_core(s, &err); if (err != NULL) { - fprintf(stderr, "%s\n", error_get_pretty(err)); + error_report("%s", error_get_pretty(err)); error_free(err); exit(1); } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a2b9d88..5bce10f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -979,7 +979,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), icc_bridge, &error); if (error) { - fprintf(stderr, "%s\n", error_get_pretty(error)); + error_report("%s", error_get_pretty(error)); error_free(error); exit(1); } @@ -1097,8 +1097,8 @@ void pc_acpi_init(const char *default_dsdt) acpi_table_add(opts, &err); if (err) { - fprintf(stderr, "WARNING: failed to load %s: %s\n", filename, - error_get_pretty(err)); + error_report("WARNING: failed to load %s: %s", filename, + error_get_pretty(err)); error_free(err); } g_free(arg); diff --git a/qemu-char.c b/qemu-char.c index 3f606c9..2e9a11d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3299,7 +3299,7 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in chr = qemu_chr_new_from_opts(opts, init, &err); if (error_is_set(&err)) { - fprintf(stderr, "%s\n", error_get_pretty(err)); + error_report("%s", error_get_pretty(err)); error_free(err); } if (chr && qemu_opt_get_bool(opts, "mux", 0)) { diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 71ab915..43061e2 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1843,7 +1843,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) out: if (error) { - fprintf(stderr, "%s\n", error_get_pretty(error)); + error_report("%s", error_get_pretty(error)); error_free(error); if (cpu != NULL) { object_unref(OBJECT(cpu)); diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 0724226..3cf74a2 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -27,6 +27,7 @@ #include "cpu-models.h" #include "mmu-hash32.h" #include "mmu-hash64.h" +#include "qemu/error-report.h" //#define PPC_DUMP_CPU //#define PPC_DEBUG_SPR @@ -8177,7 +8178,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model) object_property_set_bool(OBJECT(cpu), true, "realized", &err); if (err != NULL) { - fprintf(stderr, "%s\n", error_get_pretty(err)); + error_report("%s", error_get_pretty(err)); error_free(err); object_unref(OBJECT(cpu)); return NULL; diff --git a/vl.c b/vl.c index 25b8f2f..2e427d8 100644 --- a/vl.c +++ b/vl.c @@ -2393,7 +2393,7 @@ static int chardev_init_func(QemuOpts *opts, void *opaque) qemu_chr_new_from_opts(opts, NULL, &local_err); if (error_is_set(&local_err)) { - fprintf(stderr, "%s\n", error_get_pretty(local_err)); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); return -1; } @@ -4375,8 +4375,8 @@ int main(int argc, char **argv, char **envp) vnc_display_init(ds); vnc_display_open(ds, vnc_display, &local_err); if (local_err != NULL) { - fprintf(stderr, "Failed to start VNC server on `%s': %s\n", - vnc_display, error_get_pretty(local_err)); + error_report("Failed to start VNC server on `%s': %s", + vnc_display, error_get_pretty(local_err)); error_free(local_err); exit(1); } @@ -4419,7 +4419,8 @@ int main(int argc, char **argv, char **envp) Error *local_err = NULL; qemu_start_incoming_migration(incoming, &local_err); if (local_err) { - fprintf(stderr, "-incoming %s: %s\n", incoming, error_get_pretty(local_err)); + error_report("-incoming %s: %s", incoming, + error_get_pretty(local_err)); error_free(local_err); exit(1); }