From patchwork Thu Jun 16 17:17:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 636601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rVrWw2Z5Hz9t15 for ; Fri, 17 Jun 2016 03:50:36 +1000 (AEST) Received: from localhost ([::1]:51329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDbR4-000073-1i for incoming@patchwork.ozlabs.org; Thu, 16 Jun 2016 13:50:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDb1f-0006I3-GV for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:24:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDb1e-0000sT-KN for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:24:19 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDb1e-0000s3-Dw for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:24:18 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bDav2-0007Y7-PA; Thu, 16 Jun 2016 18:17:28 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 16 Jun 2016 18:17:25 +0100 Message-Id: <1466097446-981-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466097446-981-1-git-send-email-peter.maydell@linaro.org> References: <1466097446-981-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 4/5] hw/net/virtio-net.c: Don't use *_to_cpup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Pirko , "Michael S. Tsirkin" , Jason Wang , patches@linaro.org, Scott Feldman , Dmitry Fleytman Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Don't use *_to_cpup() to do byte-swapped loads; instead use ld*_p() which correctly handle misaligned accesses. Signed-off-by: Peter Maydell --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5798f87..7e6a60a 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1051,7 +1051,7 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) ptr += n->host_hdr_len; if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { - int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff; + int vid = lduw_be_p(ptr + 14) & 0xfff; if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f)))) return 0; }