From patchwork Wed Oct 21 13:25:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4ADDCB7B99 for ; Thu, 22 Oct 2009 00:53:15 +1100 (EST) Received: from localhost ([127.0.0.1]:37814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bcm-0005gA-Ge for incoming@patchwork.ozlabs.org; Wed, 21 Oct 2009 09:53:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bCN-0007jc-Cu for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bCI-0007cX-Ha for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:54 -0400 Received: from [199.232.76.173] (port=55706 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bCI-0007cG-DJ for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5010) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bCH-0007O4-UO for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:50 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LDPnaa011387 for ; Wed, 21 Oct 2009 09:25:49 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-113.ams2.redhat.com [10.36.9.113]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9LDPjr4032364; Wed, 21 Oct 2009 09:25:46 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id D20A370107; Wed, 21 Oct 2009 15:25:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 21 Oct 2009 15:25:22 +0200 Message-Id: <1256131543-28416-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1256131543-28416-1-git-send-email-kraxel@redhat.com> References: <1256131543-28416-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 01/22] net: add macaddr type. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add new type for mac addresses. Add function which sets the qemu default mac address if it finds the mac address uninitialized (i.e. all zeros). Signed-off-by: Gerd Hoffmann --- net.c | 15 +++++++++++++++ net.h | 5 +++++ qemu-common.h | 1 + 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 4708080..3b69d3b 100644 --- a/net.c +++ b/net.c @@ -280,6 +280,21 @@ void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]) macaddr[3], macaddr[4], macaddr[5]); } +void qemu_macaddr_default_if_unset(MACAddr *macaddr) +{ + static int index = 0; + static const MACAddr zero = { .a = { 0,0,0,0,0,0 } }; + + if (memcmp(macaddr, &zero, sizeof(zero)) != 0) + return; + 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++; +} + static char *assign_name(VLANClientState *vc1, const char *model) { VLANState *vlan; diff --git a/net.h b/net.h index 439de2a..605092a 100644 --- a/net.h +++ b/net.h @@ -7,6 +7,10 @@ #include "qemu-option.h" #include "net-queue.h" +struct MACAddr { + uint8_t a[6]; +}; + /* VLANs support */ typedef int (NetCanReceive)(VLANClientState *); @@ -65,6 +69,7 @@ ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf, void qemu_purge_queued_packets(VLANClientState *vc); void qemu_flush_queued_packets(VLANClientState *vc); void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]); +void qemu_macaddr_default_if_unset(MACAddr *macaddr); int qemu_show_nic_models(const char *arg, const char *const *models); void qemu_check_nic_model(NICInfo *nd, const char *model); int qemu_find_nic_model(NICInfo *nd, const char * const *models, diff --git a/qemu-common.h b/qemu-common.h index 8551862..980f362 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -180,6 +180,7 @@ typedef struct PixelFormat PixelFormat; typedef struct TextConsole TextConsole; typedef TextConsole QEMUConsole; typedef struct CharDriverState CharDriverState; +typedef struct MACAddr MACAddr; typedef struct VLANState VLANState; typedef struct VLANClientState VLANClientState; typedef struct QEMUFile QEMUFile;