[Qemu-devel] [PATCH 12/13] qdev: add id= support for pci nics.

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 hw/pci.c |    1 +
 net.c    |    5 ++++-
 net.h    |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index af72468..5acf0d9 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -820,6 +820,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char 
*default_model,
     for (i = 0; pci_nic_models[i]; i++) {
         if (strcmp(nd->model, pci_nic_models[i]) == 0) {
             dev = pci_create(pci_nic_names[i], devaddr);
+            snprintf(dev->id, sizeof(dev->id), "%s", nd->id);
             dev->nd = nd;
             qdev_init(dev);
             nd->private = dev;
diff --git a/net.c b/net.c
index 001ebcb..aeadd4a 100644
--- a/net.c
+++ b/net.c
@@ -2406,7 +2406,7 @@ int net_client_init(Monitor *mon, const char *device, 
const char *p)
     }
     if (!strcmp(device, "nic")) {
         static const char * const nic_params[] = {
-            "vlan", "name", "macaddr", "model", "addr", "vectors", NULL
+            "vlan", "name", "macaddr", "model", "addr", "id", "vectors", NULL
         };
         NICInfo *nd;
         uint8_t *macaddr;
@@ -2444,6 +2444,9 @@ int net_client_init(Monitor *mon, const char *device, 
const char *p)
         if (get_param_value(buf, sizeof(buf), "addr", p)) {
             nd->devaddr = strdup(buf);
         }
+        if (get_param_value(buf, sizeof(buf), "id", p)) {
+            nd->id = strdup(buf);
+        }
         nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
         if (get_param_value(buf, sizeof(buf), "vectors", p)) {
             char *endptr;
diff --git a/net.h b/net.h
index 64d5e22..c317671 100644
--- a/net.h
+++ b/net.h
@@ -95,6 +95,7 @@ struct NICInfo {
     const char *model;
     const char *name;
     const char *devaddr;
+    const char *id;
     VLANState *vlan;
     void *private;
     int used;
-- 
1.6.2.5