{"id":808005,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808005/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170831035306.29170-4-f4bug@amsat.org>","date":"2017-08-31T03:53:02","name":"[3/7] hw/arm/fsl_imx*: use serial_chr_nonnull()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ee4122242b1a268d6b5e828ab0e2a00b66bd61f6","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/1.0/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831035306.29170-4-f4bug@amsat.org/mbox/","series":[{"id":736,"url":"http://patchwork.ozlabs.org/api/1.0/series/736/?format=json","date":"2017-08-31T03:52:59","name":"serial: add serial_chr_nonnull()","version":1,"mbox":"http://patchwork.ozlabs.org/series/736/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808005/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"D/FvpPx4\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjT7r0tPkz9s3w\n\tfor ;\n\tThu, 31 Aug 2017 13:56:24 +1000 (AEST)","from localhost ([::1]:53794 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnGac-00033I-72\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 23:56:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55547)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dnGXk-0000gN-BW\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 23:53:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dnGXj-0006ZR-EI\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 23:53:24 -0400","from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37251)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnGXj-0006ZH-Ao; Wed, 30 Aug 2017 23:53:23 -0400","by mail-qt0-x243.google.com with SMTP id g13so6737605qta.4;\n\tWed, 30 Aug 2017 20:53:23 -0700 (PDT)","from yoga.offpageads.com ([181.93.89.178])\n\tby smtp.gmail.com with ESMTPSA id\n\tx20sm5072398qtb.5.2017.08.30.20.53.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 30 Aug 2017 20:53:22 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=Ptbb2tioMzNVHjabPeB1RPen2CnJsOp8RPHysN7rXAc=;\n\tb=D/FvpPx4CfFnNugnyZi/97vBkjNc6rNSELPe5B3VhwIMQm6SyMVP4v/qzvK2oPM4K7\n\tgIvtCQFYdiMzOFfidBr3BsVFWuDdLXekLUFLdAPCAhE1Zyv3Y4pNx36GRlOmk1puk+s5\n\tgv4gBPanHoPzexehEVGv0mwqWjEv53np5gdARKanj4XVm205gC2fuA6tjTZn2vzyEK5r\n\tGZs2UbABcmfStiM5vk/wYX+sKiFBWXyWroC5wPnhOSzGPCyePjjMtgyCithr1UMMJ7LI\n\t44QXyjZxW5I284hMh8c9edn9MVisE1lG5iW2BVgWzrHRVSK7niggrYi482p/vOXYoeY4\n\t8J6w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=Ptbb2tioMzNVHjabPeB1RPen2CnJsOp8RPHysN7rXAc=;\n\tb=qXqmaUKBdPisXE0RJytBTpIGe4CrbWEukE/bfGlf3q2C/DpoUelIgWRnfe+DUi5Ov6\n\ty20Hk3eA5KOplJX+YkD6NwyritBWC0Q5+0nrqAtkzaLUNXrYpVaROHE0ZDAzpU9Zt+Kl\n\t0+g0ibz3R3z90CsQFqFRw7JC1WXecHnrs8qEfllJF2icUiVyn5Yi+pw3D8gfj7JZ6Tdo\n\tGr6w1q4p61F30rf6F/vVLCHpAJYmoIgMZmXsw8qDx7OWor2dGRnII3cM4hhN+2r7mEcQ\n\thfmnOdMdbwuJXcIOy01p8nyHXYJYkPCvpPGeQvxhqxhmY730Tlu/BNBbvDMIu8keKNPO\n\tQpiA==","X-Gm-Message-State":"AHYfb5jSDvMZT9n1Db0+qlqn4lTWKM0+nPMFb+BUp8W23w4Iy6sMposU\n\tW1A7E6FYb0BiEw==","X-Received":"by 10.200.45.243 with SMTP id q48mr5097763qta.133.1504151602740; \n\tWed, 30 Aug 2017 20:53:22 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Paolo Bonzini ,\n\tPeter Maydell ,\n\tPeter 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":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=\n\t, \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Philippe Mathieu-Daudé \n---\n include/hw/char/imx_serial.h | 1 +\n hw/arm/fsl-imx25.c | 9 +--------\n hw/arm/fsl-imx31.c | 9 +--------\n hw/arm/fsl-imx6.c | 10 +---------\n 4 files changed, 4 insertions(+), 25 deletions(-)","diff":"diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h\nindex baeec3183f..55139dc6ec 100644\n--- a/include/hw/char/imx_serial.h\n+++ b/include/hw/char/imx_serial.h\n@@ -20,6 +20,7 @@\n \n #include \"hw/sysbus.h\"\n #include \"chardev/char-fe.h\"\n+#include \"hw/char/serial.h\"\n \n #define TYPE_IMX_SERIAL \"imx.serial\"\n #define IMX_SERIAL(obj) OBJECT_CHECK(IMXSerialState, (obj), TYPE_IMX_SERIAL)\ndiff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c\nindex 3b97eceb3c..425a9edc36 100644\n--- a/hw/arm/fsl-imx25.c\n+++ b/hw/arm/fsl-imx25.c\n@@ -120,14 +120,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)\n if (i < MAX_SERIAL_PORTS) {\n Chardev *chr;\n \n- chr = serial_hds[i];\n-\n- if (!chr) {\n- char label[20];\n- snprintf(label, sizeof(label), \"imx31.uart%d\", i);\n- chr = qemu_chr_new(label, \"null\");\n- }\n-\n+ chr = serial_chr_nonnull(serial_hds[i]);\n qdev_prop_set_chr(DEVICE(&s->uart[i]), \"chardev\", chr);\n }\n \ndiff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c\nindex 0f2ebe8161..8d4535a536 100644\n--- a/hw/arm/fsl-imx31.c\n+++ b/hw/arm/fsl-imx31.c\n@@ -109,14 +109,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)\n if (i < MAX_SERIAL_PORTS) {\n Chardev *chr;\n \n- chr = serial_hds[i];\n-\n- if (!chr) {\n- char label[20];\n- snprintf(label, sizeof(label), \"imx31.uart%d\", i);\n- chr = qemu_chr_new(label, \"null\");\n- }\n-\n+ chr = serial_chr_nonnull(serial_hds[i]);\n qdev_prop_set_chr(DEVICE(&s->uart[i]), \"chardev\", chr);\n }\n \ndiff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c\nindex 26fd214004..7bc1aa1fbe 100644\n--- a/hw/arm/fsl-imx6.c\n+++ b/hw/arm/fsl-imx6.c\n@@ -189,15 +189,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)\n if (i < MAX_SERIAL_PORTS) {\n Chardev *chr;\n \n- chr = serial_hds[i];\n-\n- if (!chr) {\n- char *label = g_strdup_printf(\"imx6.uart%d\", i + 1);\n- chr = qemu_chr_new(label, \"null\");\n- g_free(label);\n- serial_hds[i] = chr;\n- }\n-\n+ chr = serial_chr_nonnull(serial_hds[i]);\n qdev_prop_set_chr(DEVICE(&s->uart[i]), \"chardev\", chr);\n }\n \n","prefixes":["3/7"]}