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>

pci_rocker_init() leaks a World when the name more than 9 chars,

then return a negative value directly, doesn't make a correct

cleanup. So add a new goto label to fix it.

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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

---

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

1 file changed, 3 insertions(+), 1 deletion(-)

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 pci_rocker_init(PCIDevice *dev)

fprintf(stderr,

"rocker: name too long; please shorten to at most %d chars\n",

MAX_ROCKER_NAME_LEN);

- return -EINVAL;

+ err = -EINVAL;

+ goto err_name_too_long;

}

if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) == 0) {

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

return 0;

+err_name_too_long:

err_duplicate:

rocker_msix_uninit(r);

err_msix_init:

--

2.7.4

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

The rocker device still implements the old PCIDeviceClass .init()

instead of the new .realize(). All devices need to be converted to

.realize().

.init() reports errors with fprintf() and return 0 on success, negative

number on failure. Meanwhile, when -device rocker fails, it first report

a specific error, then a generic one, like this:

$ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker

rocker: name too long; please shorten to at most 9 chars

qemu-system-x86_64: -device rocker,name=qemu-rocker: Device initialization failed

Now, convert it to .realize() that passes errors to its callers via its

errp argument. Also avoid the superfluous second error message. After

the patch, effect like this:

$ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker

qemu-system-x86_64: -device rocker,name=qemu-rocker: name too long; please shorten to at most 9 chars

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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

---

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

1 file changed, 11 insertions(+), 16 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 @@ rollback:

return err;

}

-static int rocker_msix_init(Rocker *r)

+static int rocker_msix_init(Rocker *r, Error **errp)

{

PCIDevice *dev = PCI_DEVICE(r);

int err;

- Error *local_err = NULL;

err = msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports),

&r->msix_bar,

ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET,

&r->msix_bar,

ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET,

- 0, &local_err);

+ 0, errp);

if (err) {

- error_report_err(local_err);

return err;

}

@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)

return NULL;

}

-static int pci_rocker_init(PCIDevice *dev)

+static void pci_rocker_realize(PCIDevice *dev, Error **errp)

{

Rocker *r = to_rocker(dev);

const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };

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

r->world_dflt = rocker_world_type_by_name(r, r->world_name);

if (!r->world_dflt) {

- fprintf(stderr,

- "rocker: requested world \"%s\" does not exist\n",

+ error_setg(errp,

+ "invalid argument requested world %s does not exist",

r->world_name);

- err = -EINVAL;

goto err_world_type_by_name;

}

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

/* MSI-X init */

- err = rocker_msix_init(r);

+ err = rocker_msix_init(r, errp);

if (err) {

goto err_msix_init;

}

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

}

if (rocker_find(r->name)) {

- err = -EEXIST;

+ error_setg(errp, "%s already exists", r->name);

goto err_duplicate;

}

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

#define ROCKER_IFNAMSIZ 16

#define MAX_ROCKER_NAME_LEN (ROCKER_IFNAMSIZ - 1 - 3 - 3)

if (strlen(r->name) > MAX_ROCKER_NAME_LEN) {

- fprintf(stderr,

- "rocker: name too long; please shorten to at most %d chars\n",

+ error_setg(errp,

+ "name too long; please shorten to at most %d chars",

MAX_ROCKER_NAME_LEN);

- err = -EINVAL;

goto err_name_too_long;

}

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

QLIST_INSERT_HEAD(&rockers, r, next);

- return 0;

+ return;

err_name_too_long:

err_duplicate:

@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:

world_free(r->worlds[i]);

}

}

- return err;

}

static void pci_rocker_uninit(PCIDevice *dev)

@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)

DeviceClass *dc = DEVICE_CLASS(klass);

PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);

- k->init = pci_rocker_init;

+ k->realize = pci_rocker_realize;

k->exit = pci_rocker_uninit;

k->vendor_id = PCI_VENDOR_ID_REDHAT;

k->device_id = PCI_DEVICE_ID_REDHAT_ROCKER;

--

2.7.4

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

Cc: jasowang@redhat.com

Cc: jiri@resnulli.us

Cc: armbru@redhat.com

Cc: f4bug@amsat.org

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

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

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

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

---

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

1 file changed, 9 insertions(+), 9 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 @@ struct rocker {

QLIST_ENTRY(rocker) next;

};

-#define ROCKER "rocker"

+#define TYPE_ROCKER "rocker"

-#define to_rocker(obj) \

- OBJECT_CHECK(Rocker, (obj), ROCKER)

+#define ROCKER(obj) \

+ OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)

static QLIST_HEAD(, rocker) rockers;

@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)

static void pci_rocker_realize(PCIDevice *dev, Error **errp)

{

- Rocker *r = to_rocker(dev);

+ Rocker *r = ROCKER(dev);

const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };

const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };

static int sw_index;

@@ -XXX,XX +XXX,XX @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)

/* validate switch properties */

if (!r->name) {

- r->name = g_strdup(ROCKER);

+ r->name = g_strdup(TYPE_ROCKER);

}

if (rocker_find(r->name)) {

@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:

static void pci_rocker_uninit(PCIDevice *dev)

{

- Rocker *r = to_rocker(dev);

+ Rocker *r = ROCKER(dev);

int i;

QLIST_REMOVE(r, next);

@@ -XXX,XX +XXX,XX @@ static void pci_rocker_uninit(PCIDevice *dev)

static void rocker_reset(DeviceState *dev)

{

- Rocker *r = to_rocker(dev);

+ Rocker *r = ROCKER(dev);

int i;

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

@@ -XXX,XX +XXX,XX @@ static Property rocker_properties[] = {

};

static const VMStateDescription rocker_vmsd = {

- .name = ROCKER,

+ .name = TYPE_ROCKER,

.unmigratable = 1,

};

@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)

}

static const TypeInfo rocker_info = {

- .name = ROCKER,

+ .name = TYPE_ROCKER,

.parent = TYPE_PCI_DEVICE,

.instance_size = sizeof(Rocker),

.class_init = rocker_class_init,

--

2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

My Fujitsu mail account will be disabled soon, update the mail info

to my private mail.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

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

---

MAINTAINERS | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS

index XXXXXXX..XXXXXXX 100644

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ F: include/migration/failover.h

F: docs/COLO-FT.txt

COLO Proxy

-M: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

+M: Zhang Chen <zhangckid@gmail.com>

M: Li Zhijian <lizhijian@cn.fujitsu.com>

S: Supported

F: docs/colo-proxy.txt

--

2.7.4

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

In net_socket_fd_init(), the 'default' case is odd: it warns,

then continues as if the socket type was SOCK_STREAM. The

comment explains "this could be a eg. a pty", but that makes

no sense. If @fd really was a pty, getsockopt() would fail

with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor

SOCK_STREAM. It should not be treated as if it was SOCK_STREAM.

Turn this case into an Error. If there is a genuine reason to

support something like SOCK_RAW, it should be explicitly

handled.

Cc: jasowang@redhat.com

Cc: armbru@redhat.com

Cc: berrange@redhat.com

Cc: armbru@redhat.com

Cc: eblake@redhat.com

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

Suggested-by: Daniel P. Berrange <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 | 6 +++---

1 file changed, 3 insertions(+), 3 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 NetSocketState *net_socket_fd_init(NetClientState *peer,

case SOCK_STREAM:

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

default:

- /* who knows ... this could be a eg. a pty, do warn and continue as stream */

- fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd);

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

+ error_report("socket type=%d for fd=%d must be either"

+ " SOCK_DGRAM or SOCK_STREAM", so_type, fd);

+ closesocket(fd);

}

return NULL;

}

--

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>

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

---

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

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

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

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

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/sockets.h

+++ b/include/qemu/sockets.h

@@ -XXX,XX +XXX,XX @@ void socket_listen_cleanup(int fd, Error **errp);

int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);

/* Old, ipv4 only bits. Don't use for new code. */

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

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

+ Error **errp);

int socket_init(void);

/**

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

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c