Commit c221287f authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/fsl-imx*: Don't create "null" chardevs for serial devices 



Following commit 12051d82, UART devices should handle
being passed a NULL pointer chardev, so we don't need to
create "null" backends in board code. Remove the code that
does this and updates serial_hds[].

(fsl-imx7.c was already written this way.)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 20180420145249.32435-3-peter.maydell@linaro.org
parent 47c4f85a

hw/arm/fsl-imx25.c

+1 −11
Original line number Diff line number Diff line
@@ -118,17 +118,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
        };



        if (i < MAX_SERIAL_PORTS) {

            Chardev *chr;



            chr = serial_hds[i];



            if (!chr) {

                char label[20];

                snprintf(label, sizeof(label), "imx31.uart%d", i);

                chr = qemu_chr_new(label, "null");

            }



            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr);

            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hds[i]);

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);

hw/arm/fsl-imx31.c

+1 −11
Original line number Diff line number Diff line
@@ -107,17 +107,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) 
        };



        if (i < MAX_SERIAL_PORTS) {

            Chardev *chr;



            chr = serial_hds[i];



            if (!chr) {

                char label[20];

                snprintf(label, sizeof(label), "imx31.uart%d", i);

                chr = qemu_chr_new(label, "null");

            }



            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr);

            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hds[i]);

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);

hw/arm/fsl-imx6.c

+1 −12
Original line number Diff line number Diff line
@@ -189,18 +189,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 
        };



        if (i < MAX_SERIAL_PORTS) {

            Chardev *chr;



            chr = serial_hds[i];



            if (!chr) {

                char *label = g_strdup_printf("imx6.uart%d", i + 1);

                chr = qemu_chr_new(label, "null");

                g_free(label);

                serial_hds[i] = chr;

            }



            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr);

            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hds[i]);

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);