The following changes since commit cda4a338c4243fa3bff4498b935340ac7121cc76:

tcg/tci: Add TCG_TARGET_DEFAULT_MO (2017-09-07 18:57:34 +0100)

for you to fetch changes up to 861d51e62bb197b43606f888dbefbabebaf0d854:

colo-compare: Update the COLO document to add the IOThread configuration (2017-09-08 09:34:40 +0800)

Kamil Rytarowski (1):

e1000: Rename the SEC symbol to SEQEC

Mao Zhongyi (8):

net/rocker: Remove the dead error handling

net/rocker: Plug memory leak in pci_rocker_init()

net/rocker: Convert to realize()

net/rocker: Fix the unusual macro name

net/socket: Don't treat odd socket type as SOCK_STREAM

net/socket: Convert several helper functions to Error

net/net: Convert parse_host_port() to Error

net/socket: Improve -net socket error reporting

Matt Parker (1):

net: rtl8139: do not use old_mmio accesses

Wang Yong (3):

qemu-iothread: IOThread supports the GMainContext event loop

colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary

colo-compare: Update the COLO document to add the IOThread configuration

Zhang Chen (5):

net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net

MAINTAINERS: Update mail address for COLO Proxy

net/colo-compare.c: Optimize unpredictable tcp options comparison

net/colo-compare.c: Adjust net queue pop order for performance

net/colo-compare.c: Fix comments and scheme

MAINTAINERS | 2 +-

docs/colo-proxy.txt | 3 +-

hw/net/e1000.c | 4 +-

hw/net/e1000_regs.h | 2 +-

hw/net/e1000e_core.c | 2 +-

hw/net/e1000x_common.h | 2 +-

hw/net/rocker/rocker.c | 94 ++++++----------------

hw/net/rocker/rocker_desc.c | 10 ---

hw/net/rocker/rocker_fp.c | 4 -

hw/net/rocker/rocker_of_dpa.c | 20 -----

hw/net/rocker/rocker_world.c | 12 ++-

hw/net/rtl8139.c | 53 +-----------

include/qemu/sockets.h | 3 +-

include/sysemu/iothread.h | 4 +

iothread.c | 45 +++++++++++

net/colo-compare.c | 183 ++++++++++++++++++++++++------------------

net/filter-rewriter.c | 6 +-

net/net.c | 22 +++--

net/socket.c | 156 +++++++++++++++++++----------------

19 files changed, 304 insertions(+), 323 deletions(-)

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Memory allocation functions like world_alloc, desc_ring_alloc etc,

they are all wrappers around g_malloc, g_new etc. But g_malloc and

similar functions doesn't return null. Because they ignore the fact

that g_malloc() of 0 bytes returns null. So error checks for these

allocation failure are superfluous. Now, remove them entirely.

Cc: jasowang@redhat.com

Cc: jiri@resnulli.us

Cc: armbru@redhat.com

Cc: f4bug@amsat.org

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

hw/net/rocker/rocker.c | 47 +------------------------------------------

hw/net/rocker/rocker_desc.c | 10 ---------

hw/net/rocker/rocker_fp.c | 4 ----

hw/net/rocker/rocker_of_dpa.c | 20 ------------------

hw/net/rocker/rocker_world.c | 12 +++++------

5 files changed, 6 insertions(+), 87 deletions(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker.c

+++ b/hw/net/rocker/rocker.c

@@ -XXX,XX +XXX,XX @@ static int tx_consume(Rocker *r, DescInfo *info)

}

iov[iovcnt].iov_len = frag_len;

iov[iovcnt].iov_base = g_malloc(frag_len);

- if (!iov[iovcnt].iov_base) {

- err = -ROCKER_ENOMEM;

- goto err_no_mem;

- }

pci_dma_read(dev, frag_addr, iov[iovcnt].iov_base,

iov[iovcnt].iov_len);

@@ -XXX,XX +XXX,XX @@ static int tx_consume(Rocker *r, DescInfo *info)

err = fp_port_eg(r->fp_port[port], iov, iovcnt);

err_too_many_frags:

-err_no_mem:

err_bad_attr:

for (i = 0; i < ROCKER_TX_FRAGS_MAX; i++) {

g_free(iov[i].iov_base);

@@ -XXX,XX +XXX,XX @@ int rx_produce(World *world, uint32_t pport,

*/

data = g_malloc(data_size);

- if (!data) {

- err = -ROCKER_ENOMEM;

- goto out;

- }

+

iov_to_buf(iov, iovcnt, 0, data, data_size);

pci_dma_write(dev, frag_addr, data, data_size);

g_free(data);

@@ -XXX,XX +XXX,XX @@ static void rocker_test_dma_ctrl(Rocker *r, uint32_t val)

buf = g_malloc(r->test_dma_size);

- if (!buf) {

- DPRINTF("test dma buffer alloc failed");

- return;

- }

-

switch (val) {

case ROCKER_TEST_DMA_CTRL_CLEAR:

memset(buf, 0, r->test_dma_size);

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

r->worlds[ROCKER_WORLD_TYPE_OF_DPA] = of_dpa_world_alloc(r);

- for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {

- if (!r->worlds[i]) {

- err = -ENOMEM;

- goto err_world_alloc;

- }

- }

-

if (!r->world_name) {

r->world_name = g_strdup(world_name(r->worlds[ROCKER_WORLD_TYPE_OF_DPA]));

}

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

}

r->rings = g_new(DescRing *, rocker_pci_ring_count(r));

- if (!r->rings) {

- goto err_rings_alloc;

- }

/* Rings are ordered like this:

* - command ring

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

* .....

*/

- err = -ENOMEM;

for (i = 0; i < rocker_pci_ring_count(r); i++) {

DescRing *ring = desc_ring_alloc(r, i);

- if (!ring) {

- goto err_ring_alloc;

- }

-

if (i == ROCKER_RING_CMD) {

desc_ring_set_consume(ring, cmd_consume, ROCKER_MSIX_VEC_CMD);

} else if (i == ROCKER_RING_EVENT) {

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

fp_port_alloc(r, r->name, &r->fp_start_macaddr,

i, &r->fp_ports_peers[i]);

- if (!port) {

- goto err_port_alloc;

- }

-

r->fp_port[i] = port;

fp_port_set_world(port, r->world_dflt);

}

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

return 0;

-err_port_alloc:

- for (--i; i >= 0; i--) {

- FpPort *port = r->fp_port[i];

- fp_port_free(port);

- }

- i = rocker_pci_ring_count(r);

-err_ring_alloc:

- for (--i; i >= 0; i--) {

- desc_ring_free(r->rings[i]);

- }

- g_free(r->rings);

-err_rings_alloc:

err_duplicate:

rocker_msix_uninit(r);

err_msix_init:

object_unparent(OBJECT(&r->msix_bar));

object_unparent(OBJECT(&r->mmio));

err_world_type_by_name:

-err_world_alloc:

for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {

if (r->worlds[i]) {

world_free(r->worlds[i]);

diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_desc.c

+++ b/hw/net/rocker/rocker_desc.c

@@ -XXX,XX +XXX,XX @@ char *desc_get_buf(DescInfo *info, bool read_only)

info->buf_size = size;

}

- if (!info->buf) {

- return NULL;

- }

-

pci_dma_read(dev, le64_to_cpu(info->desc.buf_addr), info->buf, size);

return info->buf;

@@ -XXX,XX +XXX,XX @@ bool desc_ring_set_size(DescRing *ring, uint32_t size)

ring->head = ring->tail = 0;

ring->info = g_renew(DescInfo, ring->info, size);

- if (!ring->info) {

- return false;

- }

memset(ring->info, 0, size * sizeof(DescInfo));

@@ -XXX,XX +XXX,XX @@ DescRing *desc_ring_alloc(Rocker *r, int index)

DescRing *ring;

ring = g_new0(DescRing, 1);

- if (!ring) {

- return NULL;

- }

ring->r = r;

ring->index = index;

diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_fp.c

+++ b/hw/net/rocker/rocker_fp.c

@@ -XXX,XX +XXX,XX @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,

{

FpPort *port = g_new0(FpPort, 1);

- if (!port) {

- return NULL;

- }

-

port->r = r;

port->index = index;

port->pport = index + 1;

diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_of_dpa.c

+++ b/hw/net/rocker/rocker_of_dpa.c

@@ -XXX,XX +XXX,XX @@ static OfDpaFlow *of_dpa_flow_alloc(uint64_t cookie)

int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) / 1000;

flow = g_new0(OfDpaFlow, 1);

- if (!flow) {

- return NULL;

- }

flow->cookie = cookie;

flow->mask.tbl_id = 0xffffffff;

@@ -XXX,XX +XXX,XX @@ static OfDpaGroup *of_dpa_group_alloc(uint32_t id)

{

OfDpaGroup *group = g_new0(OfDpaGroup, 1);

- if (!group) {

- return NULL;

- }

-

group->id = id;

return group;

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_flow_add(OfDpa *of_dpa, uint64_t cookie,

}

flow = of_dpa_flow_alloc(cookie);

- if (!flow) {

- return -ROCKER_ENOMEM;

- }

err = of_dpa_cmd_flow_add_mod(of_dpa, flow, flow_tlvs);

if (err) {

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_add_l2_flood(OfDpa *of_dpa, OfDpaGroup *group,

rocker_tlv_get_le16(group_tlvs[ROCKER_TLV_OF_DPA_GROUP_COUNT]);

tlvs = g_new0(RockerTlv *, group->l2_flood.group_count + 1);

- if (!tlvs) {

- return -ROCKER_ENOMEM;

- }

g_free(group->l2_flood.group_ids);

group->l2_flood.group_ids =

g_new0(uint32_t, group->l2_flood.group_count);

- if (!group->l2_flood.group_ids) {

- err = -ROCKER_ENOMEM;

- goto err_out;

- }

rocker_tlv_parse_nested(tlvs, group->l2_flood.group_count,

group_tlvs[ROCKER_TLV_OF_DPA_GROUP_IDS]);

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_group_add(OfDpa *of_dpa, uint32_t group_id,

}

group = of_dpa_group_alloc(group_id);

- if (!group) {

- return -ROCKER_ENOMEM;

- }

err = of_dpa_cmd_group_do(of_dpa, group_id, group, group_tlvs);

if (err) {

diff --git a/hw/net/rocker/rocker_world.c b/hw/net/rocker/rocker_world.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_world.c

+++ b/hw/net/rocker/rocker_world.c

@@ -XXX,XX +XXX,XX @@ World *world_alloc(Rocker *r, size_t sizeof_private,

{

World *w = g_malloc0(sizeof(World) + sizeof_private);

- if (w) {

- w->r = r;

- w->type = type;

- w->ops = ops;

- if (w->ops->init) {

- w->ops->init(w);

- }

+ w->r = r;

+ w->type = type;

+ w->ops = ops;

+ if (w->ops->init) {

+ w->ops->init(w);

}

return w;

--

2.7.4

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and

net_socket_fd_init() use the function such as fprintf(), perror() to

report an error message.

Now, convert these functions to Error.

Cc: jasowang@redhat.com

Cc: armbru@redhat.com

Cc: berrange@redhat.com

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/socket.c | 82 ++++++++++++++++++++++++++++++++++++------------------------

1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/net/socket.c b/net/socket.c

index XXXXXXX..XXXXXXX 100644

--- a/net/socket.c

+++ b/net/socket.c

@@ -XXX,XX +XXX,XX @@ static void net_socket_send_dgram(void *opaque)

}

}

-static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)

+static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,

+ struct in_addr *localaddr,

+ Error **errp)

{

struct ip_mreq imr;

int fd;

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr

#endif

if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {

- fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "

- "does not contain a multicast address\n",

- inet_ntoa(mcastaddr->sin_addr),

- (int)ntohl(mcastaddr->sin_addr.s_addr));

+ error_setg(errp, "specified mcastaddr %s (0x%08x) "

+ "does not contain a multicast address",

+ inet_ntoa(mcastaddr->sin_addr),

+ (int)ntohl(mcastaddr->sin_addr.s_addr));

return -1;

-

}

+

fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);

if (fd < 0) {

- perror("socket(PF_INET, SOCK_DGRAM)");

+ error_setg_errno(errp, errno, "can't create datagram socket");

return -1;

}

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr

val = 1;

ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

if (ret < 0) {

- perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");

+ error_setg_errno(errp, errno,

+ "can't set socket option SO_REUSEADDR");

goto fail;

}

ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));

if (ret < 0) {

- perror("bind");

+ error_setg_errno(errp, errno, "can't bind ip=%s to socket",

+ inet_ntoa(mcastaddr->sin_addr));

goto fail;

}

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr

ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,

&imr, sizeof(struct ip_mreq));

if (ret < 0) {

- perror("setsockopt(IP_ADD_MEMBERSHIP)");

+ error_setg_errno(errp, errno,

+ "can't add socket to multicast group %s",

+ inet_ntoa(imr.imr_multiaddr));

goto fail;

}

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr

ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,

&loop, sizeof(loop));

if (ret < 0) {

- perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");

+ error_setg_errno(errp, errno,

+ "can't force multicast message to loopback");

goto fail;

}

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr

ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,

localaddr, sizeof(*localaddr));

if (ret < 0) {

- perror("setsockopt(IP_MULTICAST_IF)");

+ error_setg_errno(errp, errno,

+ "can't set the default network send interface");

goto fail;

}

}

@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,

const char *model,

const char *name,

int fd, int is_connected,

- const char *mcast)

+ const char *mcast,

+ Error **errp)

{

struct sockaddr_in saddr;

int newfd;

@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,

if (is_connected && mcast != NULL) {

if (parse_host_port(&saddr, mcast) < 0) {

- fprintf(stderr,

- "qemu: error: init_dgram: fd=%d failed parse_host_port()\n",

- fd);

+ error_setg(errp, "fd=%d failed parse_host_port()", fd);

goto err;

}

/* must be bound */

if (saddr.sin_addr.s_addr == 0) {

- fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "

- "cannot setup multicast dst addr\n", fd);

+ error_setg(errp, "can't setup multicast destination address");

goto err;

}

/* clone dgram socket */

- newfd = net_socket_mcast_create(&saddr, NULL);

+ newfd = net_socket_mcast_create(&saddr, NULL, errp);

if (newfd < 0) {

- /* error already reported by net_socket_mcast_create() */

goto err;

}

/* clone newfd to fd, close newfd */

@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,

static NetSocketState *net_socket_fd_init(NetClientState *peer,

const char *model, const char *name,

- int fd, int is_connected, const char *mc)

+ int fd, int is_connected,

+ const char *mc, Error **errp)

{

int so_type = -1, optlen=sizeof(so_type);

if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,

(socklen_t *)&optlen)< 0) {

- fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",

- fd);

+ error_setg(errp, "can't get socket option SO_TYPE");

closesocket(fd);

return NULL;

}

switch(so_type) {

case SOCK_DGRAM:

- return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, mc);

+ return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,

+ mc, errp);

case SOCK_STREAM:

return net_socket_fd_init_stream(peer, model, name, fd, is_connected);

default:

@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,

NetSocketState *s;

int fd, connected, ret;

struct sockaddr_in saddr;

+ Error *err = NULL;

if (parse_host_port(&saddr, host_str) < 0)

return -1;

@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,

break;

}

}

- s = net_socket_fd_init(peer, model, name, fd, connected, NULL);

- if (!s)

+ s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);

+ if (!s) {

+ error_report_err(err);

return -1;

+ }

+

snprintf(s->nc.info_str, sizeof(s->nc.info_str),

"socket: connect to %s:%d",

inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,

int fd;

struct sockaddr_in saddr;

struct in_addr localaddr, *param_localaddr;

+ Error *err = NULL;

if (parse_host_port(&saddr, host_str) < 0)

return -1;

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,

param_localaddr = NULL;

}

- fd = net_socket_mcast_create(&saddr, param_localaddr);

- if (fd < 0)

+ fd = net_socket_mcast_create(&saddr, param_localaddr, &err);

+ if (fd < 0) {

+ error_report_err(err);

return -1;

+ }

- s = net_socket_fd_init(peer, model, name, fd, 0, NULL);

- if (!s)

+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);

+ if (!s) {

+ error_report_err(err);

return -1;

+ }

s->dgram_dst = saddr;

@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,

NetSocketState *s;

int fd, ret;

struct sockaddr_in laddr, raddr;

+ Error *err = NULL;

if (parse_host_port(&laddr, lhost) < 0) {

return -1;

@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,

}

qemu_set_nonblock(fd);

- s = net_socket_fd_init(peer, model, name, fd, 0, NULL);

+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);

if (!s) {

+ error_report_err(err);

return -1;

}

@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,

return -1;

}

qemu_set_nonblock(fd);

- if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast)) {

+ if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast,

+ errp)) {

return -1;

}

return 0;

--

2.7.4

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Cc: berrange@redhat.com

Cc: kraxel@redhat.com

Cc: pbonzini@redhat.com

Cc: jasowang@redhat.com

Cc: armbru@redhat.com

Cc: eblake@redhat.com

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

include/qemu/sockets.h | 3 ++-

net/net.c | 22 +++++++++++++++++-----

net/socket.c | 22 +++++++++++++++-------

3 files changed, 34 insertions(+), 13 deletions(-)

@@ -XXX,XX +XXX,XX @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)

return 0;

}

-int parse_host_port(struct sockaddr_in *saddr, const char *str)

+int parse_host_port(struct sockaddr_in *saddr, const char *str,

+ Error **errp)

{

char buf[512];

struct hostent *he;

@@ -XXX,XX +XXX,XX @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)

int port;

p = str;

- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)

+ if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

+ error_setg(errp, "host address '%s' doesn't contain ':' "

+ "separating host from port", str);

return -1;

+ }

saddr->sin_family = AF_INET;

if (buf[0] == '\0') {

saddr->sin_addr.s_addr = 0;

} else {

if (qemu_isdigit(buf[0])) {

- if (!inet_aton(buf, &saddr->sin_addr))

+ if (!inet_aton(buf, &saddr->sin_addr)) {

+ error_setg(errp, "host address '%s' is not a valid "

+ "IPv4 address", buf);

return -1;

+ }

} else {

- if ((he = gethostbyname(buf)) == NULL)

+ he = gethostbyname(buf);

+ if (he == NULL) {

+ error_setg(errp, "can't resolve host address '%s'", buf);

return - 1;

+ }

saddr->sin_addr = *(struct in_addr *)he->h_addr;

port = strtol(p, (char **)&r, 0);

- if (r == p)

+ if (r == p) {

+ error_setg(errp, "port number '%s' is invalid", p);

return -1;

+ }

saddr->sin_port = htons(port);

return 0;

}

diff --git a/net/socket.c b/net/socket.c

index XXXXXXX..XXXXXXX 100644

--- a/net/socket.c

+++ b/net/socket.c

@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,

*/

if (is_connected && mcast != NULL) {

- if (parse_host_port(&saddr, mcast) < 0) {

- error_setg(errp, "fd=%d failed parse_host_port()", fd);

+ if (parse_host_port(&saddr, mcast, errp) < 0) {

goto err;

}

/* must be bound */

@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,

NetSocketState *s;

struct sockaddr_in saddr;

int fd, ret;

+ Error *err = NULL;

- if (parse_host_port(&saddr, host_str) < 0)

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

if (fd < 0) {

@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,

struct sockaddr_in saddr;

Error *err = NULL;

- if (parse_host_port(&saddr, host_str) < 0)

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

if (fd < 0) {

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,

struct in_addr localaddr, *param_localaddr;

Error *err = NULL;

- if (parse_host_port(&saddr, host_str) < 0)

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

if (localaddr_str != NULL) {

if (inet_aton(localaddr_str, &localaddr) == 0)

@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,

struct sockaddr_in laddr, raddr;

Error *err = NULL;

- if (parse_host_port(&laddr, lhost) < 0) {

+ if (parse_host_port(&laddr, lhost, &err) < 0) {

+ error_report_err(err);

return -1;

}

- if (parse_host_port(&raddr, rhost) < 0) {

+ if (parse_host_port(&raddr, rhost, &err) < 0) {

+ error_report_err(err);

return -1;

}

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

When -net socket fails, it first reports a specific error, then

a generic one, like this:

$ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen

qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is required

qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: Device 'socket' could not be initialized

Convert net_socket_*_init() to Error to get rid of the superfluous second

error message. After the patch, the effect like this:

$ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen

qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is requireda

This also fixes a few silent failures to report an error.

Cc: jasowang@redhat.com

Cc: armbru@redhat.com

Cc: berrange@redhat.com

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/socket.c | 92 +++++++++++++++++++++++++++++-------------------------------

1 file changed, 44 insertions(+), 48 deletions(-)

diff --git a/net/socket.c b/net/socket.c

index XXXXXXX..XXXXXXX 100644

--- a/net/socket.c