[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with
From: |
Alistair Francis |
Subject: |
[Qemu-block] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Wed, 20 Dec 2017 09:23:23 -0800 |
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_report("\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}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <address@hidden>
Cc: address@hidden
Reviewed-by: Philippe Mathieu-Daud <address@hidden>
Acked-by: John Snow <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/ide/ahci.c | 6 +++---
hw/ide/core.c | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e22d7be05f..c35e347020 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -409,8 +409,8 @@ static void ahci_mem_write(void *opaque, hwaddr addr,
/* Only aligned reads are allowed on AHCI */
if (addr & 3) {
- fprintf(stderr, "ahci: Mis-aligned write to addr 0x"
- TARGET_FMT_plx "\n", addr);
+ error_report("ahci: Mis-aligned write to addr 0x" TARGET_FMT_plx,
+ addr);
return;
}
@@ -1052,7 +1052,7 @@ static void process_ncq_command(AHCIState *s, int port,
uint8_t *cmd_fis,
g_assert(is_ncq(ncq_fis->command));
if (ncq_tfs->used) {
/* error - already in use */
- fprintf(stderr, "%s: tag %d already used\n", __func__, tag);
+ error_report("%s: tag %d already used", __func__, tag);
return;
}
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 1ea5812b7e..d3090f123c 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2764,8 +2764,7 @@ static int ide_drive_pio_pre_save(void *opaque)
idx = transfer_end_table_idx(s->end_transfer_func);
if (idx == -1) {
- fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n",
- __func__);
+ error_report("%s: invalid end_transfer_func for DRQ_STAT", __func__);
s->end_transfer_fn_idx = 2;
} else {
s->end_transfer_fn_idx = idx;
--
2.14.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-block] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=