[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] qdev: add id= support for pci nics.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/6] qdev: add id= support for pci nics. |
Date: |
Wed, 15 Jul 2009 13:43:35 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci.c | 2 ++
net.c | 5 ++++-
net.h | 1 +
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 3232dda..79eab91 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -821,6 +821,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char
*default_model,
if (strcmp(nd->model, pci_nic_models[i]) == 0) {
pci_dev = pci_create(pci_nic_names[i], devaddr);
dev = &pci_dev->qdev;
+ if (nd->id)
+ dev->id = qemu_strdup(nd->id);
dev->nd = nd;
qdev_init(dev);
nd->private = dev;
diff --git a/net.c b/net.c
index 1507f37..ca8d232 100644
--- a/net.c
+++ b/net.c
@@ -2428,7 +2428,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;
@@ -2466,6 +2466,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 6026e10..188fa39 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;
VLANClientState *vc;
void *private;
--
1.6.2.5
- [Qemu-devel] [PATCH 0/6] qdev patches: properties, id=<tag>, more device info, Gerd Hoffmann, 2009/07/15
- [Qemu-devel] [PATCH 2/6] qdev: factor out driver search to qdev_find_info(), Gerd Hoffmann, 2009/07/15
- [Qemu-devel] [PATCH 3/6] qdev: add no_user, alias and desc, Gerd Hoffmann, 2009/07/15
- [Qemu-devel] [PATCH 4/6] qdev: add user-specified identifier to devices., Gerd Hoffmann, 2009/07/15
- [Qemu-devel] [PATCH 5/6] qdev: add id= support for pci nics.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/6] qdev: print device id in "info pci"., Gerd Hoffmann, 2009/07/15
- [Qemu-devel] [PATCH 1/6] qdev: rework device properties., Gerd Hoffmann, 2009/07/15