From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvWDR-000411-EK for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:06:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvWDM-0003xC-Ao for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:06:00 -0400 Received: from [199.232.76.173] (port=36300 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvWDM-0003x1-2V for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:05:56 -0400 Received: from qw-out-1920.google.com ([74.125.92.146]:50527) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvWDL-0000TS-KF for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:05:55 -0400 Received: by qw-out-1920.google.com with SMTP id 5so1600308qwc.4 for ; Wed, 07 Oct 2009 06:05:54 -0700 (PDT) Message-ID: <4ACC922F.6020505@codemonkey.ws> Date: Wed, 07 Oct 2009 08:05:51 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [RFC PATCH v2 1/5] net: macaddr tweaks. References: <1254918996-26050-1-git-send-email-kraxel@redhat.com> <1254918996-26050-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1254918996-26050-2-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Gerd Hoffmann wrote: > 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]; > Let's make it a stronger type and avoid introducing more _t types. I'd suggest: typedef struct MacAddress { uint8_t addr[6]; } MacAddress > 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); > Couldn't we set the default based on a qdev default property? A #define could be used to ensure there was a global default. Regards, Anthony Liguori