Add a -net name=foo parameter (Mark McLoughlin)

[qemu] / hw / mipsnet.c

diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index 5a74ad9..0eb4c1e 100644 (file)
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -11,7 +11,6 @@
 /* MIPSnet register offsets */
 
 #define MIPSNET_DEV_ID         0x00
-# define MIPSNET_DEV_ID_STRING "MIPSNET0"
 #define MIPSNET_BUSY           0x08
 #define MIPSNET_RX_DATA_COUNT  0x0c
 #define MIPSNET_TX_DATA_COUNT  0x10
@@ -105,15 +104,14 @@ static uint32_t mipsnet_ioport_read(void *opaque, uint32_t addr)
 {
     MIPSnetState *s = opaque;
     int ret = 0;
-    const char *devid = MIPSNET_DEV_ID_STRING;
 
     addr &= 0x3f;
     switch (addr) {
     case MIPSNET_DEV_ID:
-       ret = *((uint32_t *)&devid);
+       ret = be32_to_cpu(0x4d495053);          /* MIPS */
         break;
     case MIPSNET_DEV_ID + 4:
-       ret = *((uint32_t *)(&devid + 4));
+       ret = be32_to_cpu(0x4e455430);          /* NET0 */
         break;
     case MIPSNET_BUSY:
        ret = s->busy;
@@ -252,20 +250,13 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
     s->irq = irq;
     s->nd = nd;
     if (nd && nd->vlan) {
-        s->vc = qemu_new_vlan_client(nd->vlan, mipsnet_receive,
-                                     mipsnet_can_receive, s);
+        s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
+                                     mipsnet_receive, mipsnet_can_receive, s);
     } else {
         s->vc = NULL;
     }
 
-    snprintf(s->vc->info_str, sizeof(s->vc->info_str),
-             "mipsnet macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
-              s->nd->macaddr[0],
-              s->nd->macaddr[1],
-              s->nd->macaddr[2],
-              s->nd->macaddr[3],
-              s->nd->macaddr[4],
-              s->nd->macaddr[5]);
+    qemu_format_nic_info_str(s->vc, s->nd->macaddr);
 
     mipsnet_reset(s);
     register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s);