diff options
| -rw-r--r-- | hw/net/net_tx_pkt.c | 5 | ||||
| -rw-r--r-- | net/net.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c index 53dfaa292c..20b25496e5 100644 --- a/hw/net/net_tx_pkt.c +++ b/hw/net/net_tx_pkt.c @@ -65,10 +65,9 @@ void net_tx_pkt_init(struct NetTxPkt **pkt, PCIDevice *pci_dev, p->pci_dev = pci_dev; - p->vec = g_malloc((sizeof *p->vec) * - (max_frags + NET_TX_PKT_PL_START_FRAG)); + p->vec = g_new(struct iovec, max_frags + NET_TX_PKT_PL_START_FRAG); - p->raw = g_malloc((sizeof *p->raw) * max_frags); + p->raw = g_new(struct iovec, max_frags); p->max_payload_frags = max_frags; p->max_raw_frags = max_frags; @@ -1602,9 +1602,8 @@ void net_socket_rs_init(SocketReadState *rs, /* * Returns - * 0: SocketReadState is not ready - * 1: SocketReadState is ready - * otherwise error occurs + * 0: success + * -1: error occurs */ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) { @@ -1652,10 +1651,11 @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) if (rs->finalize) { rs->finalize(rs); } - return 1; } break; } } + + assert(size == 0); return 0; } |