[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line sy
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax |
Date: |
Mon, 11 Jan 2016 14:34:28 +0000 |
From: Ashok Kumar <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
[PMM: expanded and clarified commit message]
Signed-off-by: Peter Maydell <address@hidden>
---
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("/address@hidden" PRIx64, base);
qemu_fdt_add_subnode(vbi->fdt, nodename);
qemu_fdt_setprop_string(vbi->fdt, nodename,
--
1.9.1
- [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2016/01/11
- [Qemu-devel] [PULL 2/5] hw/dma/xilinx_axidma: remove dead code, Peter Maydell, 2016/01/11
- [Qemu-devel] [PULL 1/5] i.MX: move i.MX31 CCM object to register array, Peter Maydell, 2016/01/11
- [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax,
Peter Maydell <=
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Eric Auger, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Peter Maydell, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Eric Auger, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Peter Maydell, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Eric Auger, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Alex Williamson, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Eric Auger, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Peter Maydell, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Markus Armbruster, 2016/01/18
- Re: [Qemu-devel] [PULL 5/5] hw/arm/virt: Support legacy -nic command line syntax, Alex Williamson, 2016/01/18