From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649640; cv=none; d=zohomail.com; s=zohoarc; b=Wqw8YD0EZl443ReZz24c8CrjSLy1FA0B4+JZjuJnIted3Mj2vmuSfsPY5LgdfH08tQ6/HgDv+maG+2JGJL7UcAFqQxQ1MhvU6gKBPCwVyk+R2erL1CjWdPSX1HmIyzxBv+ATfwMOZd65QB7bxLKWZzSGVex/8DPViSlzZIwcBo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649640; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=LbuhzLg74Bdy/MY/xvPH3k6hGTmq01MexXE1+fuaQk7357/xt0mew122QEf6+j1gklqoZBumk94yaHjs6MH40xh/ZMW4hDG4eKtprMskN8ODtIh61M03btIShb4Lskh1uVpUmPRrnrYy3d5W8LlCaWhdLp67ZHThd+zwqlQ6x/A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649640482212.68769864854914; Mon, 13 Jul 2020 07:14:00 -0700 (PDT) Received: from localhost ([::1]:58410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzDS-0001IZ-V1 for importer@patchew.org; Mon, 13 Jul 2020 10:13:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAl-0004p1-FT for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAj-0006bf-TH for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:11 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 22so13464827wmg.1 for ; Mon, 13 Jul 2020 07:11:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=u7pW8AJ1B/B6IQLXN4VlTtF7clsKz3z6EEfBUzxcfzC3jZ5n0pavb4g/Bh6oZMy4ds lVi4Ndil7QjEOg81o2jMqfVZf4yLUPcy72ePf1Sad0UAVzDiVbviiXgFi7NP6HeDSK2+ bErOHofLuIrZLWklRv2f7ZkGvAKhL+rdILkkiuqmSJ6GncjiuehFDkab8mmi77WX+CZF 9kPxAylsVqZb1xyyCD/rz4ColoMcaZqRCPLiTvP+DzEzyvddbuqUZBOJr9ZOONxp39IG 0Bzsebpdyp/9+k93WvcYydPRYHImPc+4hEAhjCIEnSwj3jQIl+cgp0zb8V/3cFLebTKz rC1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=lkwF82EC1fxObAukDOoITWXoDdHLgye6WfgVTtTLAHTgzxd94Mtf4REhawuCxqsY4N besrYuL5DHJW/JNb0gh6n8yq7HYdxTBRP/0pjnVLFeIjpllxgcJgK7caPDExH2AzbXOs CzlHeDb8SWVx5vVmGiHcydOu3KnXW3GioToLxU3pjlZVD4korYS3O4axnpdTb1SkMIu9 6byT599Olii5sUVKB6TOMbIwu+BtcfNfyyK8c59pKzIXywjUC264KZY3LRgwqaMWLxJj 0UEh6Ga7Hpq7xjbwFNrlrFoz7ZmBKfgRttMXg6I9vZu8/D9cD4qvVeIqbGHbUsqbjaBr OwrA== X-Gm-Message-State: AOAM531XKPmKfTdGegrX+qiBUnHR05HCbTdGLSsANnX9H6bFWsB7lsKL zDX8Q/D1vN+GiyNi3guBUehGKJOOks1+gQ== X-Google-Smtp-Source: ABdhPJwup1qHjh0JyICExvF/CzgW5/yp4rHvlF7BJhYpxD7aA0BG/eNmdfuu1hWb7cxmlUPFLSqKZw== X-Received: by 2002:a1c:2349:: with SMTP id j70mr182163wmj.22.1594649468170; Mon, 13 Jul 2020 07:11:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/25] hw/arm/bcm2836: Remove unused 'cpu_type' field Date: Mon, 13 Jul 2020 15:10:40 +0100 Message-Id: <20200713141104.5139-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 The 'cpu_type' has been moved from BCM283XState to BCM283XClass in commit 210f47840d, but we forgot to remove the old variable. Do it now. Fixes: 210f47840d ("hw/arm/bcm2836: Hardcode correct CPU type") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-id: 20200703200459.23294-1-f4bug@amsat.org Signed-off-by: Peter Maydell --- include/hw/arm/bcm2836.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 024af8aae4f..79dfff9d734 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -33,7 +33,6 @@ typedef struct BCM283XState { DeviceState parent_obj; /*< public >*/ =20 - char *cpu_type; uint32_t enabled_cpus; =20 struct { --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649967; cv=none; d=zohomail.com; s=zohoarc; b=OZwUO0gUXqF241z6N7q5d11i//SSRhUL6uoemykt3b3QShK7Z5srwmH6OnSGNbK79NTpdM/eYpC54W5/SvOISSIdxmwn1oU+mTQGNQWfmd7VxVjJ9jMKceiKqMZctZdnqNS4CGx8iAiIm5PySK5/0aPS+V09LIJJETPET0E20fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649967; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZzxnSEdSIbjUDo31ld+i28V1pOQM11woAIfNcfAFUY8=; b=F/m5ulaDlMCeupqJWWyfqO6tQuWNGAn1unfalRuIROgwsj6X5PRk04FKrQGRM6oxga2r2/8gNngUoiq2ZTw55Az//4qsRle7Xog4GJsaQS4PXr4sx25mX2Xh6nzpY2H3dOAmVUlAQIgPMkx8nBxg5w88moLl3Ig5OdolfWjgsEE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649967960573.6328371371478; Mon, 13 Jul 2020 07:19:27 -0700 (PDT) Received: from localhost ([::1]:55532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzIj-00034m-OI for importer@patchew.org; Mon, 13 Jul 2020 10:19:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAm-0004sE-SK for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:12 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:32971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAl-0006br-3B for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:12 -0400 Received: by mail-wr1-x42a.google.com with SMTP id f18so16751418wrs.0 for ; Mon, 13 Jul 2020 07:11:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZzxnSEdSIbjUDo31ld+i28V1pOQM11woAIfNcfAFUY8=; b=llvH6/4sj9EVvlU03YI9aw+j5qKgY6n5fXesFXb1ZEYXNOoF7dg74nxpfLgkjjd/lk 1/awIWdFAg9p0WqvOHRZ4YhO7Z3TRzfAtpuM8GpS3j8NIMx7abpGKhN0LIcDw6X4DBDY tZL5+naU8yC7TDr5mXwRlVFVXqYV/RiEVEZKcOYQBnZKKlqvaRTiHzghWSi5TCkUTXZy B+aoEQi0Aaebiqh5tWoKZqG+dTgBcAjq6PxsYXoRexYB7XUS1CS1wMYAD8Lr680EPD3z I5LN0e7q9/sMiXIiUC9FtI/4sQGaSuG2y95/oMFbkRISedFCoLeTDBdR31MGfD7r7Tnb BHaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZzxnSEdSIbjUDo31ld+i28V1pOQM11woAIfNcfAFUY8=; b=rP6AD3lYP7EN/RtlI0skfcBOCR9FQxgyFiZEi+GnHRO7ev0sxCI815sEUI5YdtDkhC EIM9clkxhm6kesUvPwt+29msvPTn2QE/zPYNsj7dFS61gRlJwaGfgpY4lINtGRpCbqmZ D9bMKCC9YzEuzbyo+gHvAuSc6vA8lscNsnMPQxgHudL5KIKEgYPwSAWOzwhX4YAv22wC r10kZy70IlpE1PjjFIs954JgjdR57Fwt/YjrhxnYGQMcf25Y9as/ZkcXJnurSlTkBrYn 6nB6LMQoHBNUQ+p7vxCSsoYt3e2vAclc1n403N1rKu0Prk2snMiKSlH2zJmbOuPK5N1b rTJw== X-Gm-Message-State: AOAM533BP1CR23K34bYMCnJjz9g5J6ix8qFur+H/OjgdAD/2y6KL1wzE pl3X/dDsnsD4X59Fj1HqH4l21IgxIIAzzg== X-Google-Smtp-Source: ABdhPJwv+Gw76WHezMoWqx3FSZF1B62E3MWo/7Z8g4uwHfHpSFhVxe03WBlbw4Hf+Z7lztsZ706f5A== X-Received: by 2002:a5d:6342:: with SMTP id b2mr79163275wrw.262.1594649469191; Mon, 13 Jul 2020 07:11:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/25] target/arm: Fix mtedesc for do_mem_zpz Date: Mon, 13 Jul 2020 15:10:41 +0100 Message-Id: <20200713141104.5139-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson The mtedesc that was constructed was not actually passed in. Found by Coverity (CID 1429996). Fixes: d28d12f008e Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200706202345.193676-1-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 08f0fd15b28..88a2fb271d1 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -5275,7 +5275,7 @@ static void do_mem_zpz(DisasContext *s, int zt, int p= g, int zm, desc =3D FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz); desc <<=3D SVE_MTEDESC_SHIFT; } - desc =3D simd_desc(vsz, vsz, scale); + desc =3D simd_desc(vsz, vsz, desc | scale); t_desc =3D tcg_const_i32(desc); =20 tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, pg)); --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649550; cv=none; d=zohomail.com; s=zohoarc; b=PSXbLJl6KgweaCTiNaaA5MoG0cg796rRaSIuY0/bkx/aANfYAKV8us253WdhaqMwPQKpOCbjvXGvL/Cdiq23+Gavv0+ZnU38rnBVPHY2EZsT0dmKFEvyDancNyxLqVGL9nuWA+5yUc7C+x9k1ofVEcWsx93NwSID+92Xfa/FAnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649550; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ThbookUz1zgsdvCKld312FzMkynGTVCEmFDPRgdidJc=; b=BIMBWz9JWNvjHflrAOIwjjiPDBqhC37BSJ4OyoCElXNIjIMaFRQXzyADGeGwRGO3Si1XcXNrdeHHjhQv4xDS/nZGfBNKgatC7uOVOwHspx2GxddxbwCwibqiTRT+S+ELcwSgN1z9ydo10vTgRYqkAi7ZsEGvcJIXDGVVYi/M7ME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649550326330.59405608532074; Mon, 13 Jul 2020 07:12:30 -0700 (PDT) Received: from localhost ([::1]:51006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzC1-0006k1-3D for importer@patchew.org; Mon, 13 Jul 2020 10:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAo-0004vC-19 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:14 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAm-0006c3-9L for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:13 -0400 Received: by mail-wm1-x331.google.com with SMTP id 22so13464976wmg.1 for ; Mon, 13 Jul 2020 07:11:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ThbookUz1zgsdvCKld312FzMkynGTVCEmFDPRgdidJc=; b=WO6+T7xVUb+gHhYwaQj8LyFgWWriMtvap0ZmQ/asqALD0XK0TWPBod5ylUg1bAwU3N pf5aYrzrgvOBPHnaAJjAv4X+jyT6yyOh+3GR5zW7UY6l29QKo/ZC1+crC/lSSDL7aKeT OuDAKEVAvsjDLQs+7+o7XiGEi2gkQ4Adj91aM+VOkpQsTBGypHMxiat97Jd2ABO3rrmR FG4rORazyVDwbwQuQV6Flv+PCf9SyWwtmdNb6va1naJ0tbNoV9P/vFtYzQ5ldkbnO6oo 4V47zzgtfqbHMTKckdg7oWtbV7ebugeKyJ2/KpcEVRanEhtqVhFAd9CTzUWo7hLiAzOz 1VDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ThbookUz1zgsdvCKld312FzMkynGTVCEmFDPRgdidJc=; b=uZK8BzTryJlH3F6zMgF0TIA2FuCVZvXZo3RNWpX2kCrYhziDWKrwN8FOB44D1K1GDV pHb2YSTFokAdbCL9WbqACbOkcPx/FVsFalpe6nbGZlZGMpRNZ/yjm1oGLKVs96huKjPZ TeFsdcCBHRb15JKy1diDr64gXnOGLcu8vOYR+YiqAy6U5JRXI8B+MNjWjNTxbBKzETu0 WNLvp2/G8qfrCM8x+FJTZCX4kYM73WNK6msP9cVygZss+rK+5uN488r2f9s9hn16SnKX 6HqwoAPp2NrHTZUIpo1o7bhlIMmtWljCib5g4+985mchSbpk75Moj5ZERV8eiNAbEQ1Q bi6A== X-Gm-Message-State: AOAM533zdWIWmvtV9CRaMqo8XNKKIVtdXQuQQXRvODyu3MMOXKCkJPDu rPw7q8uZqNimoCboBqQOqjQ/YBFI/gaRGQ== X-Google-Smtp-Source: ABdhPJwV4fvk4EvqSETggtljkJDYK5w9xJnfKq72BH29gJIvAMR6lE0RbDfcHjp8tkRNcqmz20fR+g== X-Received: by 2002:a1c:5459:: with SMTP id p25mr159718wmi.148.1594649470383; Mon, 13 Jul 2020 07:11:10 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/25] Add the ability to change the FEC PHY MDIO device number on i.MX25 processor Date: Mon, 13 Jul 2020 15:10:42 +0100 Message-Id: <20200713141104.5139-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Jean-Christophe Dubois Signed-off-by: Jean-Christophe Dubois Message-id: 9f8923ecd974160ae8f634c275b1100c2cbe66d7.1593806826.git.jcd@tri= budubois.net Reviewed-by: Peter Maydell [PMM: updated for object_property_set_uint() argument reordering] Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx25.h | 1 + hw/arm/fsl-imx25.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h index 9e228daceae..54ee1bfd780 100644 --- a/include/hw/arm/fsl-imx25.h +++ b/include/hw/arm/fsl-imx25.h @@ -65,6 +65,7 @@ typedef struct FslIMX25State { MemoryRegion rom[2]; MemoryRegion iram; MemoryRegion iram_alias; + uint32_t phy_num; } FslIMX25State; =20 /** diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index b4ddceae45a..08a98f828fc 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -171,6 +171,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error *= *errp) epit_table[i].irq)); } =20 + object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, &err); qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]); =20 if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) { @@ -315,10 +316,16 @@ static void fsl_imx25_realize(DeviceState *dev, Error= **errp) &s->iram_alias); } =20 +static Property fsl_imx25_properties[] =3D { + DEFINE_PROP_UINT32("fec-phy-num", FslIMX25State, phy_num, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void fsl_imx25_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 + device_class_set_props(dc, fsl_imx25_properties); dc->realize =3D fsl_imx25_realize; dc->desc =3D "i.MX25 SOC"; /* --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650089; cv=none; d=zohomail.com; s=zohoarc; b=UCw/iqehmMlfXfC65DELV4CaE3rlYHlufTHqoY7erUM5NngLjnGOncI2ar6fQaYwYCu4nSbAhHWp4XnLBBkEB74FvF15AtqItz/HmQLIiFMYKJFnXm1It8+Wspb5fQfYiVe+YLfrkUaBgfTaEobQE7MolqlITUY3AJMjTZFOhOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650089; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YOh9GxnhU6vhYDRmyns4fut70z8Xj0qJIqLDkwhxP5o=; b=STzvNSeDKrgcdYk1y99o7wQRVhzNVgWZSa75Tl61U52m+VfzUngCfAzUBGI9uQJst8UA2kpZiaX9K31th5U9nCLIJrfSL6nzcrn+zwMiv10Bm0Yv3ikmAGsmOHPpI7ZDOZ62FPnkk9WR8R3IQSCVECgjyhzIC0nhicyTwoIjBtg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650089321613.8356738891757; Mon, 13 Jul 2020 07:21:29 -0700 (PDT) Received: from localhost ([::1]:34836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzKi-0006Cq-0U for importer@patchew.org; Mon, 13 Jul 2020 10:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAo-0004xD-Qa for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:14 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:36028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAn-0006cH-5W for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:14 -0400 Received: by mail-wm1-x329.google.com with SMTP id 17so13300898wmo.1 for ; Mon, 13 Jul 2020 07:11:12 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YOh9GxnhU6vhYDRmyns4fut70z8Xj0qJIqLDkwhxP5o=; b=R6hKd2cQL8ycNYwlWaFRQSRFn/2dSE5OaT+BkP/yKQ4FhmXFJl4GU8/WskNDXbIddG 0WZCSdD1B2bAcMLC+1AcaC88957vuBT2X4QNGCjYvUu+RkqO+J7y49FsTlb9txoxKAkx ie5m4RcZLuK0QlTI2pqcmRGKVHt+DFUmX5t1A/JPkfWOwsEDqi4yMhszn9esMnDrLzZ1 RpVdp6NS6m7FR4dTPBgl38NBkubNsVWnoknfVXiwf5bq05E9Y3wFfazVNDcvHsgv14y9 KPsKWhM8uKjrS+3s5NRhtTvpB2AHIYYxZEBCnx1e2RfMAUaOBEE2Ujd3LHjlhKy5EA1z vA+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YOh9GxnhU6vhYDRmyns4fut70z8Xj0qJIqLDkwhxP5o=; b=UnJeBbAvr58VTzNHTQBY7jjmnvJvKdD7udhyvZK8n5uuH65HtORW04miMeoL3dUe4r RuJFg6eg4fnwQ9RLIz2X2kpfv3/sETehdfPwgUyM5ymA8aQqnI/Q0tnkugVm8ES14h+V E6cTBUS7NjPPR1tPHtzXPfo+Geald/0REzubEBbtV14ZMXlfZD+erDIjHIkLuWB2U/wy 5yqGHoG7dne12HbI97deG6FaHnCbH1ivp/qFGsQLHbQuSfu7enqvVnu2Hg2SkvB6grA9 bPozCYip1Itrnc36R8a1/fbRT94YJpie2rFDVW722vGr5RjmVIEuutOJcDoCBwYnZGFf Caqg== X-Gm-Message-State: AOAM532ugV464cJdcmlgzut653GFu9/XP7NNo/9NLvHGgeZgjKVleP5P /Er4snTpX5eEobKm/9x0xUkynt0k3mXsTw== X-Google-Smtp-Source: ABdhPJy9EpTnc1uqzi5FBvg8S6xdM5ppNmYi3gV9+7pA30VOHcnMpMLCUR1KPyaHNxgfPg9pSYfbyA== X-Received: by 2002:a1c:408b:: with SMTP id n133mr173078wma.88.1594649471473; Mon, 13 Jul 2020 07:11:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/25] Add the ability to change the FEC PHY MDIO device number on i.MX6 processor Date: Mon, 13 Jul 2020 15:10:43 +0100 Message-Id: <20200713141104.5139-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Jean-Christophe Dubois Signed-off-by: Jean-Christophe Dubois Message-id: 05a64e83eb1c0c865ac077b22c599425c024c02c.1593806826.git.jcd@tri= budubois.net Reviewed-by: Peter Maydell [PMM: updated for object_property_set_uint() argument reordering] Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6.h | 1 + hw/arm/fsl-imx6.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 1ebd7513246..162fe99375d 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -73,6 +73,7 @@ typedef struct FslIMX6State { MemoryRegion caam; MemoryRegion ocram; MemoryRegion ocram_alias; + uint32_t phy_num; } FslIMX6State; =20 =20 diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 0bc9f0b60d1..00dafe3f62d 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -377,6 +377,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) spi_table[i].irq)); } =20 + object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, &err); qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]); if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) { return; @@ -449,10 +450,16 @@ static void fsl_imx6_realize(DeviceState *dev, Error = **errp) &s->ocram_alias); } =20 +static Property fsl_imx6_properties[] =3D { + DEFINE_PROP_UINT32("fec-phy-num", FslIMX6State, phy_num, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void fsl_imx6_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 + device_class_set_props(dc, fsl_imx6_properties); dc->realize =3D fsl_imx6_realize; dc->desc =3D "i.MX6 SOC"; /* Reason: Uses serial_hd() in the realize() function */ --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649742; cv=none; d=zohomail.com; s=zohoarc; b=f4xUxC2Gck45fIt1RF190TgAkkws/hTdMhL0vlg2K+UF16SoJPPSY1sa8E84fBUgySWQ19wl0kusn45/G0cLjRzaSrJq6SCk6sU2uLe6zzzWN2JJJ2INwtskMHIoCzBHt7RWwbR1RSnjTHN59nzlp0zwqne6U27yQFZBQKUWARc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649742; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RzzTi1vl63SYp8xuPkUqRyWvZtfbVvsWqfUHoMVTTxM=; b=iHoqStXRK0QXwAHuCq+W1baJZAKgwjYc0eBJO+UrbjBvHP9h8emdms5FCc11lOrgiNHv06OhtHxWeh8KF0KskZposX9eZHULPueQxzDBUfrsOQ/DiNdbl4gBdYzidM7KNU52jlr+NBs/Z7ojGEKixpumVIFJd80IYL2vdRtsRbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649742932534.8521840381998; Mon, 13 Jul 2020 07:15:42 -0700 (PDT) Received: from localhost ([::1]:38672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzF7-0004fP-7B for importer@patchew.org; Mon, 13 Jul 2020 10:15:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAp-0004zW-VD for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAo-0006cR-3B for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:15 -0400 Received: by mail-wr1-x435.google.com with SMTP id k6so16723469wrn.3 for ; Mon, 13 Jul 2020 07:11:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RzzTi1vl63SYp8xuPkUqRyWvZtfbVvsWqfUHoMVTTxM=; b=PShCYGXDP+htZ1DaXV95r2hSl8PsUl9Z3XZME/N/Y00WZ4ILzXmhM4/dpJG+fg5bwq vsdUC/By+75Fw7EXeFcxdskK0Yi7WLabsl3eLbiYIILvSHxz4an2lx+r0+Cuj3M004Z0 pl+WK3MprVTsXGcVkAIzVAKJAmRG9v6Q1bS/5pScxLgaZXTJ+QFBFZR1b06lp/dZQoNp RjhXr74ydXTrK/4/PccmUy8YqoEPHuP3SVUrnJ9q5nn6zIbaKuZVQhf/wzjw01+XGyuO XgAYuXrV4KQUaMaw4Ksz9eYvmQAT3wDfPQCRhp89OajdfGKLUtdU3g433lNoGQ8mofgv cGmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RzzTi1vl63SYp8xuPkUqRyWvZtfbVvsWqfUHoMVTTxM=; b=CbuykkwBjmlkP9SysU7kwT0+vIQnJ7QdQQEoqURZaFlhZTJIZe3hx+skhWc7+llcUc RCQXKjx6Q4RE3ED9hsQv7qlar2n2hK+Rx5omWdPm77dXZNw7yX1uqJyeVGwbEVIsB1cz 7XAX8pe9UPMHRUB5p6wFEy069cpY/pTzyHgXbN31tmjJwgcCriZJ+VKI1GwF27XeuQFj evsNjcz29gnVzMQ/DiCvtnD3RqH3vWYjo3WISF/LTGSADMEorkE54/OTMTKldSmHZyRa GhnXhe4cjxIsZMJLlAWbLvwPcB3Q+mSA/4Q0AU9gosYWlLdh6SVHddmEGqnBYjhMcXFc ICpw== X-Gm-Message-State: AOAM5306gGtn8PdCFQAqrYXycXluiRdcLc5qNnbGmetfCCTHCDLeZtVq Slp7aUUnxh/6M/P+lv4JUjN/scHjXwJ40g== X-Google-Smtp-Source: ABdhPJyVKqcciNLpmU4wurTYDhEhbn18yXpSxJfZyhVpAXYI4IFgTfTPGz0+qmhlvDrjRQ4wObuG8A== X-Received: by 2002:adf:82e1:: with SMTP id 88mr58318650wrc.376.1594649472502; Mon, 13 Jul 2020 07:11:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/25] Add the ability to change the FEC PHY MDIO devices numbers on i.MX7 processor Date: Mon, 13 Jul 2020 15:10:44 +0100 Message-Id: <20200713141104.5139-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Jean-Christophe Dubois Signed-off-by: Jean-Christophe Dubois Message-id: c850187322be9930e47c8b234c385a7d0da245cb.1593806826.git.jcd@tri= budubois.net Reviewed-by: Peter Maydell [PMM: updated for object_property_set_uint() argument reordering] Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx7.h | 1 + hw/arm/fsl-imx7.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index da977f9ffb4..ad889237077 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -81,6 +81,7 @@ typedef struct FslIMX7State { IMX7GPRState gpr; ChipideaState usb[FSL_IMX7_NUM_USBS]; DesignwarePCIEHost pcie; + uint32_t phy_num[FSL_IMX7_NUM_ETHS]; } FslIMX7State; =20 enum FslIMX7MemoryMap { diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index fad637d3288..2ff2cab9246 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -363,6 +363,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **= errp) FSL_IMX7_ENET2_ADDR, }; =20 + object_property_set_uint(OBJECT(&s->eth[i]), "phy-num", + s->phy_num[i], &error_abort); object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num", FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort); qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]); @@ -550,10 +552,17 @@ static void fsl_imx7_realize(DeviceState *dev, Error = **errp) FSL_IMX7_PCIE_PHY_SIZE); } =20 +static Property fsl_imx7_properties[] =3D { + DEFINE_PROP_UINT32("fec1-phy-num", FslIMX7State, phy_num[0], 0), + DEFINE_PROP_UINT32("fec2-phy-num", FslIMX7State, phy_num[1], 1), + DEFINE_PROP_END_OF_LIST(), +}; + static void fsl_imx7_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 + device_class_set_props(dc, fsl_imx7_properties); dc->realize =3D fsl_imx7_realize; =20 /* Reason: Uses serial_hds and nd_table in realize() directly */ --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649876; cv=none; d=zohomail.com; s=zohoarc; b=dAn3HPBsBrE2+MxvW8PU/I1JmmIlP+bdPUYPF0g3+Loxz//ukixqPfvv/sXsWtjsza95tMDohpQrMRRvdCJSg0yLEFhKDrTTT6ZIJmhHxBRIO1sjuoJeoB/MVai3dn9nyW2WWCPUfFgaKQmrH7zNmkzrb4VVKHc2vMMkvCGnZvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649876; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ICNTYUZ+6iVasEsw6L8KUA+znBCjot8guAjkE9Kicjw=; b=EDPICozIX4ITKI4h3qCrZdBzFnyva5ouYe/vWI7zNdfRl0myCB8snNunWy9VxqNqr1W33fvo+VlFFX2NjDA2qlLlCM9qrG1dPdgbf9gw4o/bMjlyScDQztIDI6doZDfQSIBBnpfPzvgamaq2BBP1Vu0xywVkx0oDcCMWyRgioo8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649876711593.0252091562783; Mon, 13 Jul 2020 07:17:56 -0700 (PDT) Received: from localhost ([::1]:47166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzHH-0008Ba-Cu for importer@patchew.org; Mon, 13 Jul 2020 10:17:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAq-00052F-Vo for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAp-0006ce-7H for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:16 -0400 Received: by mail-wm1-x342.google.com with SMTP id g10so106962wmc.1 for ; Mon, 13 Jul 2020 07:11:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ICNTYUZ+6iVasEsw6L8KUA+znBCjot8guAjkE9Kicjw=; b=GoWNCFivx2NFrt54e2DPNo9TtDxMDOjUPHahT2l7uNnCdWxO5wROXPXfoiyUuVvVnj gaqkr3pK5U7S7KeULm01wTrkBWTzmYLkvu/O+wWXg/cWP3BxCCurNdmvDo8fDRRfIiG0 7p0Ns8cUhhyQlUewqk7fM7EQmaWRPFXAgXPFpA/UHU9qrYNeRptJ4w7eKS7ARy2jDhDo NhB0ZTitstc4ANUvyj5LDsvCHgdEI6vSvs28YKktjgpkN/le2ojTZl3HEP5hbqOribNm vIiTQkJkNMc7vwmORGsojBdxmlf7jTeJpdONLpoMfEM05UjlfZFZPb346Ag1efjtehDp QqxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ICNTYUZ+6iVasEsw6L8KUA+znBCjot8guAjkE9Kicjw=; b=mZKHXp/vRVuBQK9jJ8Q3YA6hP0RpT+umjnMyIVnSmLCMEu/obotpVkK+s+eBxrINE0 LJe/TCw169/hmZx5pTFODIj1/IBi3s7RcrulAdLghSvqJ0qVxGNcO0B6Cg1cSK0Z/yq8 fa+K+3vbqFbcSFLn/6Rgb73H6zNbyca0ugZexvbzjHZT8wft6mMhWiuPClIy/HWEp7WT yaxyHHexNta9FOg8RILK8HgxBCMmOowieL4sLIQzSxL3t+A1uyxdtT0+nNLl/uB57IOg XgZVFI4C7oYg5J5fk0gSMgUp7qEj5SCiyJ/Jz6FncmZDldOaW+J+X26nlHleU4jqZlE2 ufHA== X-Gm-Message-State: AOAM532v8F+EHnt62XIJHswzU+BrWNSd1rLf9o8B/SDQhLTR4TnG7pD6 WJMK32OwHd9E6MpVh8Q2fohQPRPrUm5p4g== X-Google-Smtp-Source: ABdhPJyosjo0/LB0jv60SnliLdt8ERRhhHVm3sfdbcJTqVYOTtb9VuE1vJFGTM9yttLJZ4HloB922Q== X-Received: by 2002:a1c:5f41:: with SMTP id t62mr137567wmb.53.1594649473455; Mon, 13 Jul 2020 07:11:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/25] target/arm: Don't do raw writes for PMINTENCLR Date: Mon, 13 Jul 2020 15:10:45 +0100 Message-Id: <20200713141104.5139-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Aaron Lindsay Raw writes to this register when in KVM mode can cause interrupts to be raised (even when the PMU is disabled). Because the underlying state is already aliased to PMINTENSET (which already provides raw write functions), we can safely disable raw accesses to PMINTENCLR entirely. Signed-off-by: Aaron Lindsay Message-id: 20200707152616.1917154-1-aaron@os.amperecomputing.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index dc9c29f998f..c69a2baf1d3 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2269,13 +2269,13 @@ static const ARMCPRegInfo v7_cp_reginfo[] =3D { .resetvalue =3D 0x0 }, { .name =3D "PMINTENCLR", .cp =3D 15, .crn =3D 9, .crm =3D 14, .opc1 = =3D 0, .opc2 =3D 2, .access =3D PL1_RW, .accessfn =3D access_tpm, - .type =3D ARM_CP_ALIAS | ARM_CP_IO, + .type =3D ARM_CP_ALIAS | ARM_CP_IO | ARM_CP_NO_RAW, .fieldoffset =3D offsetof(CPUARMState, cp15.c9_pminten), .writefn =3D pmintenclr_write, }, { .name =3D "PMINTENCLR_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 9, .crm =3D 14, .opc2 =3D 2, .access =3D PL1_RW, .accessfn =3D access_tpm, - .type =3D ARM_CP_ALIAS | ARM_CP_IO, + .type =3D ARM_CP_ALIAS | ARM_CP_IO | ARM_CP_NO_RAW, .fieldoffset =3D offsetof(CPUARMState, cp15.c9_pminten), .writefn =3D pmintenclr_write }, { .name =3D "CCSIDR", .state =3D ARM_CP_STATE_BOTH, --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649967; cv=none; d=zohomail.com; s=zohoarc; b=YYa1Krr3J5nQOkjrnMlTmpPMo6UZqtYjTWSOWsr30Lg/Bw348UhAl+JmB10gd3N0YmWRZgO8aND0pirzFyQTDxZvmnU2zOzCbLqAXGT7VnCYVL4DF32ocAwGdS7zNl7TNxzFiD5UEqQkHc97N9MAEQj3JuGBa1BVrVpwSWtlEAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649967; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aypUxU7C2gYLlTPZ8asdzkNfN+z6lUCzbwNisQbIlr4=; b=mgeIRTyDDxIFpVninNDvav/NtUri0LiBBWeo+30QtP0c7dUBHg22DPUJYUYtXyLfgPv9ERIetm4zCwgUKsKciOEPtUQLfM/pCZunhmS3j0FS3fG73VVaoAv39cqoYx+90TWyjSDrQ+GCToH7vyTND7fx6mIlpm2m/TFO63LciVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159464996749149.735047049491186; Mon, 13 Jul 2020 07:19:27 -0700 (PDT) Received: from localhost ([::1]:55560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzIk-00035V-B1 for importer@patchew.org; Mon, 13 Jul 2020 10:19:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAs-00055d-9P for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:18 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAq-0006co-Gu for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:17 -0400 Received: by mail-wm1-x330.google.com with SMTP id f18so13313836wml.3 for ; Mon, 13 Jul 2020 07:11:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aypUxU7C2gYLlTPZ8asdzkNfN+z6lUCzbwNisQbIlr4=; b=g6CBjEWZi3idyWARMDdSRQbdouAMNIEAOGeNx8OJ27gxIdaO6ezZxtyoZ5W/GzwKH5 E3tFXlEFGPOjx9X9YhorEkYTpCGWKb+ecT4jhc5wQquqUG1L2VlMyIH+7BPe4s2uHvYp XBwKTFFM4BWG+ncBJoli1RFWNDSWiesETIxeqlUTZt3WexW8PCGUsjxl1vOLpebSc22x bOtDi6oZhk3/O02tdrUkfh2T9dtAtYrbLAo3hf4xSgq6FYtGbYgQii3Y7kx/eFyRR3IZ NS6AzrtzIMUilItYMHfbT53czYcBWHGlFDyO/8y8LjQjy0LWBwYCqDaUiZv3qlRgC4/k gWJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aypUxU7C2gYLlTPZ8asdzkNfN+z6lUCzbwNisQbIlr4=; b=LVt50HUDAJU/1sIKvvNHhcALSAIFsYaEldVKGMCElltvgHAqQCru6tEVAfooYchaka TWx2ROaHtN6Tjz2YXa2rWmVkTpNFBdkg1q35wXXxml+w1FUpFE508yfzJk5x1X0HYvgy DUDKL6r8tSI8JtYAIAO5tQhmdWijvP0WQttNeNthYanYpN7jMA/eseaH6z8r0VvEQLXy vqdN6lisEeDk0FpMafc8ock4BP9skBUnhVTHiE7WmDFJZhcjOq4mtj3tSvYZw2oKme7x COfwOj0yV4nD43OI3RXvCKV6pCzikGFimtVVvwiozD8L9+HElIrJAbHFVN4aD43j9DMy 0SIg== X-Gm-Message-State: AOAM533OSw1srHFZzCui/zmCctdhgHFJsKx536GjBnEs1StG72FYWj9D VdtCWCHXI+ToV0CKXxrvIjZZ20jKy3yzDw== X-Google-Smtp-Source: ABdhPJzq3bvoJBGgjamjjDQjzXQxsqDr/Q2k1TVMMftrra/4zKKot1orO/O5q1HQFC5GjxvRgMU0sA== X-Received: by 2002:a1c:ba08:: with SMTP id k8mr182121wmf.28.1594649474583; Mon, 13 Jul 2020 07:11:14 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/25] virtio-iommu: Fix coverity issue in virtio_iommu_handle_command() Date: Mon, 13 Jul 2020 15:10:46 +0100 Message-Id: <20200713141104.5139-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Eric Auger Coverity points out (CID 1430180) that the new case is missing break or a /* fallthrough */ comment. Break is the right thing to do as in that case, tail is not used. Fixes 1733eebb9e ("virtio-iommu: Implement RESV_MEM probe request") Signed-off-by: Eric Auger Reported-by: Peter Maydell Message-id: 20200708160147.18426-1-eric.auger@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/virtio/virtio-iommu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index b39e836181e..5d56865e569 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -534,6 +534,7 @@ static void virtio_iommu_handle_command(VirtIODevice *v= dev, VirtQueue *vq) ptail =3D (struct virtio_iommu_req_tail *) (buf + s->config.probe_size); ptail->status =3D virtio_iommu_handle_probe(s, iov, iov_cnt, b= uf); + break; } default: tail.status =3D VIRTIO_IOMMU_S_UNSUPP; --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649655; cv=none; d=zohomail.com; s=zohoarc; b=A49AbdH5MfYN48CrE9zCSBcVyzBiG8cNYhex43YK5OujtI9IzzTeVW1Xz2V2t5YSRVMW1E4ktg/EHUAZYbsrM3B/ZHjSgEdessT7j6AmqY+bs7NAv0y89Xziv9mKIsb+z/PA+bIcAQWBrCeQUVn7yxqDexJHfnQYwWKuNPEeUcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649655; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sfF8uQlqTNWoN2CdQI+dtwBm9efGllQvPXBr2wV3kLI=; b=mc73jl+eOzIvDiYtXOzkXY16uXZrlw9efOMdbDhq2dxyBrDCN68++TA4gatkPxV69I8sZpxGGrWdjT7/O96oie/Nu/5ZcvZAgB0QRR6UR3qDJB5wa4mkq7TH5NFeplEzwuY8zmk+nHhGXjJD/cWz3uFw6r/3Cllhqfh94l0hUt0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649655231713.0826952077553; Mon, 13 Jul 2020 07:14:15 -0700 (PDT) Received: from localhost ([::1]:59524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzDi-0001jM-26 for importer@patchew.org; Mon, 13 Jul 2020 10:14:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAt-00057b-2L for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:19 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAr-0006cz-EY for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:18 -0400 Received: by mail-wm1-x32b.google.com with SMTP id o8so13447686wmh.4 for ; Mon, 13 Jul 2020 07:11:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sfF8uQlqTNWoN2CdQI+dtwBm9efGllQvPXBr2wV3kLI=; b=US0dj16dEkO0ktvMnbDhVuqDO02RSgEe/Ta3ul4SP1KC5WwifjnEPHaFuE32KG4oZ5 uaqCNi86EZXW+5gG9zp1XsHVe9NVlbIk1MxjPcGKHMoTNtNIxBz93ARAjMYrgGKYEDXy 2Qsn4gOOhjNMBV3JabWNY0ACj6qsisDRJ2uoBf8VtvotuPCmeHtNiULI5JVpR4jnp54T BC9bMTiMOquxI8o72yQRP69zDuz5zrQtOMkt44aPQPsr8gGBGUbEzXCY8RWTi53moXMj 0iUPcd/2ZtzNAfYG7ghFDs+b4TKj4ebS1EgrgFLxDDf8kEtjuTPtQ7QApCOo79kAlzsG c4LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sfF8uQlqTNWoN2CdQI+dtwBm9efGllQvPXBr2wV3kLI=; b=OfRxx4PpRvHCLxxIY9dX6O/K9VvHtvJMsLQoT5k0B0snh/lPDPPOc8HosDUJ8+PNcf p7MXGM3nLmFMFnuxwtMEJSAe9EGQn6jXjtZ8EfOG3vXGQGYsw5UDJkGpvBQ7IpId3Yhq QSy24mEmSoYgzEgnis4HBd8ZhXPtusaPOiOKFaFva6+Q9dPWcZz5RMEyNlD0wPQxDFHv yBWFiBJ6lX0EXg7yR8iREYxlqiibjiksCeJ1dcTdlo7xBYIQmpGzM9CHH71f214nIVuc y3nCE3AF0nOWvj98CMXWgbSEihM9v4IYqiJifCyq4O/A4qZyD4y7ViH+UnRtcQC7ylbx +FLw== X-Gm-Message-State: AOAM5301zdCMqmZnU1JMS92DaIA34S9y97yaKsj0KFK09Bf9/wSbes6Z cDbJy2EirCxsMOOm9cBtN58q78GyP7uf8g== X-Google-Smtp-Source: ABdhPJwFsqbxFSYynaCP8JTXsVave4PZgk2aLEyHocgUg4KsebCG3mh/7fJ5C4I4qe2GA8L0pJzAXg== X-Received: by 2002:a1c:5453:: with SMTP id p19mr137616wmi.41.1594649475872; Mon, 13 Jul 2020 07:11:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/25] build: Enable BSD symbols for Haiku Date: Mon, 13 Jul 2020 15:10:47 +0100 Message-Id: <20200713141104.5139-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER Tell Haiku to provide various BSD functions by setting BSD_SOURCE and linking libbsd. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-2-peter.maydell@linaro.org [PMM: expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9b6ab9d3ca3..c70b43d1394 100755 --- a/configure +++ b/configure @@ -904,8 +904,8 @@ SunOS) ;; Haiku) haiku=3D"yes" - QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS" - LIBS=3D"-lposix_error_mapper -lnetwork $LIBS" + QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS" + LIBS=3D"-lposix_error_mapper -lnetwork -lbsd $LIBS" ;; Linux) audio_drv_list=3D"try-pa oss" --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649761; cv=none; d=zohomail.com; s=zohoarc; b=Gl1ScVhu++aJTWmzcqOhFojJf7QZbsWJOXQdOZVauMB/CC1ywwGDkRlRw05AS65xdCCx6QFlQCfqofQJqXRXhAzzUsu4/MeU/5ti4qCwWIbLul4Qt5aP5etksp6TnV7qMIDoVzoz0XVeQH2ESG8Nro6FarGuSvKjAibl61y+q6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649761; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7rQjw1rOqhAJCjmAz6yvmJBAWq0/Oe9unTgHrAzUqpE=; b=LQju2IIUv80TGtqev14sD3mvMFb5ImAlWYRwJDYYXjgFzD7MP7L7rdggc6u1VGJhLy/x3tE/6GYho/xO6A/H2C6qcqJM7qii1Iyos4W5q7a1LhlldRbvjSdhua8IL7Gmmguv6uGOXj1/JTmWA1go+qUj9McVvYSWv7VaY2Ld1ZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159464976135760.93764007838104; Mon, 13 Jul 2020 07:16:01 -0700 (PDT) Received: from localhost ([::1]:39870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzFQ-0005F9-5J for importer@patchew.org; Mon, 13 Jul 2020 10:16:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAu-0005BU-IV for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:20 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAs-0006d9-QQ for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:20 -0400 Received: by mail-wm1-x32a.google.com with SMTP id f18so13313954wml.3 for ; Mon, 13 Jul 2020 07:11:18 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7rQjw1rOqhAJCjmAz6yvmJBAWq0/Oe9unTgHrAzUqpE=; b=nnodcJofB78anUr2Wfa1/udAvIB5JFFgMBNuyXkDVh236+BBNJ34jXnqdXwcW3BYD3 3NaNjtQj2W8KXfz/+6EvcHlejQf449mgtMjTS9Y93y2+gy7l7PhwU8J3RbeEoTyNgx9L XdBE8o4aIWjBNZT/Ut5aN+tnmf7YJWPJQAbsy0GYaiFWLrSVGAV9xdWSCbUP3AM9G3Ue CZBAPUvGypODm1pp0548MhUp0/w1cAEEya4u04nR862W9jTrpQ/qA0UrG+OFWRQQZJ3j w3xjIn3Uyd9aFYgsfHYHn2oHtXwv/I0xyMbYCct7hHklIAfzuaTvbR+6l1mj8lP/Nm+R p6Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7rQjw1rOqhAJCjmAz6yvmJBAWq0/Oe9unTgHrAzUqpE=; b=K6wE5byeaRB1IgoF7Sh4W3GJd3qXPvS+jsEExZN1cpdPwVkBNVnq3SA7jZBBTRRBMj NzyHE0oGrBichjYAnbA4MOPxknGRZ8K2vEm4Rg556VlEaxdqrT9V1z6iDVhuRHaTQfmY xxm8fmP4963zk5usCRKwgeOk5nGy2FUN/7rzM9kQhC9y2ARSHCiGWbn+KTbPGD4GOiEh dcTNPg9cOstrz65drn5kE7HYAahSW4T7Q/+LOnoYTx5+6k5LRjQGCoJj78oRmRpFzeYu 5Q79RvpPJRhM30YwInQNu5SYrKQKt/h+659wHRnjnuKv3iOs17zc9CBZNSqC+zyZaz4V yXpw== X-Gm-Message-State: AOAM5321rGTsouud21PN6ivt4tptIMYfDkjqWthsSEk97Yz5ZW1kVGEK pdXB5qrbNp+j8/8aXT8BW0UOMvrm6jGt/Q== X-Google-Smtp-Source: ABdhPJxUZUf9Eac6toyngWZD5RWLe7Fz/ynGDo2Is8xzfojrXZdIjnSlhYeLWhG6qEAPeC59nX9Q0A== X-Received: by 2002:a1c:ab84:: with SMTP id u126mr143238wme.43.1594649477082; Mon, 13 Jul 2020 07:11:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/25] util/qemu-openpty.c: Don't assume pty.h is glibc-only Date: Mon, 13 Jul 2020 15:10:48 +0100 Message-Id: <20200713141104.5139-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER Instead of using an OS-specific ifdef test to select the "openpty() is in pty.h" codepath, make configure check for the existence of the header and use the new CONFIG_PTY instead. This is necessary to build on Haiku, which also provides openpty() via pty.h. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-3-peter.maydell@linaro.org [PMM: Expanded commit message; rename to HAVE_PTY_H] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- configure | 9 +++++++++ util/qemu-openpty.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c70b43d1394..978505611b1 100755 --- a/configure +++ b/configure @@ -2402,6 +2402,12 @@ else l2tpv3=3Dno fi =20 +if check_include "pty.h" ; then + pty_h=3Dyes +else + pty_h=3Dno +fi + ######################################### # vhost interdependencies and host support =20 @@ -7893,6 +7899,9 @@ fi if test "$sheepdog" =3D "yes" ; then echo "CONFIG_SHEEPDOG=3Dy" >> $config_host_mak fi +if test "$pty_h" =3D "yes" ; then + echo "HAVE_PTY_H=3Dy" >> $config_host_mak +fi if test "$fuzzing" =3D "yes" ; then if test "$have_fuzzer" =3D "yes"; then FUZZ_LDFLAGS=3D" -fsanitize=3Daddress,fuzzer" diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 4b8df96f383..eb17f5b0bce 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" =20 -#if defined(__GLIBC__) +#if defined HAVE_PTY_H # include #elif defined CONFIG_BSD # include --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649641; cv=none; d=zohomail.com; s=zohoarc; b=YgSFemyqXEvDQJqcgGY/qXPRYKjJHQtG4TA+/MsBmOckLw7eeOgDIlfZ1H9aJ7Gs/lUTW7SzxO0FuwK4tvY/MWYf2w1wc912f5eWmxj0Z4Y0W/HXHEsVQWJcJj5Z0yEU9Eceh5d9SGwrnOJqMdoKldy/WzeSeGQyqjnpFwEta9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649641; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sFunfT5Kh2K53TfOYy7GzkQp2kpbcgHJUtW52Jf/d80=; b=VCQGu4npDPuLcmmPjDAq6psUqMfiA3b8EztPuEyY1W7PxbN2fK1VChx8ioeOj/UUXvwhH+o0OhdZakeRU0toenNovsD5TsU70Ntp8+zqiI7Fi1HvGAEs+lzNHQ6+yscoo1YIfXDwJDsD5ZnbPHdZ1t8sWbnYsXFRhbM3Cpf9hmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649641292242.64532722859565; Mon, 13 Jul 2020 07:14:01 -0700 (PDT) Received: from localhost ([::1]:58462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzDU-0001Jj-0M for importer@patchew.org; Mon, 13 Jul 2020 10:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAw-0005IT-Mz for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:22 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAt-0006dN-Ng for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:22 -0400 Received: by mail-wm1-x341.google.com with SMTP id w3so13308120wmi.4 for ; Mon, 13 Jul 2020 07:11:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sFunfT5Kh2K53TfOYy7GzkQp2kpbcgHJUtW52Jf/d80=; b=VizsTQEli1zuwZ573ecUiTZURo/ruIpNIlnN9aj6hDn3D9I765nk5tcZGZjgq/wBRW y4xe6pULMEKyjaSv0egAQ++cyXZNBxRqJ8+bFNvS/mhdvjQJ5l0N+Yi7awYW719sd18U aH9piBokp6Rb4XmNi6pk3EzwaTRpLdH82KHD5JLqub1CdCj/UdDrNwHc+IwapS7vRFBv rYlIiVGa8bmp88zOeZy9ZH6qmC7X1qOxtiFxFUSbmYUCv8xYkLufcLna/rGdhmM2Yczz lEVpQFTLtq0mWF/4ZHR5NVnbiARqeh6OzqWWymdkrNHqhveg17UOENiY0iewYx7wxlHJ WQlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sFunfT5Kh2K53TfOYy7GzkQp2kpbcgHJUtW52Jf/d80=; b=SIfygOBEHc7y6vObXSh94Y9aFDPPJqMV1Y3/PqFNjnJmW5HafeHPP7NhmHTb+PJ1AZ eqqvnvTEVitkuH5KddSyrPpqiC1un20yfYRee0V+iwm5JjN7MGtWe3Iz0xPO1AAUZjFk ieYHGEh874UpuGnnRiCvR01DXY+iwIvG/uNU658yhS7cI7/2e3YclxHbJncFM+mD/1lw CIg/KWyJDqpUoFzFjYVVoa2TIvegKorf5KKxZiPAy0lexhqWcx70xVxKaY0Ex8abkt21 lwyk2/bCqpktSb9IONdrJTt74VMGGChJrrrmf4ku3g855r8+RxgOP2LyqKwTwyvoFX7q hufg== X-Gm-Message-State: AOAM532k1gGXN73d97aHQJpXVFhCUVPJ7dJu0lTKgNRaPIhENT4o+TIY wCqyx2sDeQ44PK8eNnwsqRmvwfVS7jm15Q== X-Google-Smtp-Source: ABdhPJysyS+TLH0bjm66fwmVHtr0fArUAnFZxH5LPehhDF8gNeWYVzIpY6f8tvR2tVgC2i2truEulQ== X-Received: by 2002:a1c:2349:: with SMTP id j70mr182824wmj.22.1594649478138; Mon, 13 Jul 2020 07:11:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/25] build: Check that mlockall() exists Date: Mon, 13 Jul 2020 15:10:49 +0100 Message-Id: <20200713141104.5139-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER Instead of assuming that all POSIX platforms provide mlockall(), test for it in configure. If the host doesn't provide this platform then os_mlock() will fail -ENOSYS, as it does already on Windows. This is necessary for Haiku, which does not have mlockall(). Signed-off-by: David Carlier Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-4-peter.maydell@linaro.org [PMM: Expanded commit message; rename to HAVE_MLOCKALL] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- configure | 15 +++++++++++++++ os-posix.c | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/configure b/configure index 978505611b1..429c938708e 100755 --- a/configure +++ b/configure @@ -2408,6 +2408,18 @@ else pty_h=3Dno fi =20 +cat > $TMPC < +int main(int argc, char *argv[]) { + return mlockall(MCL_FUTURE); +} +EOF +if compile_prog "" "" ; then + have_mlockall=3Dyes +else + have_mlockall=3Dno +fi + ######################################### # vhost interdependencies and host support =20 @@ -7902,6 +7914,9 @@ fi if test "$pty_h" =3D "yes" ; then echo "HAVE_PTY_H=3Dy" >> $config_host_mak fi +if test "$have_mlockall" =3D "yes" ; then + echo "HAVE_MLOCKALL=3Dy" >> $config_host_mak +fi if test "$fuzzing" =3D "yes" ; then if test "$have_fuzzer" =3D "yes"; then FUZZ_LDFLAGS=3D" -fsanitize=3Daddress,fuzzer" diff --git a/os-posix.c b/os-posix.c index 3cd52e1e700..b674b20b1b1 100644 --- a/os-posix.c +++ b/os-posix.c @@ -337,6 +337,7 @@ bool is_daemonized(void) =20 int os_mlock(void) { +#ifdef HAVE_MLOCKALL int ret =3D 0; =20 ret =3D mlockall(MCL_CURRENT | MCL_FUTURE); @@ -345,4 +346,7 @@ int os_mlock(void) } =20 return ret; +#else + return -ENOSYS; +#endif } --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649899; cv=none; d=zohomail.com; s=zohoarc; b=ZUGdHRNYryOecvhTbcjetiLe/ZuqtM+1ce4VxeJ7sqPNDn5nafJvLMr4SLjLzUbeOMmqqilnzLBw39pH3ye4782N8PBb3s3fm/xfGjRMmiQesPkvdFe+KxTx6JKBPZKmABxnd896IvaGJKIUCpqFSDnYpT7SRTiBV76nrY0bNeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649899; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e5ekV9cWmtxxKazK6zrxMH+2NJII48iBTB73eXHStJw=; b=K1qhdh83Ta/pngHAs9fkOz8sTd7q9g9Wq9M/3b5cl0FyWMmEuLZMEYM/R9RfEwZ/gi+GvfQY/rWGAstvKGvmvyNQH/tzX5qcYAvjxqeuW6vBkEZ2Q/fFrf7l0sM0lQHQesGs7sZipvbrAyMJmnJEXaBr/qKbgcDbmPCKcX958WM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649899204259.63972492272035; Mon, 13 Jul 2020 07:18:19 -0700 (PDT) Received: from localhost ([::1]:48324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzHd-0000CR-TJ for importer@patchew.org; Mon, 13 Jul 2020 10:18:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAx-0005LI-Tf for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:23 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAv-0006dY-1B for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:23 -0400 Received: by mail-wm1-x341.google.com with SMTP id g75so13445358wme.5 for ; Mon, 13 Jul 2020 07:11:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=e5ekV9cWmtxxKazK6zrxMH+2NJII48iBTB73eXHStJw=; b=A2qq2K4ilM10laE4/iIpInXguf23DGSPLEhiNTlhjbS8aUQUo1/BJ5GLNCVEHTi0yW eV06/XLoTxnr6AaldvbBfXw+MXm6rS0ApXsOCv4U7XG+yp1ANcvVW73xWurz5K7B7bag P8n582H4DwN1Gt3MSSuETr0ytY/t1pCsjQV96ibHbXHMdvl+rRpc5mLURyHOeEv9ZwdC zrPWPt/nzxnwCqXYSwbhGbOyrRp5Rg013QfMdjihAkgTcUfk/hcvMYduLhYQy7dPCJdF cz+HZMFdK/4cZywlT91aeSN5rA0s2ZdrykbNLMvyJbSf6FwRINAmgZ/K8rLcJMtGCcyk L0lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e5ekV9cWmtxxKazK6zrxMH+2NJII48iBTB73eXHStJw=; b=sC2Y64fuTMFwlKyhK0DfoccYK9PSqt3vTgRGS1+fSeHB4odzn9UAjx+YBV1KNO6Ww1 bfQdG17hrR0l4vIpe3xHiwlq78/iKICrPH6xli8LTfUMaNCIZkgFPaeFEBLg8X3JAOvA XIfUBmZQHTP/T6sCVuWEokzoLilx2XSmPLQ5JEf9u0srLyIOjqOiFcPZk0Od8L0KZW2U c6S/4mwVVuXkeFLMjZgs6FZPK3IWt6gr29T6fgq9v12uj8jUSHkZlmJ5vrD5iBiFMVOG lRV+v9JfK+PQXeOA1KPrjazmVfNcVhY4vksh6jhTffV9ODR7xMNRbzS/A7KwuXQBrry2 0KTw== X-Gm-Message-State: AOAM532stZT6T8svGydHaQDzHz1ym1qhUV/vJeDJf30gq7qnBKF70LyJ uE7A4AsXFa+r1rLFsLat68tWunIAjUOmpg== X-Google-Smtp-Source: ABdhPJzdNwRG9zAwx38f8DV0FACF8Ddl/bbZga/0j1wlRYSbAaY26yYJ4JHap2mEvoVIkl6q+uV5sg== X-Received: by 2002:a05:600c:2253:: with SMTP id a19mr158591wmm.136.1594649479182; Mon, 13 Jul 2020 07:11:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/25] osdep.h: Always include if it exists Date: Mon, 13 Jul 2020 15:10:50 +0100 Message-Id: <20200713141104.5139-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: David CARLIER Regularize our handling of : currently we include it in osdep.h, but only for OpenBSD, and we include it without an ifdef guard in a couple of C files. This causes problems for Haiku, which doesn't have that header. Instead, check in configure whether sys/signal.h exists, and if it does then always include it from osdep.h. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-5-peter.maydell@linaro.org [PMM: Expanded commit message; rename to HAVE_SYS_SIGNAL_H] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- configure | 10 ++++++++++ include/qemu/osdep.h | 2 +- hw/xen/xen-legacy-backend.c | 1 - util/oslib-posix.c | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 429c938708e..bc3b9ad9317 100755 --- a/configure +++ b/configure @@ -3244,6 +3244,13 @@ if check_include "libdrm/drm.h" ; then have_drm_h=3Dyes fi =20 +######################################### +# sys/signal.h check +have_sys_signal_h=3Dno +if check_include "sys/signal.h" ; then + have_sys_signal_h=3Dyes +fi + ########################################## # VTE probe =20 @@ -7433,6 +7440,9 @@ fi if test "$have_openpty" =3D "yes" ; then echo "HAVE_OPENPTY=3Dy" >> $config_host_mak fi +if test "$have_sys_signal_h" =3D "yes" ; then + echo "HAVE_SYS_SIGNAL_H=3Dy" >> $config_host_mak +fi =20 # Work around a system header bug with some kernel/XFS header # versions where they both try to define 'struct fsxattr': diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 0fc206ae615..14059bce5a7 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -104,7 +104,7 @@ extern int daemon(int, int); #include #include =20 -#ifdef __OpenBSD__ +#ifdef HAVE_SYS_SIGNAL_H #include #endif =20 diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 083d8dc1b28..b61a4855b7b 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -23,7 +23,6 @@ */ =20 #include "qemu/osdep.h" -#include =20 #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 39ddc77c85b..7ad9195c445 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -38,7 +38,6 @@ #include "qemu/sockets.h" #include "qemu/thread.h" #include -#include #include "qemu/cutils.h" =20 #ifdef CONFIG_LINUX --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649979; cv=none; d=zohomail.com; s=zohoarc; b=VEbfIw65wpLoFZ+/UC2p/uFa5S+EQLIouagYoXEFRZvuVMNcomDfQovHj3cPj5e+aYSXa5VfO9I/dfk70jwDogB34BIv0lUhCb96m05CoA2VE8OezZ+NodalDzqNUTho6zJp9n6i/cKXkZEAkX2eTsMpfz1pS7IEKQU6TNwdXYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649979; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UrTMYXsKYBCCeeRev7zn6zcrL7aDFdGahwfyK1NLkvM=; b=lJDWWMi8ggB+WzHCEeDU0ooncz8njtsQWDz31zTJ33emUfC+mr0KiSP6qIs+UlLyixW/dOOCeJLCtoeGaUxfegEOfMRgKFkhIuoOe3BT28NauHt0ykakr7WsffcIed45RDX/oBQI8/xk2UfSUWH8Tex/Bzpvjd487mEw8+wqy7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649979613436.91316911045703; Mon, 13 Jul 2020 07:19:39 -0700 (PDT) Received: from localhost ([::1]:56406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzIw-0003QD-DQ for importer@patchew.org; Mon, 13 Jul 2020 10:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAy-0005Lz-6J for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:24 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAw-0006dl-1b for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:23 -0400 Received: by mail-wr1-x42c.google.com with SMTP id f2so16675636wrp.7 for ; Mon, 13 Jul 2020 07:11:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UrTMYXsKYBCCeeRev7zn6zcrL7aDFdGahwfyK1NLkvM=; b=qVYohas5ocgS+RPL4ScujKXWa7XMktaIgmOG5itxCIqEX572fGuYFPZRiYAlD15Owx YvyFhZysgv+8kDLIrjPXj5VeiJWzNGPEbR+GlG1j/ip2kzAo38PVgcqth/3GTZL0tDmb XIyeKdFeSs9WG7xAcdK/RAw3fdflNbH+SjJ6Uu7OtnSTGY8iW/oQqCaCNEaNB/mEEoNO OTUpyLe+8//pjl1T3QiUT32KgW+af+SfS8b6Wu7MsqumMunrv4ZWTLfzNKyQeTiCC5nh IiW1liofaDZvZhZ/PWwOUCC7ojuPPg1SGHMprtajVYTycyseZOvxHIhs7lRYvKetMEDJ 8WdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UrTMYXsKYBCCeeRev7zn6zcrL7aDFdGahwfyK1NLkvM=; b=MFt46zilwXHz6p/C74/5gMCTkJUPPFS2ESXLImocdsYrA6W3w/HQHx5OW2yqoaVQEq 1OhWo09AyMIaQGhHAIA57zPgsYG3VvxRz1JW+5ezCWR2K7rYYEEGxoGXEHjoWQ4YR6+N GB9r+hAX1/GBo0DgIkhObxIGnohA0WQINoxoxJ98F2fZ3SMeTr9XgA0glvC4Unkt3V6q emfMbYdIhjtI6e+qrSRjELPOdHm1mrIvGW3nCqxzQH4izjkJOC/DOvMG0/eajyeFwLi6 97FYnSNdQ4Jdra+Qi86uQxnIN59RTf1V080YS95corMkiNI89+Wl0zKG74Vhjf7GALmJ N2ig== X-Gm-Message-State: AOAM533/nUy9NuygEx/jfVcFzwa2iCYjYwF003SCETshGJIZXfdhIds4 iAi+47QsoD7WJ3GpuRxDKO7S9CBxZEDGtA== X-Google-Smtp-Source: ABdhPJwziGWE9XzWIU/f90OxiQRLIoF00f7buY96Vn9KONEvkYNIZlUQJB1FqQVvtIl3m4VH/5ilkw== X-Received: by 2002:adf:dd4a:: with SMTP id u10mr78795904wrm.169.1594649480342; Mon, 13 Jul 2020 07:11:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/25] osdep.h: For Haiku, define SIGIO as equivalent to SIGPOLL Date: Mon, 13 Jul 2020 15:10:51 +0100 Message-Id: <20200713141104.5139-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER Haiku doesn't provide SIGIO; fix this up in osdep.h by defining it as equal to SIGPOLL. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-6-peter.maydell@linaro.org [PMM: Expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/qemu/osdep.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 14059bce5a7..979a4039841 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -432,6 +432,10 @@ void qemu_anon_ram_free(void *ptr, size_t size); #define HAVE_CHARDEV_PARPORT 1 #endif =20 +#if defined(__HAIKU__) +#define SIGIO SIGPOLL +#endif + #if defined(CONFIG_LINUX) #ifndef BUS_MCEERR_AR #define BUS_MCEERR_AR 4 --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650196; cv=none; d=zohomail.com; s=zohoarc; b=LwDEQloYZysAjTQZGVQeMH+1AiJ0GtoqY2gt5D1Ka7htKUexCBMidvrtKTKMhloOP09Ir+G8ofZ9GhzDo4MwP9OMyqxY/TZpepZs8nxqDLtzPLkeGG7xQVVFm3vBC3ViOGnFjcxkIyBHxkoVK4eozFMF7N3H3s/GAqNIIl8lHIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650196; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2mJpCpL7EiAJWz9OGCJeMqrPYbEJZKGb3cEkeqQTV+A=; b=Mcqa7osj/KxN+GWCS/dmPswhaJM9SCczzFHuOTH4TzRY10euGAd2kAty3/FLVPBVaqn2llYD/dea39XcGAw5EzZRzBHmSsvO4dFu45FR5QXzAQUJtd/cXs4ihrW0Ic72dlegvw6fIrEXJVFrqxlljAxAke0WvB1/2O7WZMlarkw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650196882524.4341152728579; Mon, 13 Jul 2020 07:23:16 -0700 (PDT) Received: from localhost ([::1]:43454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzMR-0001I9-JG for importer@patchew.org; Mon, 13 Jul 2020 10:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB0-0005T7-V7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:27 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAx-0006e2-Db for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:26 -0400 Received: by mail-wr1-x443.google.com with SMTP id z15so16714408wrl.8 for ; Mon, 13 Jul 2020 07:11:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2mJpCpL7EiAJWz9OGCJeMqrPYbEJZKGb3cEkeqQTV+A=; b=kFLbk5F3qKSufwcfNsh6oW+aSyB8MWoREaYH0gkX/hDIf/l9iBA7F+jrGVjMgYqDJO DmtY4eycpXOeJAg0Gvy4iXZFjhoWzxl63DoS6ydA4DzDJ3wU2slVodRbvzztSj9i77aM TfHpNxeNTq7iIcKG7Ix5nIB2zVeQEB4ZY0Y+us5zqmJZmNjF4LIkclayRZg/2cDirrkH Gw3Ll7O3urwnVvUSxLHQFWeG3GGB0Obb5oF7RaGF6yVf6Yi7uzPMU6Pz2tPw44rCHySx n3Bh5ALvrqh5T5fdfBggnvWW4ocfPLtu9aymPNSh7QO9dTALd9G9P6ouSnq/mhCfB8mP mF4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2mJpCpL7EiAJWz9OGCJeMqrPYbEJZKGb3cEkeqQTV+A=; b=oARn/1hQpBl2TY3QPo2rYcVlt08l0/rUI4wK14H3LjxGXveSSNXxuJ7PGeWKuo/Njt Y+8flOsD9nO3uvJ10gW5nrwpZgSDxJXnjNig2gq/yEV6g3kUfCgwIVqgqxQA6ChXZ7h8 IVH7BKLP8QlREMjsD2+P6oU8/km0o7B3KaFkhpPsmxnTcCV2Hp4mnMI2zfutloBfck/g tw3ovvK5UEnPI4L/OxTCDJuwm2IvMKVB2IonR30vO8lmYiWcusocsqQilEXgUFY0PGKE Zi7g3PyBoLvQB/kLdSC/om1/rAVofr/kxvJXZg4rg5oHXpi8UP9vzVK3N8MIQDRwdYKx RFdA== X-Gm-Message-State: AOAM531XY9VcFziqgRIVZw2g4knXNCBsltbQfXeBVh+7ESqYbRCSAaEC /TUjvkNTu6sfkeXzfP2g5AZCEUsshWMClg== X-Google-Smtp-Source: ABdhPJzcX8332YDxDyFCP3TZF3SY68vF2JgrcMM6+hCpnFet54W0+RE+qBgjGP1RIML/yzQUuGvzHQ== X-Received: by 2002:adf:f14c:: with SMTP id y12mr78535882wro.30.1594649481724; Mon, 13 Jul 2020 07:11:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/25] bswap.h: Include on Haiku for bswap operations Date: Mon, 13 Jul 2020 15:10:52 +0100 Message-Id: <20200713141104.5139-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: David CARLIER Haiku puts the bswap* functions in ; pull in that include file on that platform. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-7-peter.maydell@linaro.org [PMM: Expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/qemu/bswap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 2a9f3fe783e..1d3e4c24e41 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -8,6 +8,8 @@ # include #elif defined(__FreeBSD__) # include +#elif defined(__HAIKU__) +# include #elif defined(CONFIG_BYTESWAP_H) # include =20 --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650135; cv=none; d=zohomail.com; s=zohoarc; b=MrXYcKqY/Ik1v1gb8kDOK9cElmk8vJObQWLQKKE7eVbTkylPX8hhoija06ELDUEisigThh3ygFyU42wq+GHTpK9N9p/OOgOKgVqvkWEeeA1fkvirIvVnzJ9P9JUnbKGWFbR2iethAVZbpO39gYXkqAzQbQN4j9yao1vEE8z9bhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650135; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=P7C/G9NiGiY+08584/PGrGGMCDs8V/RCFKk1j3YrzuBd1fZUN4gz2RT5CAyDuBfVGDi1pVXeZcwQmcA71wUv9qHmnHhGoLrTxkj2fkh3qaCcUkWIPzW7W9cZ19OHrT96B4PIM2HWykBh5R/f07gkYa+l+2LQyFF/2JzYlmLes2s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650135646176.3550857225249; Mon, 13 Jul 2020 07:22:15 -0700 (PDT) Received: from localhost ([::1]:37824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzLS-0007S2-C0 for importer@patchew.org; Mon, 13 Jul 2020 10:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAz-0005QT-U5 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:25 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAy-0006eF-AP for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id q15so13461959wmj.2 for ; Mon, 13 Jul 2020 07:11:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=JDUik88I33XScCsoKOTAyMSzOzlE7JHbDELuA95WO/GYjRhlCixYgSeQkPPnL0O2IF FHxTlBU6M9Km4T3Dvzaa4l//LuJCdToG96PDCqsuYEl1oc4HyFnqpBa8LuM+6Kq5jxWE apcHfzp+wDeoHViwXs2J/rZy6YN+V9+iT5q2ejmuPnwpKp0nVbVCuROQ+bAOAkpoMDVC ukGaXHCp5tycC/YaohPwziBl11V9tNkpXOAhPjXhGOuKpxBi4nMSuqnTSYVk5kalltIR h0MGVnJByNeq3n7SVSsc7sjf+vGII6QXO6X+oQBd8EucADve+PyPNQzi+EEYuBNaw/ZE +FxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=pPfKe9E30yFgB1XvX2p5Gc4FI1Bw1cLx9ZyK5LUkHnyxaww5xmSI+RMPiwbgJ4hhF8 vrFL7R85/lW7DPy1xckAh6qqMyzQmzdiW6H29B0oQAGxppERtXL1KzXkiWC1yZOyEG+/ aage55hytipv1Y//MJ1ldWAMHBiG+re2prjDwvRGO6AzGdm1gez33gg/X4yHvwFdSJiU GYqQPH01DYMaZcLZrSA1TCpcHMlSRmneW523EIYWUf+ZqxDnBgwR38+4LqngUsdP5pCr X4OVCdbLJ7WmQg/YgEm4Jqu00vkJf3gsfDP0UGgReKmYoLZ+lwpuyLZBSA8TjM+uGNu7 W8Zw== X-Gm-Message-State: AOAM532ZzQr3M3GCyWu5RgC7T3XLI+PB7cjlA7+EK9UZS0ezI0nvnqvg UVUwyw+cWRVyRkoCRt9lygHP5++T4cS3yA== X-Google-Smtp-Source: ABdhPJzK74QtYyAmm/nDVLOtdaE21gpw2nLFIVoIfHVnNIaVlMvzNxMAJDjxoIt/0iKTc8py5TamOw== X-Received: by 2002:a7b:cc85:: with SMTP id p5mr184351wma.18.1594649482708; Mon, 13 Jul 2020 07:11:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/25] util/compatfd.c: Only include if CONFIG_SIGNALFD Date: Mon, 13 Jul 2020 15:10:53 +0100 Message-Id: <20200713141104.5139-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER util/compatfd.c includes so that the CONFIG_SIGNALFD code can use SYS_signalfd. Guard the #include with CONFIG_SIGNALFD to avoid portability issues on hosts like Haiku which do not provide that header file. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-8-peter.maydell@linaro.org [PMM: Expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- util/compatfd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/compatfd.c b/util/compatfd.c index c296f55d148..ee47dd80897 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qemu/thread.h" =20 +#if defined(CONFIG_SIGNALFD) #include +#endif =20 struct sigfd_compat_info { --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650289; cv=none; d=zohomail.com; s=zohoarc; b=GKhGXFGDpB4dV0dGDly9asx95jISa/ddwjhgsFzFogyP15KsoBd9edHj8p4yo/zuFB8Gl0hr+bZfxmPDEFAw4JLcIfb+5m8t60rAFA7tVQg6GvCedzlaZsFuEXpa26EQB3x9ri9f6WNKFju3lhqiBn3CYkAYN10qvLZnlR/nJ/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650289; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K8fsXAlUe8iXr9rVybQcSfsHKZEMrPOLeJ9Iej3RshE=; b=VTS38XJ+eP1er0pk8PsQoYYs5fb8HvkQke/hwkIDoGRl1k3JdebEfmr/a9O1wCVP5u/cnRlD9j3TStqSSCoP689ox1dztrJB32y6SU6eUJ48HZso/w9w+36XBw5+T5KRrRy2BRjhnqgIdQCJER0jn4/x0pm88sjwam8P3lld3i8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650289412633.0934114597427; Mon, 13 Jul 2020 07:24:49 -0700 (PDT) Received: from localhost ([::1]:51212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzNw-0004Q1-6i for importer@patchew.org; Mon, 13 Jul 2020 10:24:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB1-0005Te-79 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:27 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55186) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAz-0006eW-Ci for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:26 -0400 Received: by mail-wm1-x341.google.com with SMTP id o8so13448174wmh.4 for ; Mon, 13 Jul 2020 07:11:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=K8fsXAlUe8iXr9rVybQcSfsHKZEMrPOLeJ9Iej3RshE=; b=Sh9zk5+NhZUUfu5oWQF3CR0CIDoHfeKDEFhqHTA4Ufqy4UFMwwoiETBHdr086HXj0U +KlkNjvgBY93gS0cZE9iYCwzvXjoI1laMyOI/LZFhQoww9XvDBbec2psd13DrYP6uNCV ZeC9fE1jhOSm9/tofYl4shbRjI8pcjC97213cRR5/SZTVgXEWPlAQJpjDmz4z6RdebEj H/Jx9RU1m2sNnWzeeUK5sWWHYIa5yHLX4maPvwnO96HRd3N6wQwzb+hvEAcfLRnVzU82 5VamQLS+yaoFdPPW8ITzYvIeDyFFnt7j+kmLkftvrRXvudnKXOt5pyn8ZnRHav4VplNV BlUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K8fsXAlUe8iXr9rVybQcSfsHKZEMrPOLeJ9Iej3RshE=; b=Dk4ZJwVYZ7q2huankpsU34HmsFOCp3ybieCdcfwq6Puo1NIyVX/geQWbDgOlxqZkqB +1nzEYQUuzS5LzCP43FGt33iQF219az3FBt6Q9gdOFgl4fCEw6liXhM6TSlU44TuQL83 fwqlssncRQ6b0FC1hkXnSnGzK9IgdTDVVBAZ0uWLjLQ6VfMpvjVFQ+yHXgs6vucnosC2 6xmMNr9OZAUE5QfbskqTFuCPHV4a8vLPzIcyhcApnNmdRltTIoqP6O+D+7juA3kdtFGe M4ZmEpc7EGy93xRBacaTHNMRVcKHvl4S7VRXWHkYu5B9O9dtrek4kqq44GnYo423oqXK k+gQ== X-Gm-Message-State: AOAM5333rZnfgIPKNgmUUoXWrbgTieZrA3BZYbxm443CXeeu6SPKqZFT QhRzKl4+l00EEZPPz9+/OVlvGIHz5p+ogA== X-Google-Smtp-Source: ABdhPJwBBG8TwmzwiG1m9OUH7LN4gu+5RU4umE8uxvTRTph98RMcBhmA3EfwReDKKcgrbq8LosK6EA== X-Received: by 2002:a1c:bb89:: with SMTP id l131mr119568wmf.125.1594649483762; Mon, 13 Jul 2020 07:11:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/25] util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku Date: Mon, 13 Jul 2020 15:10:54 +0100 Message-Id: <20200713141104.5139-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: David CARLIER The qemu_init_exec_dir() function is inherently non-portable; provide an implementation for Haiku hosts. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-9-peter.maydell@linaro.org [PMM: Expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- util/oslib-posix.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 7ad9195c445..72907d4d7fe 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -60,6 +60,10 @@ #include #endif =20 +#ifdef __HAIKU__ +#include +#endif + #include "qemu/mmap-alloc.h" =20 #ifdef CONFIG_DEBUG_STACK_USAGE @@ -389,6 +393,21 @@ void qemu_init_exec_dir(const char *argv0) } } } +#elif defined(__HAIKU__) + { + image_info ii; + int32_t c =3D 0; + + *buf =3D '\0'; + while (get_next_image_info(0, &c, &ii) =3D=3D B_OK) { + if (ii.type =3D=3D B_APP_IMAGE) { + strncpy(buf, ii.name, sizeof(buf)); + buf[sizeof(buf) - 1] =3D 0; + p =3D buf; + break; + } + } + } #endif /* If we don't have any way of figuring out the actual executable location then try argv[0]. */ --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650386; cv=none; d=zohomail.com; s=zohoarc; b=SM4pBvRyi6NQV75HK0KJV738e/m1GkwsDxvRr8Ov1mrkR6f2AQX/icPdbV0QH2c68i5s6Jyz1jZgi7xRW1JtG342HQsspLDGFR7o5LcwD9K0rjbYVkvGwZNZvyfbi/y1qTkIdZkqfYLSgIV7lTvXjGdoFIbWCQpCWuOhtDojHlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650386; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OhiRntG58GDC0YrDMGX+/f9xZGwt8SVRtnGNjupJDac=; b=PfhXwt0apyDJxyW/9fDNOF8jnMgazKG9Wfbqi05+q3s6nR7lHTJBglEKl524dOLnwKUdARaq48J5gt+Lv7HopSwa4vO+PRja45N3WRRUeJ3o5Lfyo1MXBq4x9S09II6BO3PBaZO1wF0uhpD4kz3qxM/0OLljsZRIk5V1DbMS6+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650386686119.37960232851333; Mon, 13 Jul 2020 07:26:26 -0700 (PDT) Received: from localhost ([::1]:57498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzPV-0006zm-42 for importer@patchew.org; Mon, 13 Jul 2020 10:26:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB2-0005WQ-8K for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:28 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB0-0006ef-G8 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:27 -0400 Received: by mail-wm1-x333.google.com with SMTP id q15so13462070wmj.2 for ; Mon, 13 Jul 2020 07:11:26 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OhiRntG58GDC0YrDMGX+/f9xZGwt8SVRtnGNjupJDac=; b=qiimElh+YcKrUf7jd3hE09/IvdvkMZDia3108rcbqcg7A3sAW00m1sBlAruyAe9FEa pf96JwnrO0CZZ3R2nX7WswX/UScZd89Y+pvwdKdo7YuGiXZTZ89dS5+xLzl5TKiW6fJX Dpcs72bAyxyevwyinbdi5GqlkgdD1vI5TZa/i2FqU6UasfbhWudKUlcKpmKQ/2Q3Sk7X BsMJn3DK09/aRZtic12GI9J0B5UIgzcd0gcnN2fmrZu/617UZWTZbDoCL88CvLmoF87N ZOlMypit4XMTjE28VvpJTJyN0a1a6DX4h+a4YSh3ztHAhFNjbrs8lxCmpV70moU+kA4R 2xzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OhiRntG58GDC0YrDMGX+/f9xZGwt8SVRtnGNjupJDac=; b=m+s5jVa22YVr6q/ltQxMGki2d8m3CCpYsuwESugF7PW+oTda8SyRMuaX8Oe6/yYJGm jnQMpqhvGlOPftrhiwK80wxKtOU5i1Q8Qmm6eiA9v8oIli48HCFC1amGk0MQLA5aGxkM qX+wVPy4uTJtjyWUxYkNAPAbwu5A62TPav6GMg4NcbR14prf8Dew6lxJi4qXi3WGb0T+ mqvKBtTWE+7PTHOl8IR1+crUPuvGL7/aKExnIa7Q5CVZTiElEO6x6I/Sj+/Wu2mHgCqg EhJREHvMKpbwHduuK7TRy7tYaFjjUfrZNwJyvTj41Cumqfe6SiZ/Bjx9emI+I9cdeYCG Hvrw== X-Gm-Message-State: AOAM531K+EFuU8IFzx0f0psVAVJ4ZwGu9dFedl8Dvbd6WQL+4pn36ldK tYc6ZTnzTF4pgf0tSipxVT2B5cgX98yYLw== X-Google-Smtp-Source: ABdhPJzZqAS0Fic/ezG1ZSOHXff7DVvm/gtBsHlJgwZtXAg+7SkX98J81e00hwRsKTgPavkR024lMA== X-Received: by 2002:a1c:dd09:: with SMTP id u9mr175003wmg.70.1594649484792; Mon, 13 Jul 2020 07:11:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/25] util/drm: make portable by avoiding struct dirent d_type Date: Mon, 13 Jul 2020 15:10:55 +0100 Message-Id: <20200713141104.5139-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Gerd Hoffmann Given this isn't perforance critical at all lets avoid the non-portable d_type and use fstat instead to check whenever the file is a chardev. Signed-off-by: Gerd Hoffmann Reported-by: David Carlier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-10-peter.maydell@linaro.org Message-id: 20200701180302.14821-1-kraxel@redhat.com [PMM: fixed comment style; tweaked subject line] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- util/drm.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/util/drm.c b/util/drm.c index a23ff245382..dae8ffebc81 100644 --- a/util/drm.c +++ b/util/drm.c @@ -24,7 +24,8 @@ int qemu_drm_rendernode_open(const char *rendernode) { DIR *dir; struct dirent *e; - int r, fd; + struct stat st; + int r, fd, ret; char *p; =20 if (rendernode) { @@ -38,10 +39,6 @@ int qemu_drm_rendernode_open(const char *rendernode) =20 fd =3D -1; while ((e =3D readdir(dir))) { - if (e->d_type !=3D DT_CHR) { - continue; - } - if (strncmp(e->d_name, "renderD", 7)) { continue; } @@ -53,6 +50,18 @@ int qemu_drm_rendernode_open(const char *rendernode) g_free(p); continue; } + + /* + * prefer fstat() over checking e->d_type =3D=3D DT_CHR for + * portability reasons + */ + ret =3D fstat(r, &st); + if (ret < 0 || (st.st_mode & S_IFMT) !=3D S_IFCHR) { + close(r); + g_free(p); + continue; + } + fd =3D r; g_free(p); break; --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650100; cv=none; d=zohomail.com; s=zohoarc; b=Cv+2oJ0xxf+ptnmWZ+65f4Hr0/1PhoQZ7Nt6ZRyXbax8jcguot7AgGtVaQsNJzPgN7LhNoqwzQL73O2K6B7Tzv9TgKhKaJq/q5b7/nSnVd7CIYAhmMqNI1eMbCbHhktX7U/V9cHBhyWFi3VMpJrqwXQrGRH6VZk19t9ii1QZFgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650100; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MtbNrkAMGJhFhtpNvSaktDyVzUetinwB6fus5j2wvXs=; b=WQKSDPTskrSLrILgauSHY8TP3Oqc93pIS8hIIEHLvm9Xq2BxvfD/UWME65jNkS7tQTZYiYnaDvnOFEHrSvC/t0L1kd91Cn0vTy4vGdRbUhIUmRbBbuaLa+qEfSo1Al/FbuGH3Wsft3Haz5aVDvUh0UYAUCduMxwx8h7t2/1K2ps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650100901395.9440617222042; Mon, 13 Jul 2020 07:21:40 -0700 (PDT) Received: from localhost ([::1]:36010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzKt-0006iz-Cx for importer@patchew.org; Mon, 13 Jul 2020 10:21:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB3-0005Y0-0c for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:30 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB1-0006er-AA for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:28 -0400 Received: by mail-wm1-x342.google.com with SMTP id o2so13317813wmh.2 for ; Mon, 13 Jul 2020 07:11:26 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MtbNrkAMGJhFhtpNvSaktDyVzUetinwB6fus5j2wvXs=; b=sRAp3ov4SdXgLtDoEEDcJ9fWs1Rvra4etIXSnJnXgFxHsGTkpg9JsmmZjklrits0n/ +bTAdjGg+SMPc2oglmkcNdxuuPOaCessPCot7cYshRSJIWt4KsJ+vqq6bjtoB1MlYF21 Kr6wMejEjX3501If5627+kYnKpZbp7xvW9b4is0VQPk42dv6Z/yhasAV+O8bW/eZS1Ay R9grv1I5leQO5zYrRdNVEx2whoFz+1LNRvdgPewhUPuJRXp7FmUFGajKxhY+viDbp5id Ez0nTaXZaxA6HQEj+dtOq3Ltljr150qtj/aRclmzzgJrwc+HsTdlt2zGJyLs9MIivrnz nqDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MtbNrkAMGJhFhtpNvSaktDyVzUetinwB6fus5j2wvXs=; b=sZYS/ekeaDNjOt8JWgHP3rS4F8NXOIcG2WCHAJQMQNQ7TmzldOy/FAZNRS5D5vSbm7 a4avicnUJouDrYG8yzQE3iDi0rC+UjpQ7BP/aIgL+A9rrSLi3juY8eru1DvUif6Us27M axpupRqS7a9ayvnW/4iLj2vVidn960nEFnf0TeJO4vTaIC/AbJfGCWgi4O3TrwD+tU+U GvnA3YTdXtnEpAOTYeAj0X76XIYH0CM46IacdeRea77JPV5bcdDYfzb2+SSfhoDDjODR X8/eY2fwMXQOWSWq/Za5WY4tisFInwztNLSIb0mDexiiIAB+56MXUGXGywk5yFn4cgDZ 080w== X-Gm-Message-State: AOAM532ILrvNee8+Ig5JfjJhewmwhJUvPpBXT4GtTmLlw1q6HbPux8Dn q7/Il0QhbTTtz0ggo5wYIxY57sh/4U259g== X-Google-Smtp-Source: ABdhPJxofn1lsA/C4ph0noIBzJCWgj5gGY5ttE5GNH1Hkoq2BCiU6qawGlhQs68Owl+tKQ+COqaVSg== X-Received: by 2002:a1c:ab84:: with SMTP id u126mr143817wme.43.1594649485699; Mon, 13 Jul 2020 07:11:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/25] target/nios2: add DISAS_NORETURN case for nothing more to generate Date: Mon, 13 Jul 2020 15:10:56 +0100 Message-Id: <20200713141104.5139-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Wentong Wu Add DISAS_NORETURN case for nothing more to generate because at runtime execution will never return from some helper call. And at the same time replace DISAS_UPDATE in t_gen_helper_raise_exception and gen_exception with the newly added DISAS_NORETURN. Signed-off-by: Wentong Wu Message-id: 20200710233433.19729-1-wentong.wu@intel.com Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- target/nios2/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 6c34cd31937..00b591cc298 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -149,7 +149,7 @@ static void t_gen_helper_raise_exception(DisasContext *= dc, tcg_gen_movi_tl(dc->cpu_R[R_PC], dc->pc); gen_helper_raise_exception(dc->cpu_env, tmp); tcg_temp_free_i32(tmp); - dc->is_jmp =3D DISAS_UPDATE; + dc->is_jmp =3D DISAS_NORETURN; } =20 static bool use_goto_tb(DisasContext *dc, uint32_t dest) @@ -802,7 +802,7 @@ static void gen_exception(DisasContext *dc, uint32_t ex= cp) tcg_gen_movi_tl(cpu_R[R_PC], dc->pc); gen_helper_raise_exception(cpu_env, tmp); tcg_temp_free_i32(tmp); - dc->is_jmp =3D DISAS_UPDATE; + dc->is_jmp =3D DISAS_NORETURN; } =20 /* generate intermediate code for basic block 'tb'. */ @@ -877,6 +877,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlo= ck *tb, int max_insns) tcg_gen_exit_tb(NULL, 0); break; =20 + case DISAS_NORETURN: case DISAS_TB_JUMP: /* nothing more to generate */ break; --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649742; cv=none; d=zohomail.com; s=zohoarc; b=KIwz18FsxJwQdnAcHqiVzyejoeLhAc5mDq/YgjvNcw9hFhjbiuweSpNMnlZrdliS0K5ReP/OI+/Od6mbdC9MdQEKpHWTvPZojjCKgTqu+E0YO9w1HKzlmKEbXuar2wwXo6q9aYTq69EZ90Us2d+HI+vToUalX92NJ3D/i6yclks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649742; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XA7EtZ0Jb+HkGsgLo2baaKD+l0umSsxaqLrlSb4bGaw=; b=FjYv39i9dphF9IrnSNOiarfUGp8ZpOa1ZZcz1RreDYqc94jj4PfNwjLudwIL7DecuYQNnm5h8IqfN06vq/W76FkRDTVv8dYoS5+6XyKdja2caECoLLG/CTHMIxyMibr/ed3/8YuIVnJRnUKDfSXBMrr6Dlj50wUZX5LXP+D/ulk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594649742202700.9607667341963; Mon, 13 Jul 2020 07:15:42 -0700 (PDT) Received: from localhost ([::1]:38774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzF6-0004i3-RO for importer@patchew.org; Mon, 13 Jul 2020 10:15:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB4-0005Z8-Sn for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:31 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:38396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB2-0006f4-EK for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:30 -0400 Received: by mail-wm1-x32d.google.com with SMTP id f18so13314488wml.3 for ; Mon, 13 Jul 2020 07:11:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XA7EtZ0Jb+HkGsgLo2baaKD+l0umSsxaqLrlSb4bGaw=; b=wo6TEw2zsJzv0qwyJjyck04dx/CEfRVOcu6q2WbEUNQaWi36DKpDvad1BicRchd8SB 5ewbi7yscmM6cjsj/285AGLORJf0oKtNSA7vrPyOrm/P5SsDqx5yjfKoPtaSub0P0bTb y+Dh8SMn0xAYtgBNWiXObh1JuRsBpGpyHjNDsoYfJ+cLfIQCenfZ6j9ecBxHq7wq+CYG Z13q7a5F3LFhoxmfTx3UKMb4ZN2jH1VJ9v2JQXF2e59+9Tmjbixnyqr/0sD8Uie46SR3 SAVQRHT5pzEdCJ6EddiG26yTEN11e8tNZUWsUVbFI2PEu7mHBoIv8TndxGji7XsuRs3B 8S4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XA7EtZ0Jb+HkGsgLo2baaKD+l0umSsxaqLrlSb4bGaw=; b=HymhnwIp8h/rjXXzq94n23RzOzX0BBOU8dd52WnCSF5ofTMdXBGbIGfrxm2CiDFAfj jC01LjgDc0s6RiDyyJAZgltkfk3nLb0t1wxuKUX0b4uAWKTy+GF7xJRyfoCVvDozLwIv KDj+s/R3l/FN2098deGk+QaKYGwGI99lyB/4T7fIWoK7DYMkhun7y7st1uDC453j5UxB R7cFc8e6zm4VilTf6iEQ1eozwJILHaVrzWircITNnknewoLbnKb8YR6t22Hb5iin4UdQ 04L5yCaBVzCdAou8InRZJY/jOJbXXE8GxHjcaWjbVcQAz+IeRpJchCdMWZx/o8wVk1PN qt3w== X-Gm-Message-State: AOAM532RLpCTK0texpBc+0JhJry+FVh+V9WqUOfj/toPTSRX2k414tMI VRfYG3y1mIA+qReNDhUYYEDsGPilU8H7gA== X-Google-Smtp-Source: ABdhPJx0QDldgipL4zxkG7woCoVRxY1qbQLWR15sMhjtlQtLvxELfEzoGYrQL/+Ktow+kcJ+WuRUxg== X-Received: by 2002:a1c:6246:: with SMTP id w67mr178584wmb.42.1594649486743; Mon, 13 Jul 2020 07:11:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/25] target/nios2: in line the semantics of DISAS_UPDATE with other targets Date: Mon, 13 Jul 2020 15:10:57 +0100 Message-Id: <20200713141104.5139-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Wentong Wu In line the semantics of DISAS_UPDATE on nios2 target with other targets which is to explicitly write the PC back into the cpu state before doing a tcg_gen_exit_tb(). Signed-off-by: Wentong Wu Message-id: 20200710233433.19729-2-wentong.wu@intel.com Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- target/nios2/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 00b591cc298..c2a134f932d 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -865,6 +865,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlo= ck *tb, int max_insns) /* Indicate where the next block should start */ switch (dc->is_jmp) { case DISAS_NEXT: + case DISAS_UPDATE: /* Save the current PC back into the CPU register */ tcg_gen_movi_tl(cpu_R[R_PC], dc->pc); tcg_gen_exit_tb(NULL, 0); @@ -872,7 +873,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlo= ck *tb, int max_insns) =20 default: case DISAS_JUMP: - case DISAS_UPDATE: /* The jump will already have updated the PC register */ tcg_gen_exit_tb(NULL, 0); break; --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650210; cv=none; d=zohomail.com; s=zohoarc; b=MZ0npiFAn2Zz431MzokPQYP52/ANjknK+ZohZyFpZ7FKE00Zh+t36dxakqZvdF9M+PMC9Cm244QvVifU/fDOi8OEY7KUaJ5TsixwIINi5+jMB4I0bqnzVUtwVThW94fH9vLplqEt/bwueCB29ABNo0Gyp90r81wSOTIwgtGE8RE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650210; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7RhrIfAtLKSoFSnxW6rvMNP1lUxxCGQ7DmZjmW38djo=; b=JNonBsLs765Rhpqf58xfQfoIPcu9es28SaDhOHgHoiOp6jAgaI53lhoxfKnLvfY6imMCqpaeCHlrELv2k0ExR/QsmW9eehlliM5wsSDiOFRVwM6J1nvTXC/EARFh730+GWF/yLzzq5n58ZNQy/RtPZ4K+spHSA4CQzNK1fFsMKU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650210743380.30210545216687; Mon, 13 Jul 2020 07:23:30 -0700 (PDT) Received: from localhost ([::1]:44518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzMc-0001hs-Ay for importer@patchew.org; Mon, 13 Jul 2020 10:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB6-0005d3-Rb for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:32 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB3-0006fG-6Q for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:32 -0400 Received: by mail-wm1-x343.google.com with SMTP id f139so13315713wmf.5 for ; Mon, 13 Jul 2020 07:11:28 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7RhrIfAtLKSoFSnxW6rvMNP1lUxxCGQ7DmZjmW38djo=; b=VZgFqRnYD9pvepuDFTsWH7Jhh5Ci2x/CKRlhOwN7Suc80tWKhZY8EtmYj1mMs1L+TO V+jwSC34Opn9U443ml24ORyTcbFbrFGnxK8z1eSqgvn3f3ZthZQuVfjndTXnb+TQTwi4 DlbmNkqVfxdPzhDv1kh9FO4LXudh08aaEfRHG/9fYwlaH7i9WVNxIDuWa3HuzR6U/ipa BGlGbipVTLvojLPI76C0vxn3qc9O/CPAMo4nBZCn/oQ4uKiJzUPBg2MIiNUNni6e/yT5 agSEJG9O7DVecbh4eYyA74xibn3+Qv4i5o3kxmDo3edHsLMQlbRslzrIuNDQfzhE1cuL FRkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7RhrIfAtLKSoFSnxW6rvMNP1lUxxCGQ7DmZjmW38djo=; b=kAAaezzfCi2OOmBcAvHYfVNnCk1HH5B/+UY9rvcdQLZu5C+8MloRD0uvsrccuPHyDj kKzdc931bHl1XuDWdA8r9Ew3aNSpPN9IlCTxROyp2aTz/tXXNH8DMm38315VtbyQ7B1u 6O7sfYSYFzUWJz6I77ylZNzH+aRpDOdhG57Rm9/5FKiFBYJWXwrehNx89bOjPX0JJ4Sk tta5VsoBdySMH7lifENS8RO0H24vcu8hcLXC9XRR6C6y+6reF8tnBfT40TndXLKboBf5 ettMMjNEGo+xAb1hhI9HsjvCOzD2xxzA+rBOf4WJ2xlMzNYvH3C69orzoCZ3n9eXsEIx cIwA== X-Gm-Message-State: AOAM531JGyJKEisURodRuMO3n3seDLlZqiqvLp2PQGG4lP34dO9xOEvr QxVDvzfYJ16iCIkYma8w4ZSdm/ZXToZtQQ== X-Google-Smtp-Source: ABdhPJxaWwci1XS0FEYoWEEXM0MBsbY8Du7mcbApL9rlNhwlgIRHhF9p/zqacXLrquBQhqFBzvqzEw== X-Received: by 2002:a1c:9a81:: with SMTP id c123mr172245wme.46.1594649487712; Mon, 13 Jul 2020 07:11:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/25] target/nios2: Use gen_io_start around wrctl instruction Date: Mon, 13 Jul 2020 15:10:58 +0100 Message-Id: <20200713141104.5139-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Wentong Wu wrctl instruction on nios2 target will cause checking cpu interrupt but tcg_handle_interrupt() will call cpu_abort() if the CPU gets an interrupt while it's not in 'can do IO' state, so add gen_io_start around wrctl instruction. Also at the same time, end the onging TB with DISAS_UPDATE. Signed-off-by: Wentong Wu Message-id: 20200710233433.19729-3-wentong.wu@intel.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/nios2/translate.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index c2a134f932d..9824544eb37 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -32,6 +32,7 @@ #include "exec/cpu_ldst.h" #include "exec/translator.h" #include "qemu/qemu-print.h" +#include "exec/gen-icount.h" =20 /* is_jmp field values */ #define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */ @@ -518,7 +519,11 @@ static void wrctl(DisasContext *dc, uint32_t code, uin= t32_t flags) /* If interrupts were enabled using WRCTL, trigger them. */ #if !defined(CONFIG_USER_ONLY) if ((instr.imm5 + CR_BASE) =3D=3D CR_STATUS) { + if (tb_cflags(dc->tb) & CF_USE_ICOUNT) { + gen_io_start(); + } gen_helper_check_interrupts(dc->cpu_env); + dc->is_jmp =3D DISAS_UPDATE; } #endif } --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650238; cv=none; d=zohomail.com; s=zohoarc; b=H3Px7VkDnwX0shvPu6NqVUj003vSNwaA+bdB064QAFwQe9GshIpYP32JsuD37+v7FLG8v+DWFRI3+Gpxn2doBapgkotiHyJJEpwoPLLJqjrMrIn2+Lc+qwuHi5T3kF53aaUTUC94PsLqhLsknrY+2jMx9I+PDwQepNIP1z9HPGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650238; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Cdhqjn6DC+tyL4mM8vOGKC1yiyZ8aG8bFSKcjvY6BCA=; b=ULVxQsOcfaQlYbmKVdo+RrON/zNpPx3hAVCv816NCG3Y26RnoSWPs2qJrdcZfeK8gzK+3DDWNbY5dUUqEtDo0n+bG6T+HZMbHMefC+GtneQmTjnMTtidaeA38GBhuBA16WDcgWQEuacrMBKRvyYKHGEq3yzgYdWd5nz1W/29BZo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650238193102.55198963367673; Mon, 13 Jul 2020 07:23:58 -0700 (PDT) Received: from localhost ([::1]:46290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzN4-0002Q0-Qt for importer@patchew.org; Mon, 13 Jul 2020 10:23:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB7-0005fi-Qe for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:38397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB4-0006fX-JX for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id f18so13314615wml.3 for ; Mon, 13 Jul 2020 07:11:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cdhqjn6DC+tyL4mM8vOGKC1yiyZ8aG8bFSKcjvY6BCA=; b=ddd+bg16ye3YpIR55s7DTgTJ3Q/eYBt/i5KRdpawkacrwJioidzHPROl3wWTN5GWsK 15AsLXheXop8FlPL0R9ZpmzrNtqObyynutOGyVCjM7lNTGNz79fk/FS2q3mBykR1GmVH U50VU6GlJMlSjoWlahodHq17zm2890bxNRkAW581tAF49zwM8onoFRbNd1bZAkPH9KJJ ry9F6yopoE2mhrjxJl29/cZf6UTtNOGyXaTWTRZ+PNj27u+ebuPzhackdqRnK8tcr94N ZnJc8a0ZVwDpWnsQIPgYhXJiTV78NsSxL/E262xNYyxAOXtmafERPqq1SyzkQysTDueO NfOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cdhqjn6DC+tyL4mM8vOGKC1yiyZ8aG8bFSKcjvY6BCA=; b=VG8gM0JEzIdL6WkC1FbrM4/q+n9cbfha+G8N8r0dL/CnLueWlGeCGC1ev9QDiFNd+9 v0K7mavK9ZznWgvDecGjgS15d0WpfV17b2n71YinwyWg5Mzp668p/iSlnWLz6PnZveF9 vmrkIpxht0p+sRLI9U9HxQv3laJsluuyw+bbWbb5qve/DuXSOfRckFpDDvdw2dCWXuiQ 1BakOpj5XpZcbiCavOvwN6Xd/6zX1u/JIUjt5yX0Kz8j6bULdY3BaGnI8OlqzLJXsRJ/ 9AEIctl9YMDuXJRExmz2x9Q8d/iZNR0J9djQVrCLfAmRp4f+Xs0BZrbpIdA7eDKbwLLH 0WSQ== X-Gm-Message-State: AOAM532kA56+w8a7R2qyar61t420bIjseKBdNdkW2wZptP4WwkQ98Y0X C/QYbZQQ31wim8tG4hgbq9/zxbse3fiSvg== X-Google-Smtp-Source: ABdhPJzWLscBjqxNvWfXtsAUt0ViBqfZqUsKYBiKVV+nj4B1tjQTBXjgvG1qDdikUbD5tw8m5YfKWg== X-Received: by 2002:a1c:7313:: with SMTP id d19mr123377wmb.147.1594649488783; Mon, 13 Jul 2020 07:11:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/25] hw/nios2: exit to main CPU loop only when unmasking interrupts Date: Mon, 13 Jul 2020 15:10:59 +0100 Message-Id: <20200713141104.5139-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Wentong Wu Only when guest code is unmasking interrupts, terminate the excution of translated code and exit to the main CPU loop to handle previous pended interrupts because of the interrupts mask by guest code. Signed-off-by: Wentong Wu Message-id: 20200710233433.19729-4-wentong.wu@intel.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/nios2/cpu_pic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 1c1989d56a0..5ea7e52ab83 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -54,7 +54,8 @@ static void nios2_pic_cpu_handler(void *opaque, int irq, = int level) =20 void nios2_check_interrupts(CPUNios2State *env) { - if (env->irq_pending) { + if (env->irq_pending && + (env->regs[CR_STATUS] & CR_STATUS_PIE)) { env->irq_pending =3D 0; cpu_interrupt(env_cpu(env), CPU_INTERRUPT_HARD); } --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650316; cv=none; d=zohomail.com; s=zohoarc; b=a/Y9mkQVL5dwTq14swfRkMVTcLlOYHYPEipmhVCAHJ7rdzj30OzWbqEAAW8V97JolOUk+Vwoc6Zht6ioarhdQ4JW9eazgRkHjcVRMym/0VFEkUrTCPL0tmejJ6s077em/QYEkoEvvrpbRqWsyPnbcv53jhuXyleaO5gBqN6YoWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650316; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=dejZdr/slmQRLjoKB02TchiGAu/LHAAdIUT79UNUzg365/mRi0EPzTEG8/7LAaVELHAL/ZMMEl9Vzk5Otg7p60Us4yrStDynFbk+VMRVviBKSA7f1fVavLViC0+ZkYnhv63OSlxRj278P4bLGJnGUZAk5+CG+Zisx5b899wz118= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650316350178.2201360520496; Mon, 13 Jul 2020 07:25:16 -0700 (PDT) Received: from localhost ([::1]:53312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzON-0005Ez-4m for importer@patchew.org; Mon, 13 Jul 2020 10:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB8-0005go-B7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:35 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB6-0006fz-0A for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:33 -0400 Received: by mail-wr1-x436.google.com with SMTP id s10so16679988wrw.12 for ; Mon, 13 Jul 2020 07:11:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=IE5PYKuXZOr1R7s+7rSyLBd2P3VAMa9o5baN+6im0XleVU7i3ubuXi5hg6qEbeWPdq i7sLv4G6A+0n6jbLclS5/CmqQKoPmk+S83qgpEptxPyDzhsbNS7/klg2qA6WPQn445EV cwyyj0tZDpj/QgMbcJByvlng4yhKxCIeG44v/Z/OMTKru2mXHrJrpeq8eQnY5dh4w1qH LdWWx2SW9z6bLbYz3BNXhpwV2itOX/YNZ6zJTrOwW4T0NpeS1w3LGbtCWTjVdFXfWmXx PCb27GGLbQLYSPabfdjSk3YLCB+JSkdxURo8BrVQXqaNIbGfJlwquGIMqZeBfLlcN87F Tpzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=HKXzmrbpkdSPlNNLJbcBlDJzllGq4E3spG9sKphFq78RMakWL32c3Ts6cWWhWdxRkR qgiVZxzTit4Ga2m8gYUpgmf8tIOXP/TrE+hTEN522ohi/hwupgMRAIijwPNGfNG4vBE8 lMRj15UZf7/NGI2TX7P/GdzYsRm3lV34Xz6Vdl/Rh3peIthYn6PSQD3KwYo9lwXvtP8p iGqDhvaHxjTvroQH05JJJNotfzi1lJQB+bQ5HOEEUtt5LGM3T34eZgkBz9o3E/bmwPce vJdfhvcHmqCVVzW50AyKoP2JQVCJgGAs1ZQN1ERzB/L2HGL4t3dmJpBEGqQb/QfkAH// NPQQ== X-Gm-Message-State: AOAM530iO07RJM2XnZog6SSut60PvTTYSX0a4mck9g1wi46PABrduTPg 4R+pgR/RgOocZo9nFd1W7TU+NaM/JN6ggw== X-Google-Smtp-Source: ABdhPJylRo4GebJvIMwg3sffElYd7kgYtO41dHF2aZsknSHT/5VAGbAXQ2s/66gCitFoCXCIlXfBuA== X-Received: by 2002:a5d:6ac1:: with SMTP id u1mr78059848wrw.123.1594649489801; Mon, 13 Jul 2020 07:11:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/25] hw/arm/tosa.c: Detabify Date: Mon, 13 Jul 2020 15:11:00 +0100 Message-Id: <20200713141104.5139-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Remove the hardcoded tabs from hw/arm/tosa.c. There aren't many, but since they're all in constant #defines they're not going to go away with our usual "only when we touch a function" policy on reformatting. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200628203748.14250-2-peter.maydell@linaro.org --- hw/arm/tosa.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 5dee2d76c61..06ecf1e7824 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -26,32 +26,32 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" =20 -#define TOSA_RAM 0x04000000 -#define TOSA_ROM 0x00800000 +#define TOSA_RAM 0x04000000 +#define TOSA_ROM 0x00800000 =20 -#define TOSA_GPIO_USB_IN (5) -#define TOSA_GPIO_nSD_DETECT (9) -#define TOSA_GPIO_ON_RESET (19) -#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ -#define TOSA_GPIO_CF_CD (13) -#define TOSA_GPIO_TC6393XB_INT (15) -#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ +#define TOSA_GPIO_USB_IN (5) +#define TOSA_GPIO_nSD_DETECT (9) +#define TOSA_GPIO_ON_RESET (19) +#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ +#define TOSA_GPIO_CF_CD (13) +#define TOSA_GPIO_TC6393XB_INT (15) +#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ =20 -#define TOSA_SCOOP_GPIO_BASE 1 -#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) -#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) -#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) +#define TOSA_SCOOP_GPIO_BASE 1 +#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) +#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) +#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) =20 -#define TOSA_SCOOP_JC_GPIO_BASE 1 -#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) -#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) -#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) -#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) -#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) +#define TOSA_SCOOP_JC_GPIO_BASE 1 +#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) +#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) +#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) +#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) +#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) =20 -#define DAC_BASE 0x4e -#define DAC_CH1 0 -#define DAC_CH2 1 +#define DAC_BASE 0x4e +#define DAC_CH1 0 +#define DAC_CH2 1 =20 static void tosa_microdrive_attach(PXA2xxState *cpu) { --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650417; cv=none; d=zohomail.com; s=zohoarc; b=JPXpTTG3oM578g4VDuEeQmyb98GES/tN/JX5qJjUMpvRzBVxkVXo8R5Py6KSF4nAsv1WRpz/qrIHAdxB8QWLQ29iypMGfINtauNr5Q/QNQsvBH8sgd2yh7ziiVkukM/MsMcLvK5bEHRvbCSkAMo1DLY4uHRFyCJZQHcZN4B0DgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650417; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WnultCUDMK+c95bXDFQdZPFIzDBVtTwAZ+LdBT4HiI0=; b=lj6va1lqGlDT5RkptkvjX751dJ1EXRrCvImd6FW5S6oFrMcJ9zngmfqXQFbBg4N8vBHlrGmFW0/xO7yZn+nH1EqKVWFKlQeq9PSlppbvto96crM02pgRAcBdq3I/O7NN3to6Zj8auOYd4+9DR7GudeeVZDKfDRMfyVUjs10/IJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650417388965.4513274261749; Mon, 13 Jul 2020 07:26:57 -0700 (PDT) Received: from localhost ([::1]:59672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzQ0-0007u0-1N for importer@patchew.org; Mon, 13 Jul 2020 10:26:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB9-0005he-R0 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:35 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:37898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB6-0006gL-O9 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:35 -0400 Received: by mail-wr1-x432.google.com with SMTP id z13so16733163wrw.5 for ; Mon, 13 Jul 2020 07:11:32 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WnultCUDMK+c95bXDFQdZPFIzDBVtTwAZ+LdBT4HiI0=; b=Y1ySdcjcIHRNFPny8ZqDZ3VWjwBe8huiOcdMLi0cyYNJvJr1LwCa4dAKIXENPcGt+X Y9ovry5nw4epD1dDsjv+7HLvBKSkcx5KFlr5sXanx9uBNRF9SczfRPsL6dtuvYjX5/Kg +jow2elasu5InD8eJKsgJl5xiAzlTMHVlv//vEMObzIOV1mL5DgPMiGpqp8I/hj/MJ0P EAdMlioF+Xtihd8ZhofFxz+aISmY52QeafuO5vyFjUBju3amuTe5sHhkX1X2AKvFT1eM GKZQ7sGm+oXvFD6SzmcLu4C+W9pC1mPCFV57GxDTzuVPovlxpgiWJIIGNGCR1uctqwVW YtRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WnultCUDMK+c95bXDFQdZPFIzDBVtTwAZ+LdBT4HiI0=; b=BrWk5uL1kIuObfnVEP42HhxJlXvy1cBpcogyBg4W3Y4PaAt3KUCy262+T0F1wr7I5m CHqZC3O/qC2MbSTLywSUHh0SNxnIg/XqxUumd3ywPaDaTaWQxgFUnTaR5+s8zu+A+vZu dy5KJ0AnGGYS/SBh5/u9MhZRqYUXxya6U6sg7Lj2ZfC3WPkdAVyxVzhsK7+dmM0tm6xN FBXpWJWibt1qhxSqfZt1fslj3TiizF9aeSUIfxrQEH/VLlQFeflntmqOwpaDcauZbm8w qi4Zf79AL7XacRLYxfQK6bo63LkPezRDk3zsQv2NwLQyjuDR7D3N672/7miOiBbQnsWf CqSg== X-Gm-Message-State: AOAM532CNJE2ZHzxVJk+GdJ09fotHZeGSSYxR8PgdHjl5+kOncAR0vBA +zT28hqY/F9bDdLy7MWSa1OtV77RVKkJsQ== X-Google-Smtp-Source: ABdhPJzudGXLork20hTyvNHweIF1BOAkbUW7LqmXlpsGibu1AFrL2iZ/sVxBvBip0EihybOVHFxTyA== X-Received: by 2002:a5d:6912:: with SMTP id t18mr78696204wru.411.1594649490833; Mon, 13 Jul 2020 07:11:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/25] hw/arm/tosa: Encapsulate misc GPIO handling in a device Date: Mon, 13 Jul 2020 15:11:01 +0100 Message-Id: <20200713141104.5139-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Currently we have a free-floating set of IRQs and a function tosa_out_switch() which handle the GPIO lines on the tosa board which connect to LEDs, and another free-floating IRQ and tosa_reset() function to handle the GPIO line that resets the system. Encapsulate this behaviour in a simple QOM device. This commit fixes Coverity issue CID 1421929 (which pointed out that the 'outsignals' in tosa_gpio_setup() were leaked), because it removes the use of the qemu_allocate_irqs() API from this code entirely. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200628203748.14250-3-peter.maydell@linaro.org --- hw/arm/tosa.c | 88 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 24 deletions(-) diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 06ecf1e7824..383b3b22e24 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -65,24 +65,39 @@ static void tosa_microdrive_attach(PXA2xxState *cpu) pxa2xx_pcmcia_attach(cpu->pcmcia[0], md); } =20 -static void tosa_out_switch(void *opaque, int line, int level) +/* + * Encapsulation of some GPIO line behaviour for the Tosa board + * + * QEMU interface: + * + named GPIO inputs "leds[0..3]": assert to light LEDs + * + named GPIO input "reset": when asserted, resets the system + */ + +#define TYPE_TOSA_MISC_GPIO "tosa-misc-gpio" +#define TOSA_MISC_GPIO(obj) \ + OBJECT_CHECK(TosaMiscGPIOState, (obj), TYPE_TOSA_MISC_GPIO) + +typedef struct TosaMiscGPIOState { + SysBusDevice parent_obj; +} TosaMiscGPIOState; + +static void tosa_gpio_leds(void *opaque, int line, int level) { switch (line) { - case 0: - fprintf(stderr, "blue LED %s.\n", level ? "on" : "off"); - break; - case 1: - fprintf(stderr, "green LED %s.\n", level ? "on" : "off"); - break; - case 2: - fprintf(stderr, "amber LED %s.\n", level ? "on" : "off"); - break; - case 3: - fprintf(stderr, "wlan LED %s.\n", level ? "on" : "off"); - break; - default: - fprintf(stderr, "Uhandled out event: %d =3D %d\n", line, level= ); - break; + case 0: + fprintf(stderr, "blue LED %s.\n", level ? "on" : "off"); + break; + case 1: + fprintf(stderr, "green LED %s.\n", level ? "on" : "off"); + break; + case 2: + fprintf(stderr, "amber LED %s.\n", level ? "on" : "off"); + break; + case 3: + fprintf(stderr, "wlan LED %s.\n", level ? "on" : "off"); + break; + default: + g_assert_not_reached(); } } =20 @@ -93,13 +108,22 @@ static void tosa_reset(void *opaque, int line, int lev= el) } } =20 +static void tosa_misc_gpio_init(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + + qdev_init_gpio_in_named(dev, tosa_gpio_leds, "leds", 4); + qdev_init_gpio_in_named(dev, tosa_reset, "reset", 1); +} + static void tosa_gpio_setup(PXA2xxState *cpu, DeviceState *scp0, DeviceState *scp1, TC6393xbState *tmio) { - qemu_irq *outsignals =3D qemu_allocate_irqs(tosa_out_switch, cpu, 4); - qemu_irq reset; + DeviceState *misc_gpio; + + misc_gpio =3D sysbus_create_simple(TYPE_TOSA_MISC_GPIO, -1, NULL); =20 /* MMC/SD host */ pxa2xx_mmci_handlers(cpu->mmc, @@ -107,8 +131,8 @@ static void tosa_gpio_setup(PXA2xxState *cpu, qemu_irq_invert(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_= nSD_DETECT))); =20 /* Handle reset */ - reset =3D qemu_allocate_irq(tosa_reset, cpu, 0); - qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, reset); + qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, + qdev_get_gpio_in_named(misc_gpio, "reset", 0)); =20 /* PCMCIA signals: card's IRQ and Card-Detect */ pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[0], @@ -119,10 +143,14 @@ static void tosa_gpio_setup(PXA2xxState *cpu, qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_JC_CF_IRQ), NULL); =20 - qdev_connect_gpio_out(scp1, TOSA_GPIO_BT_LED, outsignals[0]); - qdev_connect_gpio_out(scp1, TOSA_GPIO_NOTE_LED, outsignals[1]); - qdev_connect_gpio_out(scp1, TOSA_GPIO_CHRG_ERR_LED, outsignals[2]); - qdev_connect_gpio_out(scp1, TOSA_GPIO_WLAN_LED, outsignals[3]); + qdev_connect_gpio_out(scp1, TOSA_GPIO_BT_LED, + qdev_get_gpio_in_named(misc_gpio, "leds", 0)); + qdev_connect_gpio_out(scp1, TOSA_GPIO_NOTE_LED, + qdev_get_gpio_in_named(misc_gpio, "leds", 1)); + qdev_connect_gpio_out(scp1, TOSA_GPIO_CHRG_ERR_LED, + qdev_get_gpio_in_named(misc_gpio, "leds", 2)); + qdev_connect_gpio_out(scp1, TOSA_GPIO_WLAN_LED, + qdev_get_gpio_in_named(misc_gpio, "leds", 3)); =20 qdev_connect_gpio_out(scp1, TOSA_GPIO_TC6393XB_L3V_ON, tc6393xb_l3v_ge= t(tmio)); =20 @@ -287,10 +315,22 @@ static const TypeInfo tosa_ssp_info =3D { .class_init =3D tosa_ssp_class_init, }; =20 +static const TypeInfo tosa_misc_gpio_info =3D { + .name =3D "tosa-misc-gpio", + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(TosaMiscGPIOState), + .instance_init =3D tosa_misc_gpio_init, + /* + * No class init required: device has no internal state so does not + * need to set up reset or vmstate, and has no realize method. + */ +}; + static void tosa_register_types(void) { type_register_static(&tosa_dac_info); type_register_static(&tosa_ssp_info); + type_register_static(&tosa_misc_gpio_info); } =20 type_init(tosa_register_types) --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650539; cv=none; d=zohomail.com; s=zohoarc; b=MSddLyg31M0cqFdnA3aufoGlox2mzzFm5uFf/P/N1fe13JcYGn23jiSnkQ/4q9WUx6+NTYXBHfXpRFNy1ulGJpozMBD5H8T8D1itEUbJ2Udp1q11p2nRgxcb54wTiFJ4M28Oo5w+LVLdOTPMvruw9lUiZWDkWMnEcBsdec/OS4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650539; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZsABSf3zCCbs9HoGH03ylmhl0Zn1zbJ1jZgoRtVVq6c=; b=JpzeRTGjJ7aiBhcLCHPo83BjOYgoB7/+UNKGw3uVa8uDvYrDMc8VyxanmYhkLJ33XJvzJznASw8zlab8BdbZ4Hi2XbLgt5Q5is4JNBaX4068Aq4mMaKa/n3LzDsBUJpP8y95V6bIXyV4PB3K5jKs8BI6rb74BWBYPacYMTMkRgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650539006265.9721170538014; Mon, 13 Jul 2020 07:28:59 -0700 (PDT) Received: from localhost ([::1]:38244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzRx-0002Dx-KZ for importer@patchew.org; Mon, 13 Jul 2020 10:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzBA-0005iI-7V for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:36 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:39747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB7-0006gV-LF for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:35 -0400 Received: by mail-wm1-x334.google.com with SMTP id w3so13308857wmi.4 for ; Mon, 13 Jul 2020 07:11:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZsABSf3zCCbs9HoGH03ylmhl0Zn1zbJ1jZgoRtVVq6c=; b=A4UHpJQWJpSb5nQvr/LHvEXmi4Zh161aeV+Q0xS4n+PEHCJIiJOZQRVTQEHRcM6ZoH PsdZG2TKZNEokz1+spTggjRRAbSx0RTqQfPFSpwvnEeRpSwHqWbTkhxwMQhKbX0LW2dl TkvQNxJEMTqEFIJc19HHRi8FCFayLEQIg/Fl9EfIMyvKJiIN4cMHdOXviv3mtiveuSwC 4ODkm0LKtOBhqZS07hVqGRWUL+1yCn2FFfSbMpX1bjS+Nz70rbVzEDXpX5kDDDtd6t74 WP1hh1/IaIuzaBLKleOKTt0/FAKLWcxTv1exXt+S4LIMs10ZZ3kK3syjsZJALwX+OkxN TI6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZsABSf3zCCbs9HoGH03ylmhl0Zn1zbJ1jZgoRtVVq6c=; b=nURyN7zXd8yD0ZFy9KHQdbH8kwGq/tQrFZ6dMd4WzghpXHFC4pTNYCMWiDWsYJC71V geQgV3gtOLIGhM59RYCHkLWMQ7FKZLfc3in87+6Db6bMVgZo6LjnebdO8N1KMelgUuP7 Iod8+hu2wMhb2hQBcKstj33LGrUC4ZbbeHdQvj435IcHsFLbw0R6770xD1rziKqWOmR8 IShq/vJDHTvSWZV7Lvhbv1mZTf7VcS8Y7XbyuAk3qTQfF09i7JxTkcQ1KT5eoS209rVR GjPkhMzYID/j9yEJXplNfHm6m120TO15sCoFQIiHOjMtCFzmZvH44+jdtad9bhL+b3py +EwA== X-Gm-Message-State: AOAM532MegM+AWquw5HujdhYGrJlln98R2M67qeoIpj0rSxCiq2x16jp jHg6+ZZyGQ6M0DltiUVFrvj2D6AnnKDcpg== X-Google-Smtp-Source: ABdhPJzsWfvRqjbB8X1IAiDuY+ZrUy8qB8k4QQkA9nsnjweohlnzsBg0+NrUFf+s/bS2hKCp7MyZgg== X-Received: by 2002:a7b:c09a:: with SMTP id r26mr155599wmh.176.1594649491952; Mon, 13 Jul 2020 07:11:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/25] hw/arm/palm.c: Detabify Date: Mon, 13 Jul 2020 15:11:02 +0100 Message-Id: <20200713141104.5139-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Remove hard-tabs from palm.c. Signed-off-by: Peter Maydell Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200628214230.2592-2-peter.maydell@linaro.org --- hw/arm/palm.c | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 97ca105d297..569836178f6 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -61,21 +61,21 @@ static const MemoryRegionOps static_ops =3D { /* Palm Tunsgten|E support */ =20 /* Shared GPIOs */ -#define PALMTE_USBDETECT_GPIO 0 -#define PALMTE_USB_OR_DC_GPIO 1 -#define PALMTE_TSC_GPIO 4 -#define PALMTE_PINTDAV_GPIO 6 -#define PALMTE_MMC_WP_GPIO 8 -#define PALMTE_MMC_POWER_GPIO 9 -#define PALMTE_HDQ_GPIO 11 -#define PALMTE_HEADPHONES_GPIO 14 -#define PALMTE_SPEAKER_GPIO 15 +#define PALMTE_USBDETECT_GPIO 0 +#define PALMTE_USB_OR_DC_GPIO 1 +#define PALMTE_TSC_GPIO 4 +#define PALMTE_PINTDAV_GPIO 6 +#define PALMTE_MMC_WP_GPIO 8 +#define PALMTE_MMC_POWER_GPIO 9 +#define PALMTE_HDQ_GPIO 11 +#define PALMTE_HEADPHONES_GPIO 14 +#define PALMTE_SPEAKER_GPIO 15 /* MPU private GPIOs */ -#define PALMTE_DC_GPIO 2 -#define PALMTE_MMC_SWITCH_GPIO 4 -#define PALMTE_MMC1_GPIO 6 -#define PALMTE_MMC2_GPIO 7 -#define PALMTE_MMC3_GPIO 11 +#define PALMTE_DC_GPIO 2 +#define PALMTE_MMC_SWITCH_GPIO 4 +#define PALMTE_MMC1_GPIO 6 +#define PALMTE_MMC2_GPIO 7 +#define PALMTE_MMC3_GPIO 11 =20 static MouseTransformInfo palmte_pointercal =3D { .x =3D 320, @@ -100,17 +100,17 @@ static struct { int column; } palmte_keymap[0x80] =3D { [0 ... 0x7f] =3D { -1, -1 }, - [0x3b] =3D { 0, 0 }, /* F1 -> Calendar */ - [0x3c] =3D { 1, 0 }, /* F2 -> Contacts */ - [0x3d] =3D { 2, 0 }, /* F3 -> Tasks List */ - [0x3e] =3D { 3, 0 }, /* F4 -> Note Pad */ - [0x01] =3D { 4, 0 }, /* Esc -> Power */ - [0x4b] =3D { 0, 1 }, /* Left */ - [0x50] =3D { 1, 1 }, /* Down */ - [0x48] =3D { 2, 1 }, /* Up */ - [0x4d] =3D { 3, 1 }, /* Right */ - [0x4c] =3D { 4, 1 }, /* Centre */ - [0x39] =3D { 4, 1 }, /* Spc -> Centre */ + [0x3b] =3D { 0, 0 }, /* F1 -> Calendar */ + [0x3c] =3D { 1, 0 }, /* F2 -> Contacts */ + [0x3d] =3D { 2, 0 }, /* F3 -> Tasks List */ + [0x3e] =3D { 3, 0 }, /* F4 -> Note Pad */ + [0x01] =3D { 4, 0 }, /* Esc -> Power */ + [0x4b] =3D { 0, 1 }, /* Left */ + [0x50] =3D { 1, 1 }, /* Down */ + [0x48] =3D { 2, 1 }, /* Up */ + [0x4d] =3D { 3, 1 }, /* Right */ + [0x4c] =3D { 4, 1 }, /* Centre */ + [0x39] =3D { 4, 1 }, /* Spc -> Centre */ }; =20 static void palmte_button_event(void *opaque, int keycode) @@ -161,13 +161,13 @@ static void palmte_gpio_setup(struct omap_mpu_state_s= *cpu) [PALMTE_MMC_SWITCH_GPIO])); =20 misc_gpio =3D qemu_allocate_irqs(palmte_onoff_gpios, cpu, 7); - qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[0]); - qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[1]); - qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[2]); - qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[3]); - qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[4]); - omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[5]); - omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[6]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[= 0]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[= 1]); + qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[= 2]); + qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[= 3]); + qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[= 4]); + omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[= 5]); + omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[= 6]); =20 /* Reset some inputs to initial state. */ qemu_irq_lower(qdev_get_gpio_in(cpu->gpio, PALMTE_USBDETECT_GPIO)); --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594649876; cv=none; d=zohomail.com; s=zohoarc; b=Bc1ZcONPYdz8eoFYaraHckL9bmFEnMFJOGYDlAQtSF/X2FV6/Ajbg3aBR4v0ygAjA1BX7xLbiI2wTu/0XSWQj/ze0fq7a2hNCncJNPKBJqLSKqfsigBAsY/qQZtZba2HerJZj1W+s6XYSpREkZ1EORJdb3H9ToJJwuuwYuNQg+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649876; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MHD7c88AS73IuJuFfkFyKX8KupwIl5bGxCUU0rAKXto=; b=WfJUfzpTxydQYksMRX6MfYP1Wjh9V19MI/RbOv5QgEV+CoToMzhXqED0Bfsz0DiJ1ihaj2gak2A/nwuKJRjZrIXcJAItms1rrYdPGq9mVJCo48xc2vuLwGjXQcQW5Hmdd15W9ynyyfJPf9nqJ8kQxA8QK+IJ02k1Qlwcg4/reAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159464987685329.664416113574475; Mon, 13 Jul 2020 07:17:56 -0700 (PDT) Received: from localhost ([::1]:47178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzHH-0008Bn-E2 for importer@patchew.org; Mon, 13 Jul 2020 10:17:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzBB-0005jF-MD for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:38 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:33081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB8-0006gr-I9 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:37 -0400 Received: by mail-wm1-x341.google.com with SMTP id a6so111533wmm.0 for ; Mon, 13 Jul 2020 07:11:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MHD7c88AS73IuJuFfkFyKX8KupwIl5bGxCUU0rAKXto=; b=sLUUjYtIOlNpoLaIRb6P8zx9S5We4EbkWWunsl/AIIcroJxu86F8sp77NgNewtn8Ut DcfqX+/GuxmzJpQNzglh//w/AdtW9gXNDlkGu4pC9S1OHdSfRAbWv4krH0uSww4xE6NB JpbP8lzZmEb0UhWKy/1k8t4uFvFRZqGSso4U1Cw7quMe1a1OGVm7YME3nl3R/4ZAMJ/h wiZABDJcW5w+L9Wtyyf8Qrl2gyzGoaf2D6tpBwbcJ1/bhMjOVrPKfIaRWpJr5RFmOMf6 n32OeF6CIvGhuWP7mykrK5CkPrMcVKCUluT/6oAqU5dwSOqzTREZJDgozYyX9OKHIfI1 /Ppg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MHD7c88AS73IuJuFfkFyKX8KupwIl5bGxCUU0rAKXto=; b=SZmmraBVGKqeVWMPYNqAkGoiA4vTjFLEA2/HqHbCQxwzhyxyuEJl/D0nlHGl36DeBi 4pbXGHJiSOMQII0SKrNiW/CcKhYJxF+eYtn67bdAaxPGKIMCuslIqvzy2RWqoURaDxci UXBB4ZF2qLWnQya0RTwQnw9jKzPxQ54WueAtrIqloEUWoQhEoA6eYoezpCRD3FfISL6X 5FdM+RJFeDs/cfxtduB8LqXjUaJlX7hoOe4vGJ/8JzePsEowZ6FjxhUKSCsb3+E7fOxY KHl9KflKFGJiXkQ4xk8UCSgHlao060A4DmFyVwNAHDIj3l867iCdnXmgKEZBPw5cFhby MT4w== X-Gm-Message-State: AOAM533CvhmOEj4VEVRWtqtmjTed360nIpL/FtatfbIc4uvbc+RGhYGD nARc8VLZvSO836fE6Zrpn1AHBorfKdUg2g== X-Google-Smtp-Source: ABdhPJz0ulzWaddPZjAzpsR5Fl+fTgFtErTrGFby9FpHRnXjoaXOEw6i/ZzWAU5UZ2eLE69eQiUTnA== X-Received: by 2002:a1c:7d55:: with SMTP id y82mr174023wmc.72.1594649493014; Mon, 13 Jul 2020 07:11:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/25] hw/arm/palm.c: Encapsulate misc GPIO handling in a device Date: Mon, 13 Jul 2020 15:11:03 +0100 Message-Id: <20200713141104.5139-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Replace the free-floating set of IRQs and palmte_onoff_gpios() function with a simple QOM device that encapsulates this behaviour. This fixes Coverity issue CID 1421944, which points out that the memory returned by qemu_allocate_irqs() is leaked. Signed-off-by: Peter Maydell Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200628214230.2592-3-peter.maydell@linaro.org --- hw/arm/palm.c | 61 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 569836178f6..e7bc9ea4c6a 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -124,6 +124,21 @@ static void palmte_button_event(void *opaque, int keyc= ode) !(keycode & 0x80)); } =20 +/* + * Encapsulation of some GPIO line behaviour for the Palm board + * + * QEMU interface: + * + unnamed GPIO inputs 0..6: for the various miscellaneous input lines + */ + +#define TYPE_PALM_MISC_GPIO "palm-misc-gpio" +#define PALM_MISC_GPIO(obj) \ + OBJECT_CHECK(PalmMiscGPIOState, (obj), TYPE_PALM_MISC_GPIO) + +typedef struct PalmMiscGPIOState { + SysBusDevice parent_obj; +} PalmMiscGPIOState; + static void palmte_onoff_gpios(void *opaque, int line, int level) { switch (line) { @@ -151,23 +166,44 @@ static void palmte_onoff_gpios(void *opaque, int line= , int level) } } =20 +static void palm_misc_gpio_init(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + + qdev_init_gpio_in(dev, palmte_onoff_gpios, 7); +} + +static const TypeInfo palm_misc_gpio_info =3D { + .name =3D TYPE_PALM_MISC_GPIO, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(PalmMiscGPIOState), + .instance_init =3D palm_misc_gpio_init, + /* + * No class init required: device has no internal state so does not + * need to set up reset or vmstate, and has no realize method. + */ +}; + static void palmte_gpio_setup(struct omap_mpu_state_s *cpu) { - qemu_irq *misc_gpio; + DeviceState *misc_gpio; + + misc_gpio =3D sysbus_create_simple(TYPE_PALM_MISC_GPIO, -1, NULL); =20 omap_mmc_handlers(cpu->mmc, qdev_get_gpio_in(cpu->gpio, PALMTE_MMC_WP_GPIO), qemu_irq_invert(omap_mpuio_in_get(cpu->mpuio) [PALMTE_MMC_SWITCH_GPIO])); =20 - misc_gpio =3D qemu_allocate_irqs(palmte_onoff_gpios, cpu, 7); - qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[= 0]); - qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[= 1]); - qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[= 2]); - qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[= 3]); - qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[= 4]); - omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[= 5]); - omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[= 6]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, + qdev_get_gpio_in(misc_gpio, 0)); + qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, + qdev_get_gpio_in(misc_gpio, 1)); + qdev_connect_gpio_out(cpu->gpio, 11, qdev_get_gpio_in(misc_gpio, 2)); + qdev_connect_gpio_out(cpu->gpio, 12, qdev_get_gpio_in(misc_gpio, 3)); + qdev_connect_gpio_out(cpu->gpio, 13, qdev_get_gpio_in(misc_gpio, 4)); + omap_mpuio_out_set(cpu->mpuio, 1, qdev_get_gpio_in(misc_gpio, 5)); + omap_mpuio_out_set(cpu->mpuio, 3, qdev_get_gpio_in(misc_gpio, 6)); =20 /* Reset some inputs to initial state. */ qemu_irq_lower(qdev_get_gpio_in(cpu->gpio, PALMTE_USBDETECT_GPIO)); @@ -276,3 +312,10 @@ static void palmte_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE("cheetah", palmte_machine_init) + +static void palm_register_types(void) +{ + type_register_static(&palm_misc_gpio_info); +} + +type_init(palm_register_types) --=20 2.20.1 From nobody Sat May 18 08:47:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650494; cv=none; d=zohomail.com; s=zohoarc; b=RIJmYs7d5oSXQXU+QnNpq/cPggUyxOd69rl05x6ea+zKurGBQ1yXfw3rM/KID7i4NNTEzKMbBa8wZGCHp9Jo/CyQBlbFX7yVr8XePYLC0OPGNrQof2Mbqceo/q+wdSJ6QDD2iyi5I7EXDIMSCA/9YbEi7FUcuW94sK5JvrqEGbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650494; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=cidQ2IdqNBoXzOlFn4iyHm32M8fvPW6ToYBmycgWA6CDtmV6jplmsw+8qwf0TT4lBB8QaH3U+iZtQ1U++YwfFxdDc5yPrl1j1xPccuFjMVXQ2Nq0tuONxqx8KwnPRaaqQLKFOLc88kJG3MPOykekZkyrSE8LF2nYfA3cpsab7ow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650494535747.5288550244126; Mon, 13 Jul 2020 07:28:14 -0700 (PDT) Received: from localhost ([::1]:36020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzRF-0001L8-B0 for importer@patchew.org; Mon, 13 Jul 2020 10:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzBD-0005kO-F2 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:39 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB9-0006hB-Ia for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:39 -0400 Received: by mail-wr1-x442.google.com with SMTP id z15so16715214wrl.8 for ; Mon, 13 Jul 2020 07:11:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=ab1N51qT6aWxcN+Ljw+HD5GaAfNJhRblBK3SF8vj8rNlyrfQhw357v4NmjpBSlor23 sWs5dIzM+jNXa7ZVw0YRZXYNRw6eEQebi5AvnCLUUIwjX2vWQTsI/m9RUmS3MFd3uRIs mUvGKaBRBJObN4oHEGeEhRMP0ZEFrz9PwHTPbu9zoOvfwx1LhrOv2JWxwPwECCFNN9CD 1Y4d3Yk57cF9fgqBkJdos31VYIajBgwFZgGD/khdp9sq5gD73yWvi3T4R/sMVBtAWWFr +MfUYYnAcLWCLRcqQcz4tEBeTwfpkdN3ZpzPMyyjEuWs7tYmNa+xP2agDqFcvQ3gDP7D /cWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=ZY62jPsY467LE/qhT/fc4P4UmDs1tet1CKUM1/c9dF/hPuEhRLK0z894bZ0vbdq/vq V/JdIblUIXFjoNOHwU+y9TyykWksOLK3ON1JhXGLT26RNMmoZaD6DfJlPO9yonGn4STQ Pjy9/eGYGHl0YjazCF0Za0x8nDOMxOiS/KmDhUUGL0i44vMeD5HZ9s1I7qnRbJE0VR94 Bzm8Tc158+FOenMY9uUpVA12tdjfZV7LQ+XtkcLffQTzH+/uZioxKO84NJ7NdXwExoFS 25ldUB2yFxjCyl8fn9i6exSQxE/MkeYVrH93eLKXs9VPxCCRrWwzGbuA/5XYPwGlo4Js XXvw== X-Gm-Message-State: AOAM532WLhIxKdqx5nEF61aLMCm9tn8JPeoCLe2j+FRcXkNpHShErpWQ a37UwatahxzaldGz8BBE05PP3k7HjIdirg== X-Google-Smtp-Source: ABdhPJw+0VHI65LvFGwTJnJo/snoGigZRm07x44aEMZiYpinRl2HuQbrurWhVRwOdttDWVT2mE1XPg== X-Received: by 2002:adf:ff8d:: with SMTP id j13mr77733455wrr.11.1594649493921; Mon, 13 Jul 2020 07:11:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/25] hw/arm/aspeed: Do not create and attach empty SD cards by default Date: Mon, 13 Jul 2020 15:11:04 +0100 Message-Id: <20200713141104.5139-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 Since added in commit 2bea128c3d, each SDHCI is wired with a SD card, using empty card when no block drive provided. This is not the desired behavior. The SDHCI exposes a SD bus to plug cards on, if no card available, it is fine to have an unplugged bus. Avoid creating unnecessary SD card device when no block drive provided. Fixes: 2bea128c3d ("hw/sd/aspeed_sdhci: New device") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200705173402.15620-1-f4bug@amsat.org Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Peter Maydell --- hw/arm/aspeed.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 660dcb54144..6a3a345a6f6 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -246,11 +246,12 @@ static void sdhci_attach_drive(SDHCIState *sdhci, Dri= veInfo *dinfo) { DeviceState *card; =20 - card =3D qdev_new(TYPE_SD_CARD); - if (dinfo) { - qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(din= fo), - &error_fatal); + if (!dinfo) { + return; } + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sdhci), "sd-bus"), &error_fatal); --=20 2.20.1