From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoZak-0000fr-Pk for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:35:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoZaf-0008I7-U8 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:35:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoZaf-0008Hx-NT for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:35:25 -0400 From: Amos Kong Date: Mon, 17 Jun 2013 21:35:11 +0800 Message-Id: <1371476111-4449-3-git-send-email-akong@redhat.com> In-Reply-To: <1371476111-4449-1-git-send-email-akong@redhat.com> References: <1371476111-4449-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] extend the macaddr space to 0xffffffff List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanha@redhat.com Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, mst@redhat.com Currently we only support to allocate 0xff mac-addresses, if we start guest by pci-bridge/multiple-func, the macaddr are not enough. This patch extends the mac-address space to 0xffffffff 52:54:00:00:00:00 ~ 52:54:ff:ff:ff:ff Signed-off-by: Amos Kong --- net/net.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/net.c b/net/net.c index f019da4..78bb080 100644 --- a/net/net.c +++ b/net/net.c @@ -153,10 +153,12 @@ void qemu_macaddr_default_if_unset(MACAddr *macaddr) realloc_mac: macaddr->a[0] = 0x52; macaddr->a[1] = 0x54; - macaddr->a[2] = 0x00; - macaddr->a[3] = 0x12; - macaddr->a[4] = 0x34; - macaddr->a[5] = 0x56 + index++; + macaddr->a[2] = 0x00 + ((0x120000 + 0x3400 + 0x56 + index) >> 24 & 0xff); + macaddr->a[3] = 0x12 + ((0x3400 + 0x56 + index) >> 16 & 0xff); + macaddr->a[4] = 0x34 + ((0x56 + index) >> 8 & 0xff); + macaddr->a[5] = 0x56 + (index & 0xff); + + index++; QTAILQ_FOREACH(nc, &net_clients, next) { peer = nc->peer; -- 1.8.1.4