summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-18 13:13:16 +0100
committerMark McLoughlin <markmc@redhat.com>2009-06-09 11:38:49 +0100
commitcda9046ba7dbba45f3016e5d60caffa2d72960fa (patch)
treeda29fa06d782170b8214be44382549735eafa3b3 /hw/e1000.c
parentnet: add fd_readv() handler to qemu_new_vlan_client() args (diff)
downloadqemu-kvm-cda9046ba7dbba45f3016e5d60caffa2d72960fa.tar.gz
qemu-kvm-cda9046ba7dbba45f3016e5d60caffa2d72960fa.tar.bz2
qemu-kvm-cda9046ba7dbba45f3016e5d60caffa2d72960fa.zip
net: re-name vc->fd_read() to vc->receive()
VLANClientState's fd_read() handler doesn't read from file descriptors, it adds a buffer to the client's receive queue. Re-name the handlers to make things a little less confusing. Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'hw/e1000.c')
-rw-r--r--hw/e1000.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index 01ee57f03..20544d294 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -600,7 +600,7 @@ e1000_can_receive(void *opaque)
}
static void
-e1000_receive(void *opaque, const uint8_t *buf, int size)
+e1000_receive(void *opaque, const uint8_t *buf, size_t size)
{
E1000State *s = opaque;
struct e1000_rx_desc desc;
@@ -614,8 +614,8 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
return;
if (size > s->rxbuf_size) {
- DBGOUT(RX, "packet too large for buffers (%d > %d)\n", size,
- s->rxbuf_size);
+ DBGOUT(RX, "packet too large for buffers (%lu > %d)\n",
+ (unsigned long)size, s->rxbuf_size);
return;
}