| Message ID | 20230804073525.11857-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-8.2] hw/s390x/s390-virtio-ccw: Remove superfluous code to set the NIC model | expand |
On Fri, Aug 04 2023, Thomas Huth <thuth@redhat.com> wrote: > The check for nd->model being NULL was originally required, but in > commit e11f463295d95aba ("s390x/virtio: use qemu_check_nic_model()") > the corresponding code had been replaced by a call to the function > qemu_check_nic_model() - and this in turn calls qemu_find_nic_model() > which contains the same check for nd->model being NULL again. So we > can remove this from the calling site now. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/s390x/s390-virtio-ccw.c | 4 ---- > 1 file changed, 4 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
04.08.2023 10:35, Thomas Huth пишет: > The check for nd->model being NULL was originally required, but in > commit e11f463295d95aba ("s390x/virtio: use qemu_check_nic_model()") > the corresponding code had been replaced by a call to the function > qemu_check_nic_model() - and this in turn calls qemu_find_nic_model() > which contains the same check for nd->model being NULL again. So we > can remove this from the calling site now. Applied to my trivial-patches tree, thanks! /mjt
On Fri, 4 Aug 2023 09:35:25 +0200 Thomas Huth <thuth@redhat.com> wrote: > The check for nd->model being NULL was originally required, but in > commit e11f463295d95aba ("s390x/virtio: use qemu_check_nic_model()") > the corresponding code had been replaced by a call to the function > qemu_check_nic_model() - and this in turn calls qemu_find_nic_model() > which contains the same check for nd->model being NULL again. So we > can remove this from the calling site now. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4516d73ff5..b83187effb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -222,10 +222,6 @@ static void s390_create_virtio_net(BusState *bus, const char *name) NICInfo *nd = &nd_table[i]; DeviceState *dev; - if (!nd->model) { - nd->model = g_strdup("virtio"); - } - qemu_check_nic_model(nd, "virtio"); dev = qdev_new(name);
The check for nd->model being NULL was originally required, but in commit e11f463295d95aba ("s390x/virtio: use qemu_check_nic_model()") the corresponding code had been replaced by a call to the function qemu_check_nic_model() - and this in turn calls qemu_find_nic_model() which contains the same check for nd->model being NULL again. So we can remove this from the calling site now. Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/s390x/s390-virtio-ccw.c | 4 ---- 1 file changed, 4 deletions(-)