From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvVlJ-0008H8-8A for qemu-devel@nongnu.org; Wed, 07 Oct 2009 08:36:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvVlE-0008FL-Gm for qemu-devel@nongnu.org; Wed, 07 Oct 2009 08:36:56 -0400 Received: from [199.232.76.173] (port=56751 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvVlE-0008F5-7P for qemu-devel@nongnu.org; Wed, 07 Oct 2009 08:36:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1939) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvVlD-0004QM-Nw for qemu-devel@nongnu.org; Wed, 07 Oct 2009 08:36:52 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n97CapTT005785 for ; Wed, 7 Oct 2009 08:36:51 -0400 From: Gerd Hoffmann Date: Wed, 7 Oct 2009 14:36:32 +0200 Message-Id: <1254918996-26050-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1254918996-26050-1-git-send-email-kraxel@redhat.com> References: <1254918996-26050-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RFC PATCH v2 1/5] net: macaddr tweaks. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 | 2 ++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 2e4dd58..4dc910b 100644 --- a/net.c +++ b/net.c @@ -281,6 +281,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_t macaddr) +{ + static int index = 0; + static const macaddr_t zero = { 0,0,0,0,0,0 }; + + if (memcmp(macaddr, zero, sizeof(zero)) != 0) + return; + macaddr[0] = 0x52; + macaddr[1] = 0x54; + macaddr[2] = 0x00; + macaddr[3] = 0x12; + macaddr[4] = 0x34; + macaddr[5] = 0x56 + index++; +} + static char *assign_name(VLANClientState *vc1, const char *model) { VLANState *vlan; diff --git a/net.h b/net.h index 2b0ed9b..7aefc51 100644 --- a/net.h +++ b/net.h @@ -8,6 +8,7 @@ /* VLANs support */ +typedef uint8_t macaddr_t[6]; typedef struct VLANClientState VLANClientState; typedef int (NetCanReceive)(VLANClientState *); @@ -76,6 +77,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_t 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, -- 1.6.2.5