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: Alexander Graf <address@hidden>
Cc: Jason Wang <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/net/fsl_etsec/etsec.c | 2 +-
hw/net/pcnet.c | 2 +-
hw/net/smc91c111.c | 5 +++--
hw/net/vhost_net.c | 16 ++++++++--------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 9da1932970..965effa314 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -347,7 +347,7 @@ static ssize_t etsec_receive(NetClientState *nc,
eTSEC *etsec = qemu_get_nic_opaque(nc);
#if defined(HEX_DUMP)
- fprintf(stderr, "%s receive size:%zd\n", nc->name, size);
+ error_report("%s receive size:%zd", nc->name, size);
qemu_hexdump((void *)buf, stderr, "", size);
#endif
/* Flush is unnecessary as are already in receiving path */
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 654455355f..5f2b5fe046 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -1070,7 +1070,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t
*buf, size_t size_)
if (!s->looptest) {
if (size > 4092) {
#ifdef PCNET_DEBUG_RMD
- fprintf(stderr, "pcnet: truncates rx packet.\n");
+ error_report("pcnet: truncates rx packet.");
#endif
size = 4092;
}
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 3b16dcf5a1..ae40fd6e6e 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -8,6 +8,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/devices.h"
@@ -362,9 +363,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset,
return;
case 12: /* Control */
if (value & 1)
- fprintf(stderr, "smc91c111:EEPROM store not implemented\n");
+ error_report("smc91c111:EEPROM store not implemented");
if (value & 2)
- fprintf(stderr, "smc91c111:EEPROM reload not implemented\n");
+ error_report("smc91c111:EEPROM reload not implemented");
value &= ~3;
SET_LOW(ctr, value);
return;
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index e037db63a3..37d0cce560 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -135,7 +135,7 @@ static int vhost_net_get_fd(NetClientState *backend)
case NET_CLIENT_DRIVER_TAP:
return tap_get_fd(backend);
default:
- fprintf(stderr, "vhost-net requires tap backend\n");
+ error_report("vhost-net requires tap backend");
return -EBADFD;
}
}
@@ -148,7 +148,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
uint64_t features = 0;
if (!options->net_backend) {
- fprintf(stderr, "vhost-net requires net backend to be setup\n");
+ error_report("vhost-net requires net backend to be setup");
goto fail;
}
net->nc = options->net_backend;
@@ -186,8 +186,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
net->dev.features &= ~(1ULL << VIRTIO_NET_F_MRG_RXBUF);
}
if (~net->dev.features & net->dev.backend_features) {
- fprintf(stderr, "vhost lacks feature mask %" PRIu64
- " for backend\n",
+ error_report("vhost lacks feature mask %" PRIu64
+ " for backend",
(uint64_t)(~net->dev.features &
net->dev.backend_features));
goto fail;
}
@@ -197,8 +197,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
if (net->nc->info->type == NET_CLIENT_DRIVER_VHOST_USER) {
features = vhost_user_get_acked_features(net->nc);
if (~net->dev.features & features) {
- fprintf(stderr, "vhost lacks feature mask %" PRIu64
- " for backend\n",
+ error_report("vhost lacks feature mask %" PRIu64
+ " for backend",
(uint64_t)(~net->dev.features & features));
goto fail;
}
@@ -349,7 +349,7 @@ err_start:
}
e = k->set_guest_notifiers(qbus->parent, total_queues * 2, false);
if (e < 0) {
- fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e);
+ error_report("vhost guest notifier cleanup failed: %d", e);
fflush(stderr);
}
err:
@@ -370,7 +370,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
r = k->set_guest_notifiers(qbus->parent, total_queues * 2, false);
if (r < 0) {
- fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", r);
+ error_report("vhost guest notifier cleanup failed: %d", r);
fflush(stderr);
}
assert(r >= 0);