[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 28/29] tcg: Replace fprintf(stderr, "*\n" wit
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH v5 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Tue, 14 Nov 2017 08:44:39 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 13.11.2017 23:36, Alistair Francis wrote:
> 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.
[...]
> diff --git a/cpus.c b/cpus.c
> index 114c29b6a0..d73df01659 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -258,7 +258,7 @@ int64_t cpu_get_icount_raw(void)
>
> if (cpu && cpu->running) {
> if (!cpu->can_do_io) {
> - fprintf(stderr, "Bad icount read\n");
> + error_report("Bad icount read");
> exit(1);
> }
> /* Take into account what has run */
> @@ -1113,7 +1113,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
>
> r = kvm_init_vcpu(cpu);
> if (r < 0) {
> - fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r));
> + error_report("kvm_init_vcpu failed: %s", strerror(-r));
> exit(1);
> }
>
> @@ -1143,7 +1143,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
> static void *qemu_dummy_cpu_thread_fn(void *arg)
> {
> #ifdef _WIN32
> - fprintf(stderr, "qtest is not supported under Windows\n");
> + error_report("qtest is not supported under Windows");
> exit(1);
> #else
> CPUState *cpu = arg;
> @@ -1527,7 +1527,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
> #else /* _WIN32 */
> if (!qemu_cpu_is_self(cpu)) {
> if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) {
> - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n",
> + error_report("%s: QueueUserAPC failed with error %lu",
> __func__, GetLastError());
Wrong indentation of the second line.
> exit(1);
> }
> diff --git a/exec.c b/exec.c
> index 97a24a875e..59e0411d0e 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1076,7 +1076,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr)
> }
> }
>
> - fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr);
> + error_report("Bad ram offset %" PRIx64 "", (uint64_t)addr);
> abort();
>
> found:
> @@ -1689,7 +1689,7 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
> }
>
> if (offset == RAM_ADDR_MAX) {
> - fprintf(stderr, "Failed to find gap of requested size: %" PRIu64
> "\n",
> + error_report("Failed to find gap of requested size: %" PRIu64 "",
> (uint64_t)size);
dito.
> abort();
> }
> @@ -1719,8 +1719,8 @@ static void qemu_ram_setup_dump(void *addr, ram_addr_t
> size)
> ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP);
> if (ret) {
> perror("qemu_madvise");
> - fprintf(stderr, "madvise doesn't support MADV_DONTDUMP, "
> - "but dump_guest_core=off specified\n");
> + error_report("madvise doesn't support MADV_DONTDUMP, "
> + "but dump_guest_core=off specified");
dito.
> }
> }
> }
> @@ -1756,7 +1756,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char
> *name, DeviceState *dev)
> RAMBLOCK_FOREACH(block) {
> if (block != new_block &&
> !strcmp(block->idstr, new_block->idstr)) {
> - fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",
> + error_report("RAMBlock \"%s\" already registered, abort!",
> new_block->idstr);
dito
> abort();
> }
> @@ -2184,8 +2184,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
> flags, -1, 0);
> }
> if (area != vaddr) {
> - fprintf(stderr, "Could not remap addr: "
> - RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n",
> + error_report("Could not remap addr: "
> + RAM_ADDR_FMT "@" RAM_ADDR_FMT "",
> length, addr);
Wrong indentation again.
> exit(1);
> }
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index 438321c6cc..93bfaad556 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -122,8 +122,8 @@ static TCGOpcode op_to_mov(TCGOpcode op)
> case 64:
> return INDEX_op_mov_i64;
> default:
> - fprintf(stderr, "op_to_mov: unexpected return value of "
> - "function op_bits.\n");
> + error_report("op_to_mov: unexpected return value of "
> + "function op_bits.");
dito
> tcg_abort();
> }
> }
> @@ -136,8 +136,8 @@ static TCGOpcode op_to_movi(TCGOpcode op)
> case 64:
> return INDEX_op_movi_i64;
> default:
> - fprintf(stderr, "op_to_movi: unexpected return value of "
> - "function op_bits.\n");
> + error_report("op_to_movi: unexpected return value of "
> + "function op_bits.");
dito
> tcg_abort();
> }
> }
[...]
> diff --git a/tcg/tci.c b/tcg/tci.c
> index 63f2cd54ab..6c851d3450 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -35,7 +35,7 @@
> /* Marker for missing code. */
> #define TODO() \
> do { \
> - fprintf(stderr, "TODO %s:%u: %s()\n", \
> + error_report("TODO %s:%u: %s()", \
> __FILE__, __LINE__, __func__); \
> tcg_abort(); \
> } while (0)
> diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c
> index 913c3802a3..2f4b56d3ba 100644
> --- a/tcg/tci/tcg-target.inc.c
> +++ b/tcg/tci/tcg-target.inc.c
> @@ -29,7 +29,7 @@
> /* Marker for missing code. */
> #define TODO() \
> do { \
> - fprintf(stderr, "TODO %s:%u: %s()\n", \
> + error_report("TODO %s:%u: %s()", \
> __FILE__, __LINE__, __func__); \
Wrong indentation again. Maybe also fits into one line now?
> tcg_abort(); \
> } while (0)
> @@ -403,7 +403,7 @@ static const char
> *target_parse_constraint(TCGArgConstraint *ct,
> void tci_disas(uint8_t opc)
> {
> const TCGOpDef *def = &tcg_op_defs[opc];
> - fprintf(stderr, "TCG %s %u, %u, %u\n",
> + error_report("TCG %s %u, %u, %u",
> def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs);
Wrong indentation
> }
> #endif
Thomas
- [Qemu-devel] [PATCH v5 23/29] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [Qemu-devel] [PATCH v5 23/29] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 24/29] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 20/29] hw/ppc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 02/29] Replace all occurances of __FUNCTION__ with __func__, Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 22/29] hw/scsi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 29/29] target: Use qemu_log() instead of fprintf(stderr, ...), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 26/29] hw/timer: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- Re: [Qemu-devel] [PATCH v5 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report(),
Thomas Huth <=
- [Qemu-devel] [PATCH v5 25/29] hw/ssi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 27/29] hw/xen*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13