Patchwork [RFC,v2,1/5] net: macaddr tweaks.

login
register
mail settings
Submitter Gerd Hoffmann
Date Oct. 7, 2009, 12:36 p.m.
Message ID <1254918996-26050-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/35277/
State RFC
Headers show

Comments

Gerd Hoffmann - Oct. 7, 2009, 12:36 p.m.
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 <kraxel@redhat.com>
---
 net.c |   15 +++++++++++++++
 net.h |    2 ++
 2 files changed, 17 insertions(+), 0 deletions(-)
Anthony Liguori - Oct. 7, 2009, 1:05 p.m.
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 <kraxel@redhat.com>
> ---
>  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
Gerd Hoffmann - Oct. 7, 2009, 1:14 p.m.
>> +typedef uint8_t macaddr_t[6];
>
> Let's make it a stronger type and avoid introducing more _t types. I'd
> suggest:

Oh yes, killing that _t was on the todo list anyway, forgot it.
Will do for the next respin.

> typedef struct MacAddress
> {
> uint8_t addr[6];
> } MacAddress

Why the extra struct?

cheers,
   Gerd
Anthony Liguori - Oct. 7, 2009, 1:23 p.m.
Gerd Hoffmann wrote:
>>> +typedef uint8_t macaddr_t[6];
>>
>> Let's make it a stronger type and avoid introducing more _t types. I'd
>> suggest:
>
> Oh yes, killing that _t was on the todo list anyway, forgot it.
> Will do for the next respin.
>
>> typedef struct MacAddress
>> {
>> uint8_t addr[6];
>> } MacAddress
>
> Why the extra struct?

To make the type strong so that type checking actually works.

Regards,

Anthony Liguori

Patch

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,