summaryrefslogtreecommitdiff
path: root/hw/pcnet.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-07 17:42:25 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-07 17:42:25 +0000
commitbf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db (patch)
tree039ac39a81763f10008b429ab1ef12577e1bd737 /hw/pcnet.c
parentf7b4a940a430da0e2d48b74e85a8a941c1c2fabc (diff)
downloadqemu-bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db.tar.gz
qemu-bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db.tar.bz2
qemu-bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db.zip
Add a model string to VLANClientState (Mark McLoughlin)
Don't lose track of what type/model a vlan client is so that we can e.g. assign a global per-model id to clients. The entire patch is basically a tedious excercise in making sure the type/model string gets propagated down to qemu_new_vlan_client(). Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6216 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pcnet.c')
-rw-r--r--hw/pcnet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 30c453c937..e961a06db2 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -1936,8 +1936,8 @@ static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str)
d->nd = nd;
if (nd && nd->vlan) {
- d->vc = qemu_new_vlan_client(nd->vlan, pcnet_receive,
- pcnet_can_receive, d);
+ d->vc = qemu_new_vlan_client(nd->vlan, nd->model,
+ pcnet_receive, pcnet_can_receive, d);
snprintf(d->vc->info_str, sizeof(d->vc->info_str),
"pcnet macaddr=%02x:%02x:%02x:%02x:%02x:%02x",