From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276286; cv=none; d=zohomail.com; s=zohoarc; b=NJ6ZNxDd4mJoS5+QJ0paJhYmAKAfBe1hH50fv5Z2/n1Ri7dA6mxO1Ju4lRghyvNEyGEsmtP/CIlFvLm6iwffKAQL1+pDsbZ/+Gbd9c2tBRxM7je7DRu0bSHLyDtxLBBC4PSHpahuC68HXSyP14Sf0DGt0+Qk5nivMpkqcHOem64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276286; h=Content-Transfer-Encoding:Cc: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=1IcJHZyWpO/pWzAWPdVNwmrH82JES7JifZR+yxZDkO4=; b=kWxvYNNJWqGSAUBYJTwuKMvwLYNyt7SFF80A3feV5meo1TkMNHmtSN5uItL+hffOcn/XeVQN+i9fmbdwpth9CtURpKA5o6MQ+qm3PU+vwrLeZhbxwpud2EEfaI9mlSlnqk4AcdjTZetrKDwmAft8pFI/woM3ItYPLgPZldvtz/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276286283149.47837833325195; Thu, 1 Apr 2021 04:24:46 -0700 (PDT) Received: from localhost ([::1]:35294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvRM-0002Q0-S2 for importer@patchew.org; Thu, 01 Apr 2021 07:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPE-0000jU-3q for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:32 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:45795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvP8-0006f7-Pi for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:28 -0400 Received: by mail-ej1-x62f.google.com with SMTP id kt15so2290969ejb.12 for ; Thu, 01 Apr 2021 04:22:26 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1IcJHZyWpO/pWzAWPdVNwmrH82JES7JifZR+yxZDkO4=; b=Mx7pugEdrtG+Vwkxd754jIWT9HUuoeR/Beh4jwjzcPuIRtBLyaf2Rfzin9vD8HgBeB pOE3dYjj5bs3Tw5ICyyKu1kGmmUcnucdGfTIzP15BAaEQc/i3ML09HeZHOq8dbkBxmbd VT7rDENcD0YJrfxIp3v60en4fozV++Lr1wlkBaZ6HWKqEpD6gaMwlb8SXgTIWV9siGwa rtoU6NlkbPsAXLfbzmaZwlj/X+sfHoslwRn+pNkO1kFZaEkT+6f116Vdg0aI5zq3OxJE s5toSj7wThsjQUX2bAhUim2/RYO2fowQY+4qhy5Q9wcUQhTT07Ld2zqRLAHqtubrJsc3 tFjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1IcJHZyWpO/pWzAWPdVNwmrH82JES7JifZR+yxZDkO4=; b=d9OW0dPQwJTE9z/nC6XsSWv7XWHZaVCvhXKpilimznnlTKn4VzYjGZdivSbXShHF7p QqapDZDDWa/cACKpzg9hMM+l115IH+ol+dTsSbND9ohtBrCg/WWn8WdUBiLdNHIxk2iI AGAyHT0Z9p9TzKpl5a89ksq9mAvxaaDPgpKCW/P4WNOQx7TLS5LEj+gsZzOrjGh/k7vV hHbLSLPglTRBurtr1Qk1l0uunnHGQgzljgQ9Nszlsjd/Veg5xNfDS1674afa3oVkfmHe vOFi6EWXGAt7UDYsYjXQXlGhfey/mW1qBTxx0/iPcipJlX/DtO3qOUxd6sWyGaami5ZW P/ng== X-Gm-Message-State: AOAM531CvBLHaawaw5WBUfqDsYph6Q64rlbuZrfOO9b0HlrOGYpP8pIH hPQvLh1gT17/gHE+YYWkaqArTAHCQFU= X-Google-Smtp-Source: ABdhPJx86jexRrzV6LPGagGURyZ6V+ipLYVAc4qR5Psnck/LP1cS+UmTADfxQA/H/4942Vg8aUFoVg== X-Received: by 2002:a17:906:4705:: with SMTP id y5mr8645653ejq.119.1617276145690; Thu, 01 Apr 2021 04:22:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/12] meson: Propagate gnutls dependency to migration Date: Thu, 1 Apr 2021 13:22:12 +0200 Message-Id: <20210401112223.55711-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::62f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Jessica Clarke , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jessica Clarke Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this for softmmu configs, which pull in migration's use of gnutls. This fixes the following compilation failure on Arm-based Macs: In file included from migration/multifd.c:23: In file included from migration/tls.h:25: In file included from include/io/channel-tls.h:26: In file included from include/crypto/tlssession.h:24: include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not = found #include ^~~~~~~~~~~~~~~~~ 1 error generated. (as well as for channel.c and tls.c) Signed-off-by: Jessica Clarke Reviewed-by: Juan Quintela Message-Id: <20210320171221.37437-1-jrtc27@jrtc27.com> Signed-off-by: Paolo Bonzini --- migration/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/meson.build b/migration/meson.build index 9645f44005..6fa2f8745d 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -24,7 +24,7 @@ softmmu_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', -)) +), gnutls) =20 softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.= c')) --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276475; cv=none; d=zohomail.com; s=zohoarc; b=M5DTsPy9UiCJpMp8GdiDrn2h/EBhaCesGam3GCo/+RCp/3LYMuImi4KrwOZLk4qwH6FqcG3wo2uM79ZBg6OSl0aTtLJt/2t5Oq+k5gsGHUCjVofNiNdQ+uMxhonB/LSA1Ivfvil7lx4s/WJmflBzKGVKY+yMI7oCUZwHJs3NOl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276475; h=Content-Transfer-Encoding:Cc: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=1O3FqB1/geIh7FAecaHTgKTUCfAPRJruQ8qG1ucIwNA=; b=cZ1TpPBvfh+vEL5ssIQtzacZ9aEJxdUNLnUwJmPFKRcubgk6YOPcvvTFKr7iBY91lL2Dcbl79VXkkD4qlfMs2BwA5PItXd6MdoQ7fDEWA2SVvA6n7XbfKeeahF7+oQlBVQ6sIorELim5QOOwYJ8w6ymWQXxHW4eHUKRoEqeGdmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276474807842.7248648519676; Thu, 1 Apr 2021 04:27:54 -0700 (PDT) Received: from localhost ([::1]:43920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvUP-00069s-O8 for importer@patchew.org; Thu, 01 Apr 2021 07:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPE-0000jT-3k for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:32 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:43533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvP9-0006fH-Kl for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:29 -0400 Received: by mail-ej1-x634.google.com with SMTP id l4so2294829ejc.10 for ; Thu, 01 Apr 2021 04:22:27 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1O3FqB1/geIh7FAecaHTgKTUCfAPRJruQ8qG1ucIwNA=; b=Z0DCGfKqqJZp9O3qOHSAGFbGIVkPfDnmm5vRDleiyD9aIdP8p1fRLhPk3B75JM2nyx bewZUaAHriB291ik8daE4y2seEC/n7rLX8p4isRYUiyD6GHCBk7KcET7/h1gg/pLfemJ rDqXpGyNd4TXawxm4/aBu2ZXkTvdaSeJpqKPHJ4VLlci64l9IldrKHfB8DlU5sL2GVby jnAHlVxAykaAqJwdgtQQg58EkWxsuNv5+9HTRDEQSOc4CjmxGAltjuhmIk+t/riiz6qU xKS7VzxM1NkGPrHpFEE0Xu9CZ8C4GgLaD839t18xUs0VAVu68aCcEG4jqgB3xfJZpX2q oyHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1O3FqB1/geIh7FAecaHTgKTUCfAPRJruQ8qG1ucIwNA=; b=Lumt3veGI/C/Y6NDKMIqESCB7l0zykBryRpbunLwq0ImoRPRXxnaBFCfLcfPg6f/fZ 2BQ9UN3GnjEDM2SM2m/yHGDN4jVw/il7Kbksdih6JAdsVam/CkoLfytQjHXydeqvecYC //hw56WP/H6nXZ5cGW3YbG5km1sBysSsRkHk9nnNTzMrxtaiBop8cFt49We6RG2Raalw mNeKrK8L3eFwc9TTA31Yqqw0+pUdtmE/0daUuBZ/MIw1XuSdSHB3B+oEsB/2U236Idt4 d3Rna2t/EqZ1nTf/DbprUhRVgM2JiliN/Sll2bY/3JrM/vHPLSgueudMSXCY87Tue6YP zlYw== X-Gm-Message-State: AOAM531oRvVWmkevjELI0jikSyDy1tJGLzTd9bSOQTfG1xQiGH0iG7O0 TOLq44VW7X1+n17fsrmlxvngLAyJHic= X-Google-Smtp-Source: ABdhPJza+gza+jAEVkfjUYcfchTleOgfUmVjlkGYpA+NH2VJOzffjPQuTORj0DNqq9NS9yeE0jyr/g== X-Received: by 2002:a17:906:b316:: with SMTP id n22mr8348280ejz.249.1617276146339; Thu, 01 Apr 2021 04:22:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/12] target/i386: Verify memory operand for lcall and ljmp Date: Thu, 1 Apr 2021 13:22:13 +0200 Message-Id: <20210401112223.55711-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::634; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Richard Henderson These two opcodes only allow a memory operand. Lacking the check for a register operand, we used the A0 temp without initialization, which led to a tcg abort. Buglink: https://bugs.launchpad.net/qemu/+bug/1921138 Signed-off-by: Richard Henderson Message-Id: <20210324164650.128608-1-richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini --- target/i386/tcg/translate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index af1faf9342..880bc45561 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -5061,6 +5061,9 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_jr(s, s->T0); break; case 3: /* lcall Ev */ + if (mod =3D=3D 3) { + goto illegal_op; + } gen_op_ld_v(s, ot, s->T1, s->A0); gen_add_A0_im(s, 1 << ot); gen_op_ld_v(s, MO_16, s->T0, s->A0); @@ -5088,6 +5091,9 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_jr(s, s->T0); break; case 5: /* ljmp Ev */ + if (mod =3D=3D 3) { + goto illegal_op; + } gen_op_ld_v(s, ot, s->T1, s->A0); gen_add_A0_im(s, 1 << ot); gen_op_ld_v(s, MO_16, s->T0, s->A0); --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276721; cv=none; d=zohomail.com; s=zohoarc; b=HyGd+KFqc1E4XqSVc28s/Dtshnrhy/4/XoTKPP3oNz8vqyc60GqEA0HETchTqJ4LbDf90aQ2YIvtUxzKFCx586t8bTG+1bNXwF1NEpScPJVSmu5pStmYdUH/J86W1/Vv+T5E5IVKjIq/5w7HIffZ1pp6Fn0wl3NYyyP3t44uW6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276721; h=Content-Transfer-Encoding:Cc: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=JQoDQ8iT0Uvjd7qMNAdOTTXuMpF8k0rgM3v4MUOSB5I=; b=BlpWnIPXLGLQSTudmGatn2boLMuwZuLBYf5makrpjFiOVlKrqMbMupq3ThEmIWezxh3E9PyTqaQSATgP7SRJ5Jvu6NDJ1LjGZ1+t4P/zK+LdEQkx8DmgPhlYiMFUq1LiJkEvPvpERmzYuaIFZl73pllKnwip8qJccbAa8bCcxio= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276721875194.28785623111594; Thu, 1 Apr 2021 04:32:01 -0700 (PDT) Received: from localhost ([::1]:55206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvYO-0002WI-Qe for importer@patchew.org; Thu, 01 Apr 2021 07:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPG-0000mH-FJ for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:40745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006fx-S4 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:34 -0400 Received: by mail-ej1-x636.google.com with SMTP id u9so2321003ejj.7 for ; Thu, 01 Apr 2021 04:22:28 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JQoDQ8iT0Uvjd7qMNAdOTTXuMpF8k0rgM3v4MUOSB5I=; b=bWJaiR2z1vcDu3Gwq14Wj9OuhrH83Nki2rH/VvfeluaFHEQfIV0rUAM+/8HuGj8gk3 WGQnlAyIm8kCdpGgmNWGljIUpXvP0XfecFa7+L20IPupFHwPE8xwpBoNvRoiJlMHBcI9 3horxNJVdix5+2NV7iobaufTAa4WKULMu5g4bwg+ejeBfH8Nk3j5VkWG6gyD0qYgIUuT xsfaB/8HoODaQt595lh9Ttfp1uHQHLEObs5i77rCxwEkUz2/hUx2EROiz934S4FtfngO PkXPPCQewteo93f9sij9EaCMM/nBVEKo5npvDoJ0a57DS6aH9QT4Rr+7y94qGAbk7+79 G6Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JQoDQ8iT0Uvjd7qMNAdOTTXuMpF8k0rgM3v4MUOSB5I=; b=XotXlSwTMTDnDiovxqz+wgDrwd7lLR3apeL1DuW8leol6rwvUfhuPw9cUVx+ZpcDal RNiSmRKXewBNfUJ7TniKwrxvZX5QGDCULQ9RMMazxUhJjU/gfuVAP6bxa9pmXAl9u84g dar7Y650Rh9oQO/MQUpY+0knXLU1Jcfx+JA9AjvEIu5I/inpBDyto23RkNeDsXlePEGU gbn9YQl0OL2kAoQJkfJc/tpdJ9T1yIWjNWd3thMNhWCdqg9N0vcRSjtUX/94gva8+yRv vM77zwI654BdVosloJsvMAhJhgjmsWWehSOt7dO3+uWOLsGeKYg5imfN88Y+kKzHiRrW gXjw== X-Gm-Message-State: AOAM532oxqYnoAVJuUd8LIuHn2NskvcZaNt+/HQK7YZD2kaMHx7WAWT+ 1PdqaNtqJCed/0t0idim7QvEchHlrDw= X-Google-Smtp-Source: ABdhPJyEQFbZVyBDw2zslTNvwAwZ1Ox1n7FgxCTtYD3qhiZ7umYsZLe9ea1Qvo/OCOMfOF3yWT5Q0g== X-Received: by 2002:a17:906:f247:: with SMTP id gy7mr8759685ejb.183.1617276146962; Thu, 01 Apr 2021 04:22:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/12] qapi: qom: do not use target-specific conditionals Date: Thu, 1 Apr 2021 13:22:14 +0200 Message-Id: <20210401112223.55711-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Tom Lendacky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" ObjectType and ObjectOptions are defined in a target-independent file, therefore they do not have access to target-specific configuration symbols such as CONFIG_PSERIES or CONFIG_SEV. For this reason, pef-guest and sev-guest are currently omitted when compiling the generated QAPI files. In addition, this causes ObjectType to have different definitions depending on the file that is including qapi-types-qom.h (currently this is not causing any issues, but it is wrong). Define the two enum entries and the SevGuestProperties type unconditionally to avoid the issue. We do not expect to have many target-dependent user-creatable classes, so it is not particularly problematic. Reported-by: Tom Lendacky Signed-off-by: Paolo Bonzini --- qapi/qom.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qapi/qom.json b/qapi/qom.json index 2056edc072..db5ac419b1 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -733,8 +733,7 @@ '*policy': 'uint32', '*handle': 'uint32', '*cbitpos': 'uint32', - 'reduced-phys-bits': 'uint32' }, - 'if': 'defined(CONFIG_SEV)' } + 'reduced-phys-bits': 'uint32' } } =20 ## # @ObjectType: @@ -768,14 +767,14 @@ { 'name': 'memory-backend-memfd', 'if': 'defined(CONFIG_LINUX)' }, 'memory-backend-ram', - {'name': 'pef-guest', 'if': 'defined(CONFIG_PSERIES)' }, + 'pef-guest', 'pr-manager-helper', 'rng-builtin', 'rng-egd', 'rng-random', 'secret', 'secret_keyring', - {'name': 'sev-guest', 'if': 'defined(CONFIG_SEV)' }, + 'sev-guest', 's390-pv-guest', 'throttle-group', 'tls-creds-anon', @@ -831,8 +830,7 @@ 'rng-random': 'RngRandomProperties', 'secret': 'SecretProperties', 'secret_keyring': 'SecretKeyringProperties', - 'sev-guest': { 'type': 'SevGuestProperties', - 'if': 'defined(CONFIG_SEV)' }, + 'sev-guest': 'SevGuestProperties', 'throttle-group': 'ThrottleGroupProperties', 'tls-creds-anon': 'TlsCredsAnonProperties', 'tls-creds-psk': 'TlsCredsPskProperties', --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276291; cv=none; d=zohomail.com; s=zohoarc; b=VqE1NA9V3Oc6JGY3Cc2DExu/u0phOyGguOQQ+GxgK61Ld8h3mlUHG9gvhes/XpuMyMPFLJz4V22aHbCcRJqHGLyjZ+b+UnEpNVXRUZoo62G3uLW63jU5afvXTesms4v3ChrrCeRcrcJB9kgBIy0ChXe1uEK1/XvYRHUe/4GnbmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276291; h=Content-Transfer-Encoding:Cc: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=BQ2k06TKvkRak3oJkOP50HBxN0KuGNiuSPZNaP9RB5o=; b=BNTOifCJKoEWBqPm+9Iw2YXbohQh0poRauOjebL4O+g36tz2hXkIBvvy5yTYKmsQsRmRZWyZKhBrJ3mqNkRLyhAuzmqI6J/ud9ukfvseaDx2UvVNsxGQ2OWO/wKt8VqAfyMVSFrYcjKpwDcn+mviAe3c6PXNEmKHJZj9Wwb5FMU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276291266844.2413649423268; Thu, 1 Apr 2021 04:24:51 -0700 (PDT) Received: from localhost ([::1]:35470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvRS-0002Un-8e for importer@patchew.org; Thu, 01 Apr 2021 07:24:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPF-0000ju-Aw for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:33 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:44905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006gh-My for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:33 -0400 Received: by mail-ej1-x62d.google.com with SMTP id e14so2301608ejz.11 for ; Thu, 01 Apr 2021 04:22:28 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BQ2k06TKvkRak3oJkOP50HBxN0KuGNiuSPZNaP9RB5o=; b=NjLQXYtswEi83ijiKTbBVcTBY4ZXaRs8AS31QtE3M2lA2+51v02UqCBtT7u/2KNEhG Z8e80FHf/qC7ZmDXhDWQjM86OPZvm7SYTC3q4u8itKdxiEH/EPqC19EiTFzpkVduUhH/ z84xKyA8x0tth3kNs4peDateGw++qIiOGmnW69faB+w001g1yR6XXF1/bc6vRPxU1rgT iEw4SSYy1EW12R4Qi9/pUFrVPTW1k0jbUULq8nRQ8SqCu2MZB4AerumSExyyWkg91pr6 wiklxzsVw2AOhyiJTOzCMgswZBMk0UkP4EFtVABcUs6SmrPc3IKL2haC+ZbKsDlugh9h XLxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BQ2k06TKvkRak3oJkOP50HBxN0KuGNiuSPZNaP9RB5o=; b=glz/CYeE97RuCoKV/RbyW42dRTUDn9VFnRr3eDdU4DF+JhkuX18DFjs+DAvQxtuokG AeASqhrB/UWfcZ19tQ6+IS56EtqbGQaNJwvo/gcXHnPqOwfNj+gIM8SHTQcQ7+z0C/vx MYVl0Gqtoj3dyGMlhPBaaPK0DLaIc0UZpt48KwXGx5ylSRWwZoGd9cJheYZzaiDls4Xp xe91v+Td1Rj2AHVPvswnDgktbUtAEiqC5MKVpfHeAxkyIeXZn/osC8VxIXg7FuQXCVJj ug6Xpii83v4kVhEE+m4pX+0FbkWXM2R+J8/+yh+5mwEGk2RxJPUeFYwgDW7yh29onxuM E0VQ== X-Gm-Message-State: AOAM532keCvR/1/6DLB1zpNBwcuk/HOp0wBBW/AVoyk6nksUxY3lsWXs e3NxfoMcvgbvQbWUUijS2jzvXmvaOVU= X-Google-Smtp-Source: ABdhPJwbTN5MafkBHpewYcQ2iZsliIy+EW3jo4GKIAHYmJIwpiy8oUVZw5waxSn4cYXiUp0W1S+s+A== X-Received: by 2002:a17:906:9442:: with SMTP id z2mr8992610ejx.79.1617276147636; Thu, 01 Apr 2021 04:22:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/12] replay: fix recursive checkpoints Date: Thu, 1 Apr 2021 13:22:15 +0200 Message-Id: <20210401112223.55711-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk Record/replay uses checkpoints to synchronize the execution of the threads and timers. Hardware events such as BH are processed at the checkpoints too. Event processing can cause refreshing the virtual timers and calling the icount-related functions, that also use checkpoints. This patch prevents recursive processing of such checkpoints, because they have their own records in the log and should be processed later. Signed-off-by: Pavel Dovgalyuk Message-Id: <161700476500.1140362.10108444973730452257.stgit@pasha-ThinkPad= -X280> Signed-off-by: Paolo Bonzini --- replay/replay.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/replay/replay.c b/replay/replay.c index c806fec69a..6df2abc18c 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -180,12 +180,13 @@ bool replay_checkpoint(ReplayCheckpoint checkpoint) } =20 if (in_checkpoint) { - /* If we are already in checkpoint, then there is no need - for additional synchronization. + /* Recursion occurs when HW event modifies timers. - Timer modification may invoke the checkpoint and - proceed to recursion. */ - return true; + Prevent performing icount warp in this case and + wait for another invocation of the checkpoint. + */ + g_assert(replay_mode =3D=3D REPLAY_MODE_PLAY); + return false; } in_checkpoint =3D true; =20 --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276478; cv=none; d=zohomail.com; s=zohoarc; b=ks5m3hQx6UBH86jCfwtoXdgTwnQOgdiviCqOt/wgY4uwQf4E1jmPsq1twPFogZJ12AlRbflLhQfNPPP9HDeJ5hPG+FxpvQ1vfLliUo/lOafa6sJsrM2LWNz/pnih57y26Mr99W1XvAfdlF6F2x0C1Cs6J7a5u6JnxRice1hrpPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276478; h=Content-Transfer-Encoding:Cc: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=lEWIVDCtkimYtMK0ltNHTGDin3qV16dT3jK9cH3aIDI=; b=W7Flf8cIUwjGc1QfUKngqgqJwsb2E89HS6fgjZ0bf2RPiEpasl4CqfwRynX4y1MGRWW8aC2IJB2sLP/b6N6xGjHQ3PsBSXX8jl1qhO7S6/CGpBW/O+5MiUtCsApSKFmFOAIBASNa5NQ0xjhOppEWTzV5ZwcPZboGNYHs1x+XLrY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276478039451.02713783821923; Thu, 1 Apr 2021 04:27:58 -0700 (PDT) Received: from localhost ([::1]:44004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvUR-0006Bz-V7 for importer@patchew.org; Thu, 01 Apr 2021 07:27:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPG-0000lY-1I for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:34 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:40547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006gq-Td for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:33 -0400 Received: by mail-ed1-x532.google.com with SMTP id b16so1526647eds.7 for ; Thu, 01 Apr 2021 04:22:29 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lEWIVDCtkimYtMK0ltNHTGDin3qV16dT3jK9cH3aIDI=; b=HhFegB0Hu2K6XbH+2BX+DNT8c9BbNMKQestSQX1WdY+EkZzV/sB85E8p+9jOs7fVML wIxn8NCUGuSh7LhxKjfF/wOhJ8fe9vnuQSCW9HkYTZ+EICP6vNy4AyTWLlO1lXWC5EsM nY9yi9cs/ulInHHFOkhlBYXNwnPKU0iMbncEE+YUKiLAF97P9xycMUeMSpYedGZbB8MJ PdYgwQrw+yC/AZ3TzQLnA5n9IaabSApi+o/bSlNp7RPHbn8SYvJdTOyKuauBhYStzEhY SjLcZTDRkN3To+Wt4djuhbwX8P8TaZoSGBFJrfrNDCYLQn8ICxkpIwx29M32cmDbpOwg bMRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lEWIVDCtkimYtMK0ltNHTGDin3qV16dT3jK9cH3aIDI=; b=CfcHvZpG4DMwTPMXMAIXMt6rX3+7K5v3d7LfzcImbW4FGndAwt/uCSXv76NzAC4vyd spOh+UbPrA0zHJIUztHCXO8VFZ/ZG0JimNIigy4bxbVrE49MsRqfJ1M6M635pLlYEYgB 1Km6S6gWtVL7vjQVh/iYNfjGEF75HQKpCTrZdqI4d/Sc6U3dtQ8NsNtfr65dzwo3QOWo xxalmKgKmdLLr+stXvA11MGlSRxbHu+tdlAnn/bQng6dnkBcCrcZkiO/T6X/dq5OkCya GL0rQJI5OwY8e2tCTs7hgGzinTgF2PMWrmb8vRvl2Dot+Fp+qw/Tqhk/ISp9fdiuJmFZ U5Sw== X-Gm-Message-State: AOAM53132Tr89tavQOyXbd8QJRuYyGB2QbJ6xQKyQIGP8ZbERBSUu0+Y kXfYXvjOus/U4bijO97A3AlfbC5MriA= X-Google-Smtp-Source: ABdhPJxFR9jAO7r8sW8lMV3pgTOMQKDPt5xCoDm4RufLoAco79BWeXcPucsHhPkfYSNs3OWc32Mnpw== X-Received: by 2002:aa7:c9d1:: with SMTP id i17mr9029326edt.46.1617276148241; Thu, 01 Apr 2021 04:22:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/12] Revert "qom: use qemu_printf to print help for user-creatable objects" Date: Thu, 1 Apr 2021 13:22:16 +0200 Message-Id: <20210401112223.55711-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Thomas Huth This reverts commit 6d9abb6de9cc53a508823db0283061824f2f98a2. The real code change had already been added by Kevin's commit da0a932bbf ("hmp: QAPIfy object_add") and commit 6d9abb6d just added a duplicated include statement as a left-over of a rebase. Signed-off-by: Thomas Huth Message-Id: <20210328054758.2351461-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- qom/object_interfaces.c | 1 - 1 file changed, 1 deletion(-) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index c3324b0f86..b17aa57de1 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -17,7 +17,6 @@ #include "qemu/qemu-print.h" #include "qapi/opts-visitor.h" #include "qemu/config-file.h" -#include "qemu/qemu-print.h" =20 bool user_creatable_complete(UserCreatable *uc, Error **errp) { --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276595; cv=none; d=zohomail.com; s=zohoarc; b=dJO2R4FQ2OKF2hoCS+blhE6G9zuIcgUupJTCjQNSFGrCWnsM7Hpqf3QuY18CPIMINaJZnRj+oOZ6VVoJcX8MtcaUU75k2wmAOW032NiL1Z7LNNz/RXPxOfJyQfKaZt2k9IKQgyby7M+WNOjfcnjWc7FHTe2EhKSevI5Jc9rZWh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276595; h=Content-Transfer-Encoding:Cc: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=d0WSF/QYN6qIBRa1lwbS2t9p1DzdIoxNbWQ0dDd75WM=; b=Qy4NqWCgKg87gCnMzCJJeznQq0X6VI5Iw7znq2S9SF1pf/dBLVtUFqUrq/+IX1tuGi+qGltqyiHpdzSfp1Z5FZ0RnBVyrwWBz+9ZWHcRKaDQwceUPV41NZSfM5YSYnh/hKsSBzhNT1Rfh+urpQtwKFsrIvCStV6ULRRagC3jcT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276595894363.709099216601; Thu, 1 Apr 2021 04:29:55 -0700 (PDT) Received: from localhost ([::1]:50676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvWL-0000Uu-So for importer@patchew.org; Thu, 01 Apr 2021 07:29:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPG-0000mK-KX for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:40551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006gz-UG for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:34 -0400 Received: by mail-ed1-x536.google.com with SMTP id b16so1526675eds.7 for ; Thu, 01 Apr 2021 04:22:29 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d0WSF/QYN6qIBRa1lwbS2t9p1DzdIoxNbWQ0dDd75WM=; b=c/G1gf50lE68TRGecWBo8y9FRje0elNwcWyVKc3kQy/JmPtCLNSr2bbVr3ap9B+sAN oUQ0o8HOxEG4GaXf8dhT7t82iPI4COz/LoAnDzQ9i29Ab7VRnjqSXyeT0viWkneG92Bp jBazZ2+s367seixuEjj1otnMsA3g9SOnt11Dc1YaTQhsh8wjWEXvAGA16k6AGeI+J8Ou ++iLM9o1QjOL2tnYiamBNA6e88t298tRzEWGBRXXPUMosorvJG0LvWN7heJ65c++gV2g +lJ6ehbSzrzHRtbj6bnQnz/GpyQHLerpk/VwU1QKPEAuK8mreEIzDLzsGg29OZs8VXf6 aBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=d0WSF/QYN6qIBRa1lwbS2t9p1DzdIoxNbWQ0dDd75WM=; b=IYWAplVIQY63fshBGnPFVJ0sgLCOiXAmsSABPIGsQ+CwA4oj7XhrR7xhmxJKcSwQZz pFkV6uXapfs0DTBsCoZGmD/EAr+By/ccuSg5ZJtesuf6KVzYws3DpUjxinBRGPse3tjM dGGeyHq5yJ9oO/X56pF+t+uoY7tsDqlwm3TOY1MAk8fomNsvFrTWemsANW1wCOzEy0k+ GI+iIMOtWAuB3HuRG6G+G3LEAEh+vR7Xn9yI8y0XnCRtwj5Vky5uMCdPj7+YDJxBlvgJ 7ZIIXICQg89yTJ+rQIjA8hXiEnEos6mGqspBMpeknE9mmulti5Pi63PZIzIiy/IN/luG sg5w== X-Gm-Message-State: AOAM530OtYIybob7UpG7ai7Z7FsqTRU3yUjVd1lPLP59qEBUww64nXEv VSPd8CUu2JTt/mFag5yHZQ8TS87g1Tk= X-Google-Smtp-Source: ABdhPJzY9iuO8yr8EE5fIGwlPWRn0wlVCp+/57dP4TKLBSdL86+ngaeqMKPGSWgN8sB+LxKyPps+Fg== X-Received: by 2002:a05:6402:12cf:: with SMTP id k15mr8971863edx.192.1617276148892; Thu, 01 Apr 2021 04:22:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/12] icount: get rid of static variable Date: Thu, 1 Apr 2021 13:22:17 +0200 Message-Id: <20210401112223.55711-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk This patch moves static last_delta variable into timers_state structure to allow correct vmstate operations with icount shift=3Dauto enab= led. Signed-off-by: Pavel Dovgalyuk Message-Id: <161701335066.1180180.7104085247702343395.stgit@pasha-ThinkPad-= X280> Signed-off-by: Paolo Bonzini --- softmmu/cpu-timers.c | 5 +++-- softmmu/icount.c | 9 +++------ softmmu/timers-state.h | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c index cd38595245..34ddfa02f1 100644 --- a/softmmu/cpu-timers.c +++ b/softmmu/cpu-timers.c @@ -188,11 +188,12 @@ static const VMStateDescription icount_vmstate_adjust= _timers =3D { =20 static const VMStateDescription icount_vmstate_shift =3D { .name =3D "timer/icount/shift", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .needed =3D icount_shift_state_needed, .fields =3D (VMStateField[]) { VMSTATE_INT16(icount_time_shift, TimersState), + VMSTATE_INT64(last_delta, TimersState), VMSTATE_END_OF_LIST() } }; diff --git a/softmmu/icount.c b/softmmu/icount.c index dbcd8c3594..21341a4ce4 100644 --- a/softmmu/icount.c +++ b/softmmu/icount.c @@ -176,9 +176,6 @@ static void icount_adjust(void) int64_t cur_icount; int64_t delta; =20 - /* Protected by TimersState mutex. */ - static int64_t last_delta; - /* If the VM is not running, then do nothing. */ if (!runstate_is_running()) { return; @@ -193,20 +190,20 @@ static void icount_adjust(void) delta =3D cur_icount - cur_time; /* FIXME: This is a very crude algorithm, somewhat prone to oscillatio= n. */ if (delta > 0 - && last_delta + ICOUNT_WOBBLE < delta * 2 + && timers_state.last_delta + ICOUNT_WOBBLE < delta * 2 && timers_state.icount_time_shift > 0) { /* The guest is getting too far ahead. Slow time down. */ qatomic_set(&timers_state.icount_time_shift, timers_state.icount_time_shift - 1); } if (delta < 0 - && last_delta - ICOUNT_WOBBLE > delta * 2 + && timers_state.last_delta - ICOUNT_WOBBLE > delta * 2 && timers_state.icount_time_shift < MAX_ICOUNT_SHIFT) { /* The guest is getting too far behind. Speed time up. */ qatomic_set(&timers_state.icount_time_shift, timers_state.icount_time_shift + 1); } - last_delta =3D delta; + timers_state.last_delta =3D delta; qatomic_set_i64(&timers_state.qemu_icount_bias, cur_icount - (timers_state.qemu_icount << timers_state.icount_time_shift)); diff --git a/softmmu/timers-state.h b/softmmu/timers-state.h index db4e60f18f..8c262ce139 100644 --- a/softmmu/timers-state.h +++ b/softmmu/timers-state.h @@ -43,6 +43,8 @@ typedef struct TimersState { =20 /* Conversion factor from emulated instructions to virtual clock ticks= . */ int16_t icount_time_shift; + /* Icount delta used for shift auto adjust. */ + int64_t last_delta; =20 /* Compensate for varying guest execution speed. */ int64_t qemu_icount_bias; --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276292; cv=none; d=zohomail.com; s=zohoarc; b=NcMpiGEdsLhbNCzUdhvb5iMuONhclZ2nGk5d3x58meAhV0NIaaB6AK4lyj9W0YIFks/z7JV73Uw+RkxLcV+06S9nZe8yqNWoaABwBXLyMlRq2zVkAtie+fcqJRqQkxEUzZiOQsuuzykSjFbbOUmfeFS4BG0dhYDcK6OJIo9b3lE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276292; h=Content-Transfer-Encoding:Cc: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=4FACbZ/ff7TqFtcB9utnNWMNn2f00Di6NIXduzRvbc4=; b=fBOhMuTUZ7ZMer60EvFx24D9Edcn3v425f6VyAvccalmxnVaiMR9ya4Dw7ZzpX3cVHuW1S2AYYsQVHYl+IxRGTj64sEXKXmG4LrI92cZoT8xqQJhz3u6Z5Rxw4uWQwaLtxBF8vdc3vlE1Ly6vI7d7iRxDfYYdKEuXwBHYvq95Ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276291997587.4995682185057; Thu, 1 Apr 2021 04:24:51 -0700 (PDT) Received: from localhost ([::1]:35556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvRS-0002Wi-U7 for importer@patchew.org; Thu, 01 Apr 2021 07:24:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPF-0000jy-Am for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:33 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:37532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006h3-TV for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:33 -0400 Received: by mail-ej1-x62c.google.com with SMTP id w3so2338900ejc.4 for ; Thu, 01 Apr 2021 04:22:30 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4FACbZ/ff7TqFtcB9utnNWMNn2f00Di6NIXduzRvbc4=; b=Z40ifjb5sl2ZBU7owkyFN6CWhnjICrIB7SYKHyLw5KYbIXNd9n/l2U/y6AZPnfJnpQ EC7AnI5ral0VYAHENXFL8l2Uip274820qrB2mcInZqvZ0nO4g6FYqelmFkKPiV8fb1Oh m9Gs826RlF+/1gK/IjdjMbaMxP9sxYEGddoq8nH5N+8RPZIhP0hCud71bIsHHRM9Be5g i66Eo6hPMsk5hAYgiB7VwuktGqK095KqfptQeWHXwUb5ElrV1MNtGE+Z34LxSuat9nUj hLPz6fROFXW6+LrG2Fg687MT1BJBvu9T17OX9JY+N8CXRyrpkWMg23Yz0/dkR1UsJjnD rUyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4FACbZ/ff7TqFtcB9utnNWMNn2f00Di6NIXduzRvbc4=; b=cY8H6xklbxZ+3l1fUpRntnNyhjxlxwBlPr0e1t8saJ2dxEhN0JUkgljuHfeL9zijIK QsFFNkRnEW9DiITEbQGNK8XGueDCDziQJZYbunNCwFzHQCNsMPuJ7+0yC2nrXuUt9Usw J/mQwkQk+nBw8KruYz/iP0gQiSgCR3KRQdv4dTAh/Ys/NmZbxLDy8TAtXwkcgt6CPc0Q 3CvwBygXu6pohIRUl2D9oA7P3w/YO9DtZE9QAoCitLxLJp9tTLfkoL62oIZ5ZD9bH2x/ AG4glfPXTPE2a/+bGmKVrYk2wLw4yiMkVsXuJ1qokdFJIH56MsELFhtN3aYChDL0VskT tSQA== X-Gm-Message-State: AOAM533J+G1B5fcF8YEfNLRuNA28313kf+6AhFANrHlurptrQ7PKsVEm zysUfm8LNUmgREfbaU3BR/8u9s0h85w= X-Google-Smtp-Source: ABdhPJyR1XW//ps6yl8v25TSziefnTxjqGjrfP9Ji6GqHM/Ogv2TWu7d6iPMCsQtSGOH+EA5Mb2/jg== X-Received: by 2002:a17:906:af6f:: with SMTP id os15mr8686331ejb.279.1617276149576; Thu, 01 Apr 2021 04:22:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/12] replay: notify CPU on event Date: Thu, 1 Apr 2021 13:22:18 +0200 Message-Id: <20210401112223.55711-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk This patch enables vCPU notification to wake it up when new async event comes in replay mode. The motivation of this patch is the following. Consider recorded block async event. It is saved into the log with one of the checkpoints. This checkpoint may be passed in vCPU loop. In replay mode when this async event is read from the log, and block thread task is not finished yet, vCPU thread goes to sleep. That is why this patch adds waking up the vCPU to process this finished event. Signed-off-by: Pavel Dovgalyuk Message-Id: <161726519158.1476949.7614181684462079836.stgit@pasha-ThinkPad-= X280> Signed-off-by: Paolo Bonzini --- replay/replay-events.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/replay/replay-events.c b/replay/replay-events.c index a1c6bb934e..15983dd250 100644 --- a/replay/replay-events.c +++ b/replay/replay-events.c @@ -15,6 +15,7 @@ #include "replay-internal.h" #include "block/aio.h" #include "ui/input.h" +#include "hw/core/cpu.h" =20 typedef struct Event { ReplayAsyncEventKind event_kind; @@ -126,6 +127,7 @@ void replay_add_event(ReplayAsyncEventKind event_kind, =20 g_assert(replay_mutex_locked()); QTAILQ_INSERT_TAIL(&events_list, event, events); + qemu_cpu_kick(first_cpu); } =20 void replay_bh_schedule_event(QEMUBH *bh) --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276597; cv=none; d=zohomail.com; s=zohoarc; b=ImYgOB1TvqaTeVKTHMh3EwkjyZ/l9vf0puIuXbvF8yueMXR3L4ThYp6YF8R972NvQ/mMkhHiG6JclyNWVEvT7a03sm7Y7J0GOUpbzahjYki1t6rnF1wMVxq6WKRKdsxaLE+4hRDpsq7a9Nfg2kZGzhdUJGHEg4GfVqs8K1C8esA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276597; h=Content-Transfer-Encoding:Cc: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=TaOsaEiCDE0n3X7TNwfYFY6ptE9OcCqOSdYES7YZ86E=; b=mEzQblf2PkWhe5RvE/1FjjiRIqRj1f9eV+Jc2QCFD6hr5lmGt/ABaoRAvH4+QYYSA7O90BR1+ToZl8MjraaLxF986R5msuxlxt0aY0yDSDiscqlPQ8KEZvxfC3Nk7dUFW37fFZ86g+cMKdBmbhMzSp1KLekEzAWTmFU9m9ZwOsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276597252444.0897843527267; Thu, 1 Apr 2021 04:29:57 -0700 (PDT) Received: from localhost ([::1]:50780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvWM-0000Z2-Ta for importer@patchew.org; Thu, 01 Apr 2021 07:29:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPG-0000m4-Cd for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:37533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPD-0006h9-U4 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:34 -0400 Received: by mail-ej1-x62d.google.com with SMTP id w3so2338949ejc.4 for ; Thu, 01 Apr 2021 04:22:31 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TaOsaEiCDE0n3X7TNwfYFY6ptE9OcCqOSdYES7YZ86E=; b=gm8nyLYj/NmSHA2VPW5aTVF+eGkZ5D8o8alNXilsG9b9bUMOS9GmDCWjIiTSwPkQBh G6j+E4W6EXqQVsbxyz5bBgU2oIp/lREeYDKx8PNaa4wvjj3CrtxYdTkKNGs4C968HK/0 6KeOUm26LrOOU9k+K1pmgO7HExlN01DJSu1EYyyEH/FYRgh+12kmtjIDydD35YebJNrM o1b+1b1wV7tSPykuZ3z7iBAy/Ucf7gsr1SHRXk+qs/GkNxb8d0WR/ORTRVF71Hj6QM/H P9ipQDZ7BTF7izLP1IqXbkjX4J20BduIULMA4m6gr6SCxdiXy+B3YGrWcGGzfvq3qYJc CJWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TaOsaEiCDE0n3X7TNwfYFY6ptE9OcCqOSdYES7YZ86E=; b=UBlZZzirWegMN7ZYURvCjTpRpY7JJnYnzv48WTyfj0/U9ZYQZOsQBt8dXW1GIl0zXy 60OK2oUWTpRCoM1LGgHnHynrspMXCvRMaXtoP6z5xYZrlDCD7hItWk43rwm618diMNP1 E0eEk01DC0pLL44xLppn3lIS+iCMOb4YM6R6aPzIVJ5zhIdcmpZnn/7E4NrcSSDDYEIz ERSOypHQeMA4V4i38D/t7KOaTNLE9Zw0ncXwDAqO+YImnD+4OfiZcpMjeSzCL00LQLtQ CMnCNhboN6tFGQ3Vk8AEhQ9m+zqRYcktqYSMCY3uBcOhqgjKz5pZZYIIkDRqhUuamsHj xSCQ== X-Gm-Message-State: AOAM531kGkky/U+jqyCNsbTZHEp7PQM0k5f6u9KTrVJ0GqP69xS3sTx5 0rJz6xUjZBudclpF72TFNxpmaR8HDqc= X-Google-Smtp-Source: ABdhPJyT1i+gOrHYECp5DwHYHoQ1qiIGJ5wZyGQLAULYEXPm1voYRNYYMqhYabUTp1A42ZKJobhAsw== X-Received: by 2002:a17:906:701:: with SMTP id y1mr8363270ejb.243.1617276150228; Thu, 01 Apr 2021 04:22:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/12] target/openrisc: fix icount handling for timer instructions Date: Thu, 1 Apr 2021 13:22:19 +0200 Message-Id: <20210401112223.55711-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Stafford Horne , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk This patch adds icount handling to mfspr/mtspr instructions that may deal with hardware timers. Signed-off-by: Pavel Dovgalyuk Message-Id: <161700376169.1135890.8707223959310729949.stgit@pasha-ThinkPad-= X280> Signed-off-by: Paolo Bonzini Acked-by: Stafford Horne --- target/openrisc/translate.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index c6dce879f1..a9c81f8bd5 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -884,6 +884,18 @@ static bool trans_l_mfspr(DisasContext *dc, arg_l_mfsp= r *a) gen_illegal_exception(dc); } else { TCGv spr =3D tcg_temp_new(); + + if (tb_cflags(dc->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + if (dc->delayed_branch) { + tcg_gen_mov_tl(cpu_pc, jmp_pc); + tcg_gen_discard_tl(jmp_pc); + } else { + tcg_gen_movi_tl(cpu_pc, dc->base.pc_next + 4); + } + dc->base.is_jmp =3D DISAS_EXIT; + } + tcg_gen_ori_tl(spr, cpu_R(dc, a->a), a->k); gen_helper_mfspr(cpu_R(dc, a->d), cpu_env, cpu_R(dc, a->d), spr); tcg_temp_free(spr); @@ -898,6 +910,9 @@ static bool trans_l_mtspr(DisasContext *dc, arg_l_mtspr= *a) } else { TCGv spr; =20 + if (tb_cflags(dc->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + } /* For SR, we will need to exit the TB to recognize the new * exception state. For NPC, in theory this counts as a branch * (although the SPR only exists for use by an ICE). Save all --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276720; cv=none; d=zohomail.com; s=zohoarc; b=STfD2hNG2ONKXhWC6K2jwmKc2jfSoWE7SY5ukjSVkM05OePF57D0cq5BtL+WgGp7O5z1Og11xBEzrQFdVQ34zd3u9UzzQl86Kn6t4ozWZZuyL2x42mtk3WPwUMiE/xyxsmdC+mDpXSPxxcSKsbpQ5GmY5UMSHClNWEBHScCpE+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276720; h=Content-Transfer-Encoding:Cc: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=uxNED1duCyBdlkruJzl0xnqKRNFLuA5HiEispmsiklU=; b=bkGPTPR5or4QQRaPctv7JquDsxOuDO/tKAmOb5a5Gf2W0Hj8/Ke4MKPk3S8OzBp5KhElCHyZxRa/0YTAHC4/mzcubrOMdXHjBTt+evjGJF+Ryz9c7LCEn9TodNN4t+SwcNEv4jTCbfQbuTc9ClWV46Eflcq9gveyqJlDJDJmw2k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 161727672070063.91215726214682; Thu, 1 Apr 2021 04:32:00 -0700 (PDT) Received: from localhost ([::1]:55082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvYN-0002TC-Aj for importer@patchew.org; Thu, 01 Apr 2021 07:31:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPK-0000mt-Ff for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:40545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPE-0006hH-3D for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:35 -0400 Received: by mail-ed1-x52f.google.com with SMTP id b16so1526765eds.7 for ; Thu, 01 Apr 2021 04:22:31 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uxNED1duCyBdlkruJzl0xnqKRNFLuA5HiEispmsiklU=; b=PWIwEsAtqZBqWSOU9CNEtKO6peNbxdJs36RsGUFHDFmq3hJkOPDIzG+JhG46rjDWz2 e3Ea8FQtXyDjiuMqO/IUgg2iPQfAILSECH9Lu4e7mobu8OtzPcRvKDclz3O2vqyiuSS6 oATfjxqZCrn9LnWxDhBOoVV66+AOWTctqkDKD8ho+kpQ+mQztWqiJ04B+tdHC5wb3VjJ eLzq9JxNR6qFxlRZ3IexIO68t6dJv3Y3FJdLUhCWsAlok59gU+1uc7Vd0HhiJWdowl1h AqAEwEgXIlMzM61rJtN7otwE0nsIo2dYSct8+AjvwfnGaSJ7+wk6Rp/siO+ayaU1H9Gh LVLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uxNED1duCyBdlkruJzl0xnqKRNFLuA5HiEispmsiklU=; b=hd3vKnZhzDGDSkloe9f3juWZZfxbbnPabMjJHKu8+cfUbMJ5jzBTq/SlBh1TOfGZxG OAQrzXC13rClQHEHd4Yn8CgTnydLQ92RaNwdJnbbP1bCHAS2r9OdGYWF7dJldlrYhhcI 9uhSJWaAgHJ8qPCbWOze3vh07+3YwnZYfxKULj91/jgdnaksb7udSwMmSrB0EA2q+6ZI 5hTY92auiUs+K0Z3wnl2x3lCDmOcsuLXVg+O2FdcoBTdN0dvR0u604I9TSGXZtAfbEwq lgC/j8V4IKgdOYvFwMaCC+d6Mp3poencAGwZ3BnGau8kZNJHLB1vYxaSaH34sHRK16JP Ocig== X-Gm-Message-State: AOAM531ntgIi/USuOiyhKyFcwi/TOAw+OusDHEvdvmw8/uf+V0Duq/DR /TPRPHvC3nTjOKipCvT32LlR4ek70s4= X-Google-Smtp-Source: ABdhPJyqDuqClVFBr+staTqdF7aRU9NdLf9feukpcJ/Q3lMQbK+Q8+8sGcJBORVIOGZZjuc2jOQJ2g== X-Received: by 2002:aa7:d98b:: with SMTP id u11mr9541116eds.352.1617276150855; Thu, 01 Apr 2021 04:22:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/12] configure: Do not use default_feature for EXESUF Date: Thu, 1 Apr 2021 13:22:20 +0200 Message-Id: <20210401112223.55711-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::52f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Miroslav Rezanina Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Miroslav Rezanina Commit "c87ea11631 configure: add --without-default-features" use default_feature to set default values for configure option. This value is used for EXESUF too. However, EXESUF is not option to be tested, it is just append to any binary name so using --without-default-features set EXESUF to "n"o and all binaries using it has form no (e.g. qemu-imgno). This is not expected behavior as disabling features should not cause generating different binary names. Reverting back to setting EXESUF to empty value unless needed otherwise. Signed-off-by: Miroslav Rezanina Message-Id: <20210331081845.105089-1-mrezanin@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 535e6a9269..8275df1506 100755 --- a/configure +++ b/configure @@ -365,7 +365,7 @@ tcg_interpreter=3D"false" bigendian=3D"no" mingw32=3D"no" gcov=3D"no" -EXESUF=3D"$default_feature" +EXESUF=3D"" HOST_DSOSUF=3D".so" modules=3D"no" module_upgrades=3D"no" --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276821; cv=none; d=zohomail.com; s=zohoarc; b=LCaQ72BHMBvsMq5UiyN+93Lmnt9VNLk9lI3VCmwqETtXy0mBuJtns3zkkmIQ3cFF+9cvMbE9mEVwTItOY7amgVw8SPNSbePDU9Smter+EMqgfCAjb4gEBuYRXw7tUrwltHUs/s83x0FcVfDN/mW/5dAVLw54cqpcKJ/tdlXANDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276821; 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=16KFCO3ieOKGNO78IkfXmCnzdtyYQDIwmMaQzvcQVWg=; b=efoUQSTsSTDmJaEddy8QONHtUICsutfa8wq/n/qpuDDFNelC+FZxilq7F+i3ZY1ShOSmZPXUbqcgm8Tt4aLsoJlyCAXKtNLfjJzTax5U2qrUtYZlmiec5gZghtXFleo0oeh1NTM3WYr5WTHCX8ropsrw/8+QMcOFlmhtQUehHUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276821223357.8298113205975; Thu, 1 Apr 2021 04:33:41 -0700 (PDT) Received: from localhost ([::1]:59450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRva0-0004J7-5c for importer@patchew.org; Thu, 01 Apr 2021 07:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPK-0000mx-G8 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:44908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPE-0006hO-LS for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:35 -0400 Received: by mail-ej1-x62f.google.com with SMTP id e14so2301842ejz.11 for ; Thu, 01 Apr 2021 04:22:32 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=16KFCO3ieOKGNO78IkfXmCnzdtyYQDIwmMaQzvcQVWg=; b=dmymLPXrZbBL8EboANDgncnNXyhkvytNYi8dDFzRETjABvygCtf0McNmRn/2K1WC+/ PvaJbG8SrFz/FjNNsWASl9Egxls8qwsC89o0h/CcRPrXBSypv7Gk8dfhb5wP5wRdMa8M Z2FhMQNDzO2SMWAYYRyblslsttO2VCAdU9iX6KcaB7RMKo+7NzoXVNgEmlANqGwO9hxP 4RULpGcy+4vRvNZ1RrF+cYBeYEIt1zR16l1M23bBh9COL6SEQ+1bsbC9E5UrmWgDNKKM vZM3ZHe8VoQDMuUyb+DpkpX6YZixFHb2wu4x7MtL/LFj7bO1WLpN+OWES1h+bz0fmrr2 Xzsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=16KFCO3ieOKGNO78IkfXmCnzdtyYQDIwmMaQzvcQVWg=; b=l5zyBRBbfySQC7xl0u4cvu2rUoyotYuFdgfLJiWPqIP9coe0nTNsSUmKz0Tsu/9SHE 00+9N35wqNM4ZGQwrFbSLLsn9EQ11FBz6g4Ddotr3Hsqw0O77Kh94qaRUK7DPCeGw3Vd a25OXBi6ZuO86kfhiwAkVE0Fk8jpxi+0mWnVb8qoO2jNUtATWtqRUJU854k4QgCA3Cvv bU+zg1Se8RMWt0A1irVcDFbw69PM5gR1+fXTxZ6MfbZLWm/5aKMkrzf1g9Qk2Um/S8e7 PWHY7qfUKI7+v92fR+8Ngt9CpREQvgG1kOzioq2vOd6SZ+WuD5zP5DDpzcDgxZ9VlxAs wABQ== X-Gm-Message-State: AOAM531MgSXTuinRwVIhUEFifrvZxGvsVjepa7tpgS22D3c9XNrDCUlp 6PMit3r7RkNDAjmhtWlu7q0oxjQjt/Y= X-Google-Smtp-Source: ABdhPJyvU6YKMk/D6es0h2++8LcuEwJrPtIHFw00XXk/xbwwkhghVdykzhutjKLFHHrRm3bczyoRmA== X-Received: by 2002:a17:907:204c:: with SMTP id pg12mr8547271ejb.225.1617276151488; Thu, 01 Apr 2021 04:22:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/12] hexagon: do not specify executables as inputs Date: Thu, 1 Apr 2021 13:22:21 +0200 Message-Id: <20210401112223.55711-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::62f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" gen_semantics is an executable, not an input. Meson 0.57 special cases the first argument and @INPUT@ is not expanded there. Fix that by not including it in the input, only in the command. Signed-off-by: Paolo Bonzini --- target/hexagon/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index 15318a6fa7..5dd68907b1 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -33,8 +33,7 @@ gen_semantics =3D executable( semantics_generated =3D custom_target( 'semantics_generated.pyinc', output: 'semantics_generated.pyinc', - input: gen_semantics, - command: ['@INPUT@', '@OUTPUT@'], + command: [gen_semantics, '@OUTPUT@'], ) hexagon_ss.add(semantics_generated) =20 @@ -154,8 +153,7 @@ gen_dectree_import =3D executable( iset_py =3D custom_target( 'iset.py', output: 'iset.py', - input: gen_dectree_import, - command: ['@INPUT@', '@OUTPUT@'], + command: [gen_dectree_import, '@OUTPUT@'], ) hexagon_ss.add(iset_py) =20 --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276477; cv=none; d=zohomail.com; s=zohoarc; b=VfCoiutpA9axoAgQzONrL2Ax/hL77KLMnBn1jW/PyuBtf6nvFr5ef6zhU846c3MWv32ys2LezET+mUshiSd9keEzXfngKG4ZMl1jjMiNhLtro2toGAMfYMQ44A3Ytv+B4kkpqbH2xOsLS5i5pIsn/L98+jTWeYFlqwc69shs+AQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276477; 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=oyCDE+1lD7kLG1acPwyIoCzbCo2TYifb8td0U1UsLDs=; b=Gc9tll5XwbW0BBQUyJ+OwlUu0e5owzgrTGoQy5EnduHho/4utPnxxEwDIzb2hfx5rSEyD70nC8WzAk2HcKMhEjQOuIs6uOSa2KOJMqsqMM3KNZEnh/F33tK0x0X5cV3w9LimXsm+f9llOrza3V0SBxyuP1bhvDzCLD5akwpaxDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276477053868.120944581396; Thu, 1 Apr 2021 04:27:57 -0700 (PDT) Received: from localhost ([::1]:43898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvUP-00069N-TF for importer@patchew.org; Thu, 01 Apr 2021 07:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPK-0000my-Gj for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:44911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPF-0006it-IZ for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:35 -0400 Received: by mail-ej1-x632.google.com with SMTP id e14so2301888ejz.11 for ; Thu, 01 Apr 2021 04:22:33 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oyCDE+1lD7kLG1acPwyIoCzbCo2TYifb8td0U1UsLDs=; b=B7lPxbydJS4HvZeuuNaa9uGN0++iJNCjr21gzaDGe7nB+VzDGfWZoOWi3QOr6AhNHr Dd/dSqKvbb/lnWvi4vU2vxrKSrCEZB7DTugMgshP2nX+/aZha06h8oVhxTgFSaWFoBx2 OkfT7KkiOSHJ4fnhfp+LOMaXEDf4RbFjKByHklA97CPd+kuugRwQSQZ8u4qsrZ5L0bNa yZyXvo2zpgRicoqcrk1DzUaR+yUsKya7Mz8av9Buy6WmFE29e/ZhMy9sOrTWfRZKOtsX bRYcJkpE8mlp9bE5oZs4wb7mCTjnk2blVN6RZBDx1Vpw083pY8TLFoSGsxXog4BHyS42 9GQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oyCDE+1lD7kLG1acPwyIoCzbCo2TYifb8td0U1UsLDs=; b=nldt8HyOneO3p6c28tH9p8d4RfD+AtHErk1KRFLRwzyTsGrZmTSvNpTORdS4jzt7Fu c/CbGEtT/HdWiyOEA2imA8zYkgFA6T2EIioVgzGYps7NesxqJVKgYvWoHADwVLxIOmOe Z3xjEnmrIApOIEsVvuNjC9vu/c8o1aPube/PMnpwZC0AwCDQZw0zx1Ya6bSf5FCIhpJc o8h3NaZIjSRffYmg5N1/X4+jMVvAYf1KujyhDfOkYBhf+m14PPFphUzygYUlyqUMadVY kuqm6ANtS+NHNC3AP9NgVTx8t7zwCPO93mr6ya8NDUOfaPAkhz3vzA0OT7NkSlaEVcjx VveA== X-Gm-Message-State: AOAM532AsLCiqMPkIFmOfU5+/QWZjsx4SiKRfTapJnKZ5bKQalnaMHGR zZ7a1uK7MhLCQA2HchaFW3yWPkKY3Xw= X-Google-Smtp-Source: ABdhPJx8Vc5f0G5Rc3R8tEUkdzg9ixL23FQUHJtacCYzYweLOPdEU/59eYFIONbZ9QWTbcJ7ikvgUg== X-Received: by 2002:a17:906:33d9:: with SMTP id w25mr8875373eja.413.1617276152181; Thu, 01 Apr 2021 04:22:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/12] hexagon: do not specify Python scripts as inputs Date: Thu, 1 Apr 2021 13:22:22 +0200 Message-Id: <20210401112223.55711-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::632; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Python scripts are not inputs, and putting them in @INPUT@. This puts requirements on the command line format, keeping all inputs close to the name of the script. Avoid that by not including the script in the command and not in the inputs. Also wrap "PYTHONPATH" usage with "env", since setting the environment this way is not valid under Windows. Signed-off-by: Paolo Bonzini --- target/hexagon/meson.build | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index 5dd68907b1..bb0b4fb621 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -53,90 +53,81 @@ hexagon_ss.add(semantics_generated) shortcode_generated =3D custom_target( 'shortcode_generated.h.inc', output: 'shortcode_generated.h.inc', - input: 'gen_shortcode.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_shortcode.py'), semantics_generated, attr= ibs_def, '@OUTPUT@'], ) hexagon_ss.add(shortcode_generated) =20 helper_protos_generated =3D custom_target( 'helper_protos_generated.h.inc', output: 'helper_protos_generated.h.inc', - input: 'gen_helper_protos.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_helper_protos.py'), semantics_generated, = attribs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(helper_protos_generated) =20 tcg_funcs_generated =3D custom_target( 'tcg_funcs_generated.c.inc', output: 'tcg_funcs_generated.c.inc', - input: 'gen_tcg_funcs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_tcg_funcs.py'), semantics_generated, attr= ibs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(tcg_funcs_generated) =20 tcg_func_table_generated =3D custom_target( 'tcg_func_table_generated.c.inc', output: 'tcg_func_table_generated.c.inc', - input: 'gen_tcg_func_table.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_tcg_func_table.py'), semantics_generated,= attribs_def, '@OUTPUT@'], ) hexagon_ss.add(tcg_func_table_generated) =20 helper_funcs_generated =3D custom_target( 'helper_funcs_generated.c.inc', output: 'helper_funcs_generated.c.inc', - input: 'gen_helper_funcs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_helper_funcs.py'), semantics_generated, a= ttribs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(helper_funcs_generated) =20 printinsn_generated =3D custom_target( 'printinsn_generated.h.inc', output: 'printinsn_generated.h.inc', - input: 'gen_printinsn.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_printinsn.py'), semantics_generated, attr= ibs_def, '@OUTPUT@'], ) hexagon_ss.add(printinsn_generated) =20 op_regs_generated =3D custom_target( 'op_regs_generated.h.inc', output: 'op_regs_generated.h.inc', - input: 'gen_op_regs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_op_regs.py'), semantics_generated, attrib= s_def, '@OUTPUT@'], ) hexagon_ss.add(op_regs_generated) =20 op_attribs_generated =3D custom_target( 'op_attribs_generated.h.inc', output: 'op_attribs_generated.h.inc', - input: 'gen_op_attribs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_op_attribs.py'), semantics_generated, att= ribs_def, '@OUTPUT@'], ) hexagon_ss.add(op_attribs_generated) =20 opcodes_def_generated =3D custom_target( 'opcodes_def_generated.h.inc', output: 'opcodes_def_generated.h.inc', - input: 'gen_opcodes_def.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_opcodes_def.py'), semantics_generated, at= tribs_def, '@OUTPUT@'], ) hexagon_ss.add(opcodes_def_generated) =20 @@ -164,9 +155,8 @@ hexagon_ss.add(iset_py) dectree_generated =3D custom_target( 'dectree_generated.h.inc', output: 'dectree_generated.h.inc', - input: 'dectree.py', depends: [iset_py], - command: ['PYTHONPATH=3D' + meson.current_build_dir(), '@INPUT@', '@OU= TPUT@'], + command: ['env', 'PYTHONPATH=3D' + meson.current_build_dir(), files('d= ectree.py'), '@OUTPUT@'], ) hexagon_ss.add(dectree_generated) =20 --=20 2.30.1 From nobody Sun May 5 01:03:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617276477; cv=none; d=zohomail.com; s=zohoarc; b=F13qrrJMqsKWAaz9kAVqwK82fcPx0/TTq6sDiDE8SvJ8fufFv183PiLvd4pPNHQK71iHtByQm639b9sgdCXEVG9oUPFmnXb4RvVkeCdXc7LAaBHKoy2FuKAep3mGO2hcWSm278ATnn2zyMemVtX0It1j7mIKpak9mEamfI7Chxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617276477; h=Content-Type:Content-Transfer-Encoding:Cc: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=3a9pWuPdGLfVFIeiwv5CoEQl1efGznDAG1hoHGMlNUc=; b=hzSNctXm/10KhaWr0VT7EH7iLnGXfj3YQPicIgFP/yAvdiArIUyRBfNNew80DH6C5xMX/84zt4PQwDScQP6WOLzCpZiQjeAM0FjX+B/HLWQLZeijc9Z4YDpIokFHj0br46g/zt3JMASmZNIgEYVdRrwS453XT99BPU57+I6sa9k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1617276477739277.24839947384623; Thu, 1 Apr 2021 04:27:57 -0700 (PDT) Received: from localhost ([::1]:44044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvUS-0006Ct-Hq for importer@patchew.org; Thu, 01 Apr 2021 07:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPK-0000mn-FS for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:38 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:37456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvPG-0006jW-DR for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:37 -0400 Received: by mail-ed1-x52b.google.com with SMTP id x21so1539513eds.4 for ; Thu, 01 Apr 2021 04:22:33 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3a9pWuPdGLfVFIeiwv5CoEQl1efGznDAG1hoHGMlNUc=; b=GkimMXxkiCvnjyzReqOO9s8oQM6XrT8UQRV3nZDlayPZLLmJqh6Y32YHeHTal/hbeX y/rlxltEpe2ZYcb8MejyhSryFELunPttlxkYTKRw9/hgrs+YX7JqyITTKKGPmPug3/UG 9g2lVOMXtNU7OdBb9+q/E/GAdfaneCNxx3jINZNeMRvtFdoZm1ALns2BZTYdWJzCu0s1 jbd4/SdlyOfLOaZNHyEUtA4LasJOC97+5p03NxB8+ajQyxmYEuF1Ob7nDu9kQTAnFIt+ KjgOKjc90+Vn5nxeOyUugRuWIzOdHmlBeDK/XsEVpv88EyHTNm9f5FiFspyQ0nNDhJJe lfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3a9pWuPdGLfVFIeiwv5CoEQl1efGznDAG1hoHGMlNUc=; b=p8WmrzVI/0kljvNegCMp8OnhqnHH87WlSnnh/cxJrn785ykGsuCgnAH8Ulil0AbPDi ityF+qx+nJtBN2oCHMb67av5cZ41v6wrLTQ+M5+g+xwmeNhzyqm6pgE2RwR1X7SDOMbn wVXjric0aH3gOiZRoCbR9U++Dmbk/SOA6Quf5HX0krVCRBavkaA1yeUcUPA2SfZL709M nUg0+Q2GeCgBVR5QCQKvpUGtZiNOzgC3Sr1svHmJDwhe10Ry5KDAD472c0lPE0OJvhFA F4v/5VppY1zVgd8pWJfEOgr8QG/EHky51Wy8/hwSv/SZwz+836X9XDsmObRIfousdaru ueOw== X-Gm-Message-State: AOAM530Kv/mxSjWtucayf5dZgrlfisRWjktP127ZEb3o+RKfO8MPfY5Z 4lbqPkN0ODWgtTWSSVnzvK8GTfTTUu0= X-Google-Smtp-Source: ABdhPJyzII4P1Z+7y/tVkjXTSpT3sra7Yzk539Dwwu9MWq3j1Cw7xdkN8lDQx9CCOPxa7Fauap8e7Q== X-Received: by 2002:a05:6402:2752:: with SMTP id z18mr9202912edd.275.1617276152943; Thu, 01 Apr 2021 04:22:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/12] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document Date: Thu, 1 Apr 2021 13:22:23 +0200 Message-Id: <20210401112223.55711-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> 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::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=no 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: , Cc: David Edmondson , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In an ideal world, we would all get along together very well, always be polite and never end up in huge conflicts. And even if there are conflicts, we would always handle each other fair and respectfully. Unfortunately, this is not an ideal world and sometimes people forget how to interact with each other in a professional and respectful way. Fortunately, this seldom happens in the QEMU community, but for such rare cases it is preferrable to have a basic code of conduct document available to show to people who are misbehaving. In case that does not help yet, we should also have a conflict resolution policy ready that can be applied in the worst case. The Code of Conduct document tries to be short and to the point while trying to remain friendly and welcoming; it is based on the Fedora Code of Conduct[1] with extra detail added based on the Contributor Covenant 1.3.0[2]. Other proposals included the Contributor Covenant 1.3.0 itself or the Django Code of Conduct[3] (which is also a derivative of Fedora's) but, in any case, there was agreement on keeping the conflict resolution policy separate from the CoC itself. An important point is whether to apply the code of conduct to violations that occur outside public spaces. The text herein restricts that to individuals acting as a representative or a member of the project or its community. This is intermediate between the Contributor Covenant (which only mentions representatives of the community, for example using an official project e-mail address or posting via an official social media account), and the Django Code of Conduct, which says that violations of this code outside these spaces "may" be considered but otherwise applies no limit. The conflict resolution policy is based on the Drupal Conflict Resolution Policy[4] and its derivative, the Mozilla Consequence Ladder[5]. [1] https://www.fedoraproject.com/code-of-conduct/ [2] https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/ [3] https://www.djangoproject.com/conduct/ [4] https://www.drupal.org/conflict-resolution [5] https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforc= ement/consequence-ladder.md Co-developed-by: Thomas Huth Reviewed-by: David Edmondson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- docs/devel/code-of-conduct.rst | 60 ++++++++++++++++++++++ docs/devel/conflict-resolution.rst | 80 ++++++++++++++++++++++++++++++ docs/devel/index.rst | 2 + 3 files changed, 142 insertions(+) create mode 100644 docs/devel/code-of-conduct.rst create mode 100644 docs/devel/conflict-resolution.rst diff --git a/docs/devel/code-of-conduct.rst b/docs/devel/code-of-conduct.rst new file mode 100644 index 0000000000..eac75ea6d9 --- /dev/null +++ b/docs/devel/code-of-conduct.rst @@ -0,0 +1,60 @@ +Code of Conduct +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The QEMU community is made up of a mixture of professionals and +volunteers from all over the world. Diversity is one of our strengths, +but it can also lead to communication issues and unhappiness. +To that end, we have a few ground rules that we ask people to adhere to. + +* Be welcoming. We are committed to making participation in this project + a harassment-free experience for everyone, regardless of level of + experience, gender, gender identity and expression, sexual orientation, + disability, personal appearance, body size, race, ethnicity, age, religi= on, + or nationality. + +* Be respectful. Not all of us will agree all the time. Disagreements, bo= th + social and technical, happen all the time and the QEMU community is no + exception. When we disagree, we try to understand why. It is important = that + we resolve disagreements and differing views constructively. Members of= the + QEMU community should be respectful when dealing with other contributors= as + well as with people outside the QEMU community and with users of QEMU. + +Harassment and other exclusionary behavior are not acceptable. A community +where people feel uncomfortable or threatened is neither welcoming nor +respectful. Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery + +* Personal attacks + +* Trolling or insulting/derogatory comments + +* Public or private harassment + +* Publishing other's private information, such as physical or electronic + addresses, without explicit permission + +This isn't an exhaustive list of things that you can't do. Rather, take +it in the spirit in which it's intended: a guide to make it easier to +be excellent to each other. + +This code of conduct applies to all spaces managed by the QEMU project. +This includes IRC, the mailing lists, the issue tracker, community +events, and any other forums created by the project team which the +community uses for communication. This code of conduct also applies +outside these spaces, when an individual acts as a representative or a +member of the project or its community. + +By adopting this code of conduct, project maintainers commit themselves +to fairly and consistently applying these principles to every aspect of +managing this project. If you believe someone is violating the code of +conduct, please read the +:ref:`conflict-resolution` document for +information about how to proceed. + +Sources +------- + +This document is based on the `Fedora Code of Conduct +`__ and the +`Contributor Covenant version 1.3.0 +`__. diff --git a/docs/devel/conflict-resolution.rst b/docs/devel/conflict-resol= ution.rst new file mode 100644 index 0000000000..bb25f61865 --- /dev/null +++ b/docs/devel/conflict-resolution.rst @@ -0,0 +1,80 @@ +.. _conflict-resolution: + +Conflict Resolution Policy +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D + +Conflicts in the community can take many forms, from someone having a +bad day and using harsh and hurtful language on the mailing list to more +serious code of conduct violations (including sexist/racist statements +or threats of violence), and everything in between. + +For the vast majority of issues, we aim to empower individuals to first +resolve conflicts themselves, asking for help when needed, and only +after that fails to escalate further. This approach gives people more +control over the outcome of their dispute. + +How we resolve conflicts +------------------------ + +If you are experiencing conflict, please consider first addressing the +perceived conflict directly with other involved parties, preferably through +a real-time medium such as IRC. You could also try to get a third-party (e= .g. +a mutual friend, and/or someone with background on the issue, but not +involved in the conflict) to intercede or mediate. + +If this fails or if you do not feel comfortable proceeding this way, or +if the problem requires immediate escalation, report the issue to the QEMU +leadership committee by sending an email to qemu@sfconservancy.org, provid= ing +references to the misconduct. +For very urgent topics, you can also inform one or more members through IR= C. +The up-to-date list of members is `available on the QEMU wiki +`__. + +Your report will be treated confidentially by the leadership committee and +not be published without your agreement. The QEMU leadership committee will +then do its best to review the incident in a timely manner, and will either +seek further information, or will make a determination on next steps. + +Remedies +-------- + +Escalating an issue to the QEMU leadership committee may result in actions +impacting one or more involved parties. In the event the leadership +committee has to intervene, here are some of the ways they might respond: + +1. Take no action. For example, if the leadership committee determines + the complaint has not been substantiated or is being made in bad faith, + or if it is deemed to be outside its purview. + +2. A private reprimand, explaining the consequences of continued behavior, + to one or more involved individuals. + +3. A private reprimand and request for a private or public apology + +4. A public reprimand and request for a public apology + +5. A public reprimand plus a mandatory cooling off period. The cooling + off period may require, for example, one or more of the following: + abstaining from maintainer duties; not interacting with people involved, + including unsolicited interaction with those enforcing the guidelines + and interaction on social media; being denied participation to in-person + events. The cooling off period is voluntary but may escalate to a + temporary ban in order to enforce it. + +6. A temporary or permanent ban from some or all current and future QEMU + spaces (mailing lists, IRC, wiki, etc.), possibly including in-person + events. + +In the event of severe harassment, the leadership committee may advise that +the matter be escalated to the relevant local law enforcement agency. It +is however not the role of the leadership committee to initiate contact +with law enforcement on behalf of any of the community members involved +in an incident. + +Sources +------- + +This document was developed based on the `Drupal Conflict Resolution +Policy and Process `__ +and the `Mozilla Consequence Ladder +`__ diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 7c424ea6d7..416261505f 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -14,6 +14,8 @@ Contents: :maxdepth: 2 :includehidden: =20 + code-of-conduct + conflict-resolution build-system style kconfig --=20 2.30.1