From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MMfvW-0001p7-MZ for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:23:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MMfvR-0001jd-Cg for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:23:29 -0400 Received: from [199.232.76.173] (port=51457 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MMfvQ-0001jB-Up for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:23:24 -0400 Received: from mx2.redhat.com ([66.187.237.31]:57947) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MMfvO-00061e-CM for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:23:23 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n63ANHU3003025 for ; Fri, 3 Jul 2009 06:23:17 -0400 From: Gerd Hoffmann Date: Fri, 3 Jul 2009 12:22:57 +0200 Message-Id: <1246616578-6560-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1246616578-6560-1-git-send-email-kraxel@redhat.com> References: <1246616578-6560-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 12/13] qdev: add id= support for pci nics. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/pci.c | 1 + net.c | 5 ++++- net.h | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index af72468..5acf0d9 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -820,6 +820,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, for (i = 0; pci_nic_models[i]; i++) { if (strcmp(nd->model, pci_nic_models[i]) == 0) { dev = pci_create(pci_nic_names[i], devaddr); + snprintf(dev->id, sizeof(dev->id), "%s", nd->id); dev->nd = nd; qdev_init(dev); nd->private = dev; diff --git a/net.c b/net.c index 001ebcb..aeadd4a 100644 --- a/net.c +++ b/net.c @@ -2406,7 +2406,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; @@ -2444,6 +2444,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 64d5e22..c317671 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; void *private; int used; -- 1.6.2.5