From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XK4ze-000068-AB for qemu-devel@nongnu.org; Wed, 20 Aug 2014 08:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XK4zY-0007yB-2F for qemu-devel@nongnu.org; Wed, 20 Aug 2014 08:27:58 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:36014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XK4zX-0007xk-PO for qemu-devel@nongnu.org; Wed, 20 Aug 2014 08:27:51 -0400 Received: by mail-we0-f175.google.com with SMTP id t60so7795302wes.20 for ; Wed, 20 Aug 2014 05:27:50 -0700 (PDT) From: Ben Draper Date: Wed, 20 Aug 2014 13:27:14 +0100 Message-Id: <1408537634-3812-1-git-send-email-ben@xrsa.net> Subject: [Qemu-devel] [PATCH] vmxnet3: Pad short frames to minimum size (60 bytes) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Ben Draper , stefanha@redhat.com When running VMware ESXi under qemu-kvm the guest discards frames that are too short. Short ARP Requests will be dropped, this prevents guests on the same bridge as VMware ESXi from communicating. This patch simply adds the padding on the network device itself. Signed-off-by: Ben Draper --- hw/net/vmxnet3.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 791321f..f246fa1 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -34,6 +34,7 @@ #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 #define VMXNET3_MSIX_BAR_SIZE 0x2000 +#define MIN_BUF_SIZE 60 #define VMXNET3_BAR0_IDX (0) #define VMXNET3_BAR1_IDX (1) @@ -1871,12 +1872,21 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size) { VMXNET3State *s = qemu_get_nic_opaque(nc); size_t bytes_indicated; + uint8_t min_buf[MIN_BUF_SIZE]; if (!vmxnet3_can_receive(nc)) { VMW_PKPRN("Cannot receive now"); return -1; } + /* Pad to minimum Ethernet frame length */ + if (size < sizeof(min_buf)) { + memcpy(min_buf, buf, size); + memset(&min_buf[size], 0, sizeof(min_buf) - size); + buf = min_buf; + size = sizeof(min_buf); + } + if (s->peer_has_vhdr) { vmxnet_rx_pkt_set_vhdr(s->rx_pkt, (struct virtio_net_hdr *)buf); buf += sizeof(struct virtio_net_hdr); -- 1.7.10.4