| Message ID | 20240108204909.564514-41-dwmw2@infradead.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Rework matching of network devices to -nic options | expand |
On 08/01/2024 21.27, David Woodhouse wrote: > From: David Woodhouse <dwmw@amazon.co.uk> > > Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> > --- > hw/s390x/s390-virtio-ccw.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 1169e20b94..202c378131 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -221,16 +221,9 @@ static void s390_init_ipl_dev(const char *kernel_filename, > > static void s390_create_virtio_net(BusState *bus, const char *name) > { > - int i; > - > - for (i = 0; i < nb_nics; i++) { > - NICInfo *nd = &nd_table[i]; > - DeviceState *dev; > - > - qemu_check_nic_model(nd, "virtio"); > + DeviceState *dev; > > - dev = qdev_new(name); > - qdev_set_nic_properties(dev, nd); > + while ((dev = qemu_create_nic_device(name, true, "virtio"))) { > qdev_realize_and_unref(dev, bus, &error_fatal); > } > } Acked-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 1169e20b94..202c378131 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -221,16 +221,9 @@ static void s390_init_ipl_dev(const char *kernel_filename, static void s390_create_virtio_net(BusState *bus, const char *name) { - int i; - - for (i = 0; i < nb_nics; i++) { - NICInfo *nd = &nd_table[i]; - DeviceState *dev; - - qemu_check_nic_model(nd, "virtio"); + DeviceState *dev; - dev = qdev_new(name); - qdev_set_nic_properties(dev, nd); + while ((dev = qemu_create_nic_device(name, true, "virtio"))) { qdev_realize_and_unref(dev, bus, &error_fatal); } }