summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-08 19:01:37 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-08 19:01:37 +0000
commit4dda406337050578c252374981733223c9af72f3 (patch)
tree2213d5cf90dc27c18404135fa2154cec7f665edb
parentc026766b15a9324baeb2068e3b07658aae0b177b (diff)
downloadhqemu-4dda406337050578c252374981733223c9af72f3.zip
hqemu-4dda406337050578c252374981733223c9af72f3.tar.gz
Add model field to nic info (Mark McLoughlin)
The model type used to be printed as part of the nic info. It was removed when the name type was added. This adds back a model field for those that were using it previously. 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@6239 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--net.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net.c b/net.c
index 15f9153..0a91585 100644
--- a/net.c
+++ b/net.c
@@ -299,7 +299,8 @@ static int parse_unix_path(struct sockaddr_un *uaddr, const char *str)
void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6])
{
snprintf(vc->info_str, sizeof(vc->info_str),
- "macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
+ "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
+ vc->model,
macaddr[0], macaddr[1], macaddr[2],
macaddr[3], macaddr[4], macaddr[5]);
}
OpenPOWER on IntegriCloud