From nobody Tue Nov 4 13:17:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15041518423641004.0990233157162; Wed, 30 Aug 2017 20:57:22 -0700 (PDT) Received: from localhost ([::1]:53799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnGbX-0003vS-W8 for importer@patchew.org; Wed, 30 Aug 2017 23:57:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnGXk-0000gN-BW for qemu-devel@nongnu.org; Wed, 30 Aug 2017 23:53:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnGXj-0006ZR-EI for qemu-devel@nongnu.org; Wed, 30 Aug 2017 23:53:24 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dnGXj-0006ZH-Ao; Wed, 30 Aug 2017 23:53:23 -0400 Received: by mail-qt0-x243.google.com with SMTP id g13so6737605qta.4; Wed, 30 Aug 2017 20:53:23 -0700 (PDT) Received: from yoga.offpageads.com ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id x20sm5072398qtb.5.2017.08.30.20.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 20:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ptbb2tioMzNVHjabPeB1RPen2CnJsOp8RPHysN7rXAc=; b=D/FvpPx4CfFnNugnyZi/97vBkjNc6rNSELPe5B3VhwIMQm6SyMVP4v/qzvK2oPM4K7 gIvtCQFYdiMzOFfidBr3BsVFWuDdLXekLUFLdAPCAhE1Zyv3Y4pNx36GRlOmk1puk+s5 gv4gBPanHoPzexehEVGv0mwqWjEv53np5gdARKanj4XVm205gC2fuA6tjTZn2vzyEK5r GZs2UbABcmfStiM5vk/wYX+sKiFBWXyWroC5wPnhOSzGPCyePjjMtgyCithr1UMMJ7LI 44QXyjZxW5I284hMh8c9edn9MVisE1lG5iW2BVgWzrHRVSK7niggrYi482p/vOXYoeY4 8J6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ptbb2tioMzNVHjabPeB1RPen2CnJsOp8RPHysN7rXAc=; b=qXqmaUKBdPisXE0RJytBTpIGe4CrbWEukE/bfGlf3q2C/DpoUelIgWRnfe+DUi5Ov6 y20Hk3eA5KOplJX+YkD6NwyritBWC0Q5+0nrqAtkzaLUNXrYpVaROHE0ZDAzpU9Zt+Kl 0+g0ibz3R3z90CsQFqFRw7JC1WXecHnrs8qEfllJF2icUiVyn5Yi+pw3D8gfj7JZ6Tdo Gr6w1q4p61F30rf6F/vVLCHpAJYmoIgMZmXsw8qDx7OWor2dGRnII3cM4hhN+2r7mEcQ hfmnOdMdbwuJXcIOy01p8nyHXYJYkPCvpPGeQvxhqxhmY730Tlu/BNBbvDMIu8keKNPO QpiA== X-Gm-Message-State: AHYfb5jSDvMZT9n1Db0+qlqn4lTWKM0+nPMFb+BUp8W23w4Iy6sMposU W1A7E6FYb0BiEw== X-Received: by 10.200.45.243 with SMTP id q48mr5097763qta.133.1504151602740; Wed, 30 Aug 2017 20:53:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Peter Maydell , Peter Chubb Date: Thu, 31 Aug 2017 00:53:02 -0300 Message-Id: <20170831035306.29170-4-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831035306.29170-1-f4bug@amsat.org> References: <20170831035306.29170-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 3/7] hw/arm/fsl_imx*: use serial_chr_nonnull() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/char/imx_serial.h | 1 + hw/arm/fsl-imx25.c | 9 +-------- hw/arm/fsl-imx31.c | 9 +-------- hw/arm/fsl-imx6.c | 10 +--------- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h index baeec3183f..55139dc6ec 100644 --- a/include/hw/char/imx_serial.h +++ b/include/hw/char/imx_serial.h @@ -20,6 +20,7 @@ =20 #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "hw/char/serial.h" =20 #define TYPE_IMX_SERIAL "imx.serial" #define IMX_SERIAL(obj) OBJECT_CHECK(IMXSerialState, (obj), TYPE_IMX_SERIA= L) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 3b97eceb3c..425a9edc36 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -120,14 +120,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error = **errp) if (i < MAX_SERIAL_PORTS) { Chardev *chr; =20 - chr =3D serial_hds[i]; - - if (!chr) { - char label[20]; - snprintf(label, sizeof(label), "imx31.uart%d", i); - chr =3D qemu_chr_new(label, "null"); - } - + chr =3D serial_chr_nonnull(serial_hds[i]); qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr); } =20 diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 0f2ebe8161..8d4535a536 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -109,14 +109,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error = **errp) if (i < MAX_SERIAL_PORTS) { Chardev *chr; =20 - chr =3D serial_hds[i]; - - if (!chr) { - char label[20]; - snprintf(label, sizeof(label), "imx31.uart%d", i); - chr =3D qemu_chr_new(label, "null"); - } - + chr =3D serial_chr_nonnull(serial_hds[i]); qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr); } =20 diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 26fd214004..7bc1aa1fbe 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -189,15 +189,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) if (i < MAX_SERIAL_PORTS) { Chardev *chr; =20 - chr =3D serial_hds[i]; - - if (!chr) { - char *label =3D g_strdup_printf("imx6.uart%d", i + 1); - chr =3D qemu_chr_new(label, "null"); - g_free(label); - serial_hds[i] =3D chr; - } - + chr =3D serial_chr_nonnull(serial_hds[i]); qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", chr); } =20 --=20 2.14.1