haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/dma: Replace fprintf(stderr, "*\n" with error_report()

Browse source 
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 <alistair.francis@xilinx.com>

Conversions that aren't followed by exit() dropped, because they might
be inappropriate.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-4-armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alistair Francis 2018-02-03 09:43:04 +01:00 committed by Markus Armbruster
parent c0dbca36dc
commit 7f69a433d2
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
hw/dma/soc_dma.c
View file

@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>. * with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/arm/soc_dma.h" #include "hw/arm/soc_dma.h"
@ -270,11 +271,11 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base,
if (entry->type == soc_dma_port_mem) { if (entry->type == soc_dma_port_mem) {
if (entry->addr <= virt_base && if (entry->addr <= virt_base &&
entry->addr + entry->u.mem.size > virt_base) { entry->addr + entry->u.mem.size > virt_base) {
fprintf(stderr, "%s: FIFO at %"PRIx64 error_report("%s: FIFO at %"PRIx64
" collides with RAM region at %"PRIx64 " collides with RAM region at %"PRIx64
"-%"PRIx64 "\n", __func__, "-%"PRIx64, __func__,
virt_base, entry->addr, virt_base, entry->addr,
(entry->addr + entry->u.mem.size)); (entry->addr + entry->u.mem.size));
exit(-1); exit(-1);
} }
@ -284,9 +285,9 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base,
while (entry < dma->memmap + dma->memmap_size && while (entry < dma->memmap + dma->memmap_size &&
entry->addr <= virt_base) { entry->addr <= virt_base) {
if (entry->addr == virt_base && entry->u.fifo.out == out) { if (entry->addr == virt_base && entry->u.fifo.out == out) {
fprintf(stderr, "%s: FIFO at %"PRIx64 error_report("%s: FIFO at %"PRIx64
" collides FIFO at %"PRIx64 "\n", " collides FIFO at %"PRIx64,
__func__, virt_base, entry->addr); __func__, virt_base, entry->addr);
exit(-1); exit(-1);
} }
@ -321,11 +322,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base,
if ((entry->addr >= virt_base && entry->addr < virt_base + size) || if ((entry->addr >= virt_base && entry->addr < virt_base + size) ||
(entry->addr <= virt_base && (entry->addr <= virt_base &&
entry->addr + entry->u.mem.size > virt_base)) { entry->addr + entry->u.mem.size > virt_base)) {
fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 error_report("%s: RAM at %"PRIx64 "-%"PRIx64
" collides with RAM region at %"PRIx64 " collides with RAM region at %"PRIx64
"-%"PRIx64 "\n", __func__, "-%"PRIx64, __func__,
virt_base, virt_base + size, virt_base, virt_base + size,
entry->addr, entry->addr + entry->u.mem.size); entry->addr, entry->addr + entry->u.mem.size);
exit(-1); exit(-1);
} }
@ -334,11 +335,10 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base,
} else { } else {
if (entry->addr >= virt_base && if (entry->addr >= virt_base &&
entry->addr < virt_base + size) { entry->addr < virt_base + size) {
fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 error_report("%s: RAM at %"PRIx64 "-%"PRIx64
" collides with FIFO at %"PRIx64 " collides with FIFO at %"PRIx64,
"\n", __func__, __func__, virt_base, virt_base + size,
virt_base, virt_base + size, entry->addr);
entry->addr);
exit(-1); exit(-1);
} }