From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIdYI-0007nZ-8l for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:34:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIdYE-000628-Az for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:34:34 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIdYE-00061Q-4a for qemu-devel@nongnu.org; Mon, 11 Jan 2016 09:34:30 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aIdYC-0006ep-FD for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:28 +0000 From: Peter Maydell Date: Mon, 11 Jan 2016 14:34:28 +0000 Message-Id: <1452522868-25550-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1452522868-25550-1-git-send-email-peter.maydell@linaro.org> References: <1452522868-25550-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Ashok Kumar Support the legacy -nic syntax for creating PCI network devices as well as the new-style -device options. This makes life easier for people moving from x86 KVM virtualization to ARM KVM virtualization and expecting their network configuration options to work the same way for both setups. We use "virtio" as the default NIC model if the user doesn't specify one. Signed-off-by: Ashok Kumar Message-id: 1452091659-17698-1-git-send-email-ashoks@broadcom.com Reviewed-by: Peter Maydell [PMM: expanded and clarified commit message] Signed-off-by: Peter Maydell --- hw/arm/virt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index acc1fcb..fd52b76 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -808,6 +808,7 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, DeviceState *dev; char *nodename; int i; + PCIHostState *pci; dev = qdev_create(NULL, TYPE_GPEX_HOST); qdev_init_nofail(dev); @@ -847,6 +848,19 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, pic[irq + i]); } + pci = PCI_HOST_BRIDGE(dev); + if (pci->bus) { + for (i = 0; i < nb_nics; i++) { + NICInfo *nd = &nd_table[i]; + + if (!nd->model) { + nd->model = g_strdup("virtio"); + } + + pci_nic_init_nofail(nd, pci->bus, nd->model, NULL); + } + } + nodename = g_strdup_printf("/pcie@%" PRIx64, base); qemu_fdt_add_subnode(vbi->fdt, nodename); qemu_fdt_setprop_string(vbi->fdt, nodename, -- 1.9.1