From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9ZD8-0006Es-QS for qemu-devel@nongnu.org; Fri, 20 Apr 2018 12:48:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9ZD4-000474-37 for qemu-devel@nongnu.org; Fri, 20 Apr 2018 12:48:34 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:44112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9ZD3-00046W-U1 for qemu-devel@nongnu.org; Fri, 20 Apr 2018 12:48:29 -0400 Received: by mail-qk0-x243.google.com with SMTP id h200so8696711qke.11 for ; Fri, 20 Apr 2018 09:48:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <20180420145249.32435-1-peter.maydell@linaro.org> <20180420145249.32435-3-peter.maydell@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <8dcce14b-5daa-2f7b-7f37-8673afcafdea@amsat.org> Date: Fri, 20 Apr 2018 13:48:25 -0300 MIME-Version: 1.0 In-Reply-To: <20180420145249.32435-3-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 02/13] hw/arm/fsl-imx*: Don't create "null" chardevs for serial devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= On 04/20/2018 11:52 AM, Peter Maydell wrote: > Following commit 12051d82f004024, 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: Peter Maydell > --- > hw/arm/fsl-imx25.c | 12 +----------- > hw/arm/fsl-imx31.c | 12 +----------- > hw/arm/fsl-imx6.c | 13 +------------ > 3 files changed, 3 insertions(+), 34 deletions(-) > > diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c > index cb988a6c25..d7d064e5ce 100644 > --- a/hw/arm/fsl-imx25.c > +++ b/hw/arm/fsl-imx25.c > @@ -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); > diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c > index 3eee83d547..e6c788049d 100644 > --- a/hw/arm/fsl-imx31.c > +++ b/hw/arm/fsl-imx31.c > @@ -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); > diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c > index 9dfbc9a8c4..ea14de33c6 100644 > --- a/hw/arm/fsl-imx6.c > +++ b/hw/arm/fsl-imx6.c > @@ -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); Removing the now unneeded #include "chardev/char.h" from the 3 files: Reviewed-by: Philippe Mathieu-Daudé