From patchwork Fri Apr 20 14:52:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 133881 Delivered-To: patches@linaro.org Received: by 10.46.66.142 with SMTP id h14csp374895ljf; Fri, 20 Apr 2018 07:52:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpn57j/nfb4G7Pk7PspVrRxVcIj4F8tiGdksR3EhaMEz10INbqTP+d3ZSROdxlwaxgNDBG+ X-Received: by 10.28.111.7 with SMTP id k7mr2156376wmc.148.1524235973507; Fri, 20 Apr 2018 07:52:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524235973; cv=none; d=google.com; s=arc-20160816; b=t1E+D6MAS9cfeMHyAfJK2JwxSsI3hls/i7InZrtfH6u8nIcN/hofNWOr+VB6oO2JZV Ia5iWN4fIQ1fa3b/TbgnlFMJwBVcFsrJmdvw1pKcsYjK7NZE4eLTvAvBbYZk3jky6pu1 QCQAnUdmC+W6QH9134WuPpsUGFRKvWfdAbjv/o5rt9RZsykvo+znSIPsmdcMMzoFxtu2 CxDEykkFdqdYX/1bETHu+vk09W9AzXCUksPbOKRStsDjjwWa3iZx9tmo1mz2kqlXM5ps YiOlJhZbiLXwI6Wfa7AD0VxGsaS6JUpCRnRqBanHcEAbIHBPiCGfuskIDiIh0qMVNfmg vMLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=IWmJP37OwLpLnfBZoXaJRL/8eRZwfhTY3qNXO2JmkL8=; b=EDyRV0efL7Scn6JQgR04nGsnSAJ80RDJ8bOVpHutnFZPklGW24zIJfe3JD3pImkrhd YbDgOPrGpZauYPf0qW153CmU1JzQX3tx0VSpdpwG76lwAW/iU75unb3ead3mIJPme6yb PRTd5Aam22CHAOwM4cU8sE0NL++ojfrCrt34ZkUZLAm3D4V1XsFyUjuj33oNPStTuL51 7IlSuy8gBDMKSgtklXVonlvff16gCLXNaOARiSi15rxTXhSctf//6KTFoEpFZ/gjgvHH jRnlYT2yV2CghRHn3yOmUsW/drQV0Kj9aZFCVLTGMT3boipz2yPdOnrPQXUP0ecEBifK 7LbQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id b2si1184725wmh.214.2018.04.20.07.52.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Apr 2018 07:52:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1f9XPB-0006Xr-0L; Fri, 20 Apr 2018 15:52:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S . Tsirkin" , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [PATCH 04/13] hw/mips/mips_malta: Don't create "null" chardevs for serial devices Date: Fri, 20 Apr 2018 15:52:40 +0100 Message-Id: <20180420145249.32435-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420145249.32435-1-peter.maydell@linaro.org> References: <20180420145249.32435-1-peter.maydell@linaro.org> 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[]. Signed-off-by: Peter Maydell --- hw/mips/mips_malta.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.17.0 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index f6513a4fd5..49fe7a0a72 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1056,11 +1056,6 @@ void mips_malta_init(MachineState *machine) /* FPGA */ - /* Make sure the second serial port is associated with a device. */ - if (!serial_hds[2]) { - serial_hds[2] = qemu_chr_new("fpga-uart", "null"); - } - /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */ malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]);