Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-merge

* commit '0ba99fc6a188988f11361cb41eba7c1afce346d4': (46 commits)
  configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target
  already defined several lines before in block-obj-y
  Remove unused Makefile variable
  use nwfpe-obj-y for consistence
  use block-nested-y for files inside block/
  Remove duplicated definition
  fix sparc not solaris build
  fix XEN Build
  fix for bad macaddr of e1000 in Windows 2003 server with original MS driver
  qdev: es1370+ac97 description
  qdev/compat: virtio-net-pci 0.10 compatibility.
  qdev: print device id in "info pci".
  qdev/compat: virtio-console-pci 0.10 compatibility.
  qdev: add id= support for pci nics.
  qdev/compat: virtio-blk-pci 0.10 compatibility.
  qdev: add user-specified identifier to devices.
  qdev/compat: add pc-0.10 machine type.
  qdev: add no_user, alias and desc
  qdev/compat: compat property infrastructure.
  qdev: factor out driver search to qdev_find_info()
  ...

Conflicts:
	Makefile.target

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/net.c b/net.c
index df6691cc0..35a5fa904 100644
--- a/net.c
+++ b/net.c
@@ -2593,7 +2593,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;
@@ -2631,6 +2631,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;