From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 8 Oct 2009 18:58:22 +0000 (+0100)
Subject: net: remove id field from NICInfo
X-Git-Tag: v0.12.0-rc0~682
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dea7b3b95a0e6b88e0647e7afc8b6a7b5675fbb1;p=thirdparty%2Fqemu.git

net: remove id field from NICInfo

Just use the name field instead since we now use the id paramater as
the name, if supplied. Only implication with this change is that if
id is not supplied, the value of the name paramater is used as an
id.

Patchworks-ID: 35512
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index 49651d09f0c..abf07cabd0e 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -857,8 +857,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
 
     pci_dev = pci_create(bus, devfn, pci_nic_names[i]);
     dev = &pci_dev->qdev;
-    if (nd->id)
-        dev->id = qemu_strdup(nd->id);
+    if (nd->name)
+        dev->id = qemu_strdup(nd->name);
     dev->nd = nd;
     if (qdev_init(dev) < 0)
         return NULL;
diff --git a/net.c b/net.c
index 8895e873af2..87dcf06a3ee 100644
--- a/net.c
+++ b/net.c
@@ -2414,9 +2414,6 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon, const char *name)
     if (name) {
         nd->name = qemu_strdup(name);
     }
-    if (qemu_opts_id(opts)) {
-        nd->id = qemu_strdup(qemu_opts_id(opts));
-    }
     if (qemu_opt_get(opts, "model")) {
         nd->model = qemu_strdup(qemu_opt_get(opts, "model"));
     }
@@ -3032,7 +3029,6 @@ void net_client_uninit(NICInfo *nd)
     qemu_free(nd->model);
     qemu_free(nd->name);
     qemu_free(nd->devaddr);
-    qemu_free(nd->id);
 
     nd->used = 0;
 }
diff --git a/net.h b/net.h
index 49e160d3222..164ea3d7652 100644
--- a/net.h
+++ b/net.h
@@ -98,7 +98,6 @@ struct NICInfo {
     char *model;
     char *name;
     char *devaddr;
-    char *id;
     VLANState *vlan;
     VLANClientState *vc;
     void *private;