From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 31 Mar 2010 09:22:51 +0000 (+0200)
Subject: e1000: fix build on Ubuntu with _FORTIFY_SOURCE
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=98835fe30fa7d50695f037e84f76f9f139c59c7e;p=qemu.git

e1000: fix build on Ubuntu with _FORTIFY_SOURCE

There was a pointer cast warning on Ubuntu since _FORTIFY_SOURCE has been reenabled.

_FORTIFY_SOURCE had been disabled by 4a24470497360d8b77568b83008d0e9d6eb0787d
and reenabled by 849583050d5f6f782718be8cb50688978973fbea.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/e1000.c b/hw/e1000.c
index fd3059ad8a..34cc451cf7 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -642,7 +642,7 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
 
     if (vlan_enabled(s) && is_vlan_packet(s, buf)) {
         vlan_special = cpu_to_le16(be16_to_cpup((uint16_t *)(buf + 14)));
-        memmove((void *)(buf + 4), buf, 12);
+        memmove((uint8_t *)buf + 4, buf, 12);
         vlan_status = E1000_RXD_STAT_VP;
         vlan_offset = 4;
         size -= 4;