qdev: add id= support for pci nics.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
ab73ff29ce
commit
eb54b6dcb8
2
hw/pci.c
2
hw/pci.c
|
@ -822,6 +822,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
|
||||||
if (strcmp(nd->model, pci_nic_models[i]) == 0) {
|
if (strcmp(nd->model, pci_nic_models[i]) == 0) {
|
||||||
pci_dev = pci_create(pci_nic_names[i], devaddr);
|
pci_dev = pci_create(pci_nic_names[i], devaddr);
|
||||||
dev = &pci_dev->qdev;
|
dev = &pci_dev->qdev;
|
||||||
|
if (nd->id)
|
||||||
|
dev->id = qemu_strdup(nd->id);
|
||||||
dev->nd = nd;
|
dev->nd = nd;
|
||||||
qdev_init(dev);
|
qdev_init(dev);
|
||||||
nd->private = dev;
|
nd->private = dev;
|
||||||
|
|
5
net.c
5
net.c
|
@ -2428,7 +2428,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
|
||||||
}
|
}
|
||||||
if (!strcmp(device, "nic")) {
|
if (!strcmp(device, "nic")) {
|
||||||
static const char * const nic_params[] = {
|
static const char * const nic_params[] = {
|
||||||
"vlan", "name", "macaddr", "model", "addr", "vectors", NULL
|
"vlan", "name", "macaddr", "model", "addr", "id", "vectors", NULL
|
||||||
};
|
};
|
||||||
NICInfo *nd;
|
NICInfo *nd;
|
||||||
uint8_t *macaddr;
|
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)) {
|
if (get_param_value(buf, sizeof(buf), "addr", p)) {
|
||||||
nd->devaddr = strdup(buf);
|
nd->devaddr = strdup(buf);
|
||||||
}
|
}
|
||||||
|
if (get_param_value(buf, sizeof(buf), "id", p)) {
|
||||||
|
nd->id = strdup(buf);
|
||||||
|
}
|
||||||
nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
|
nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
|
||||||
if (get_param_value(buf, sizeof(buf), "vectors", p)) {
|
if (get_param_value(buf, sizeof(buf), "vectors", p)) {
|
||||||
char *endptr;
|
char *endptr;
|
||||||
|
|
Loading…
Reference in a new issue