From patchwork Tue Apr 13 10:11:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12200015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27757C433ED for ; Tue, 13 Apr 2021 10:13:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97F78613B1 for ; Tue, 13 Apr 2021 10:13:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97F78613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWG2a-0007VU-M2 for qemu-devel@archiver.kernel.org; Tue, 13 Apr 2021 06:13:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWG1M-000678-2s for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:48 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWG1K-0004k0-PI for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:47 -0400 Received: by mail-wr1-x42b.google.com with SMTP id w4so12103631wrt.5 for ; Tue, 13 Apr 2021 03:11:44 -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=BSVA5lz0rvdv4X13phsk6dqNsxhbZZ3liG9zO1ECjZA=; b=L7QRcJB3oehdqfYtvSCnZrhLJdHm7Ivu/ad4m49/NHXh5b8rU5JwAZrcm7gTUix999 7Ps7BXo4ah6TtHA7De4CE+A3Rzi50NRNVuh1hko6IBGr/dlfaVjTDLQH1QKWFOHRaVpF XMqsOAmQFnsQ9AvV7YhpHhSOlKrvULBJd4UKX77IIsCU9nUl4reuJgTAPoFQDvFJgJMx bpw6WpUj6kERCWOeJjSYzN9hrykbZPkxTiQ8IxanruxkZ6/sqkukF5/wmszXDV+H0EgO wm8uV5rQ1HsmGFywpCLm+EkJXUP4cDZudrnjstgAgL+ivNEzlzM+fap4uenDiB3654cF FMXA== 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=BSVA5lz0rvdv4X13phsk6dqNsxhbZZ3liG9zO1ECjZA=; b=TYjvVxzBgANfSS1Eh+SrtA89XDW9UDPb2SvXJSsaBJuLrNqz+WC4xh1zd6opg4LBfF 7MJEYypX5g4nDu0FJb0cz1Ei7OXGqiJW/EOmSVeZ+8lXxkee0Q8qpl2mKQCCj8cAh/hz s8w2HWGy9xBY5P62LXhNA140WDMlloPh3vHkRBh5ICewoRIA/KiAx7IAbbHtgg0VlXOB 7XPpjwPehA5MzL0AKlUMxc1dqpyEYT4O9g2xo2HSpT2E/WHFMNlVC6rqPQndctzleV9C A98mEx8MiOmF7hs4E9NlKvOflWjh6PFBABs9g0qa+n2ekfdZiux+CT+0uED0WE/7poaT J2Sw== X-Gm-Message-State: AOAM531mAsUEWllbBB2X5PlnIQa4QtwPU6rk2kjVUOCb+oKb+LUoXSeH GGleZNX2v54uaFmMpmRv0JE+pQ6Xhr0= X-Google-Smtp-Source: ABdhPJxJSorTZf/PpQajR7gHmtaz2VDGNM7GQj+IE2PRzGWk6qyjZp7zRF3ip9IsLiJ1NFPBfbQPvw== X-Received: by 2002:adf:dd49:: with SMTP id u9mr19155899wrm.337.1618308703377; Tue, 13 Apr 2021 03:11:43 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id d2sm19337136wrs.10.2021.04.13.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 03:11:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/3] hw/isa/Kconfig: Add missing dependency VIA VT82C686 -> APM Date: Tue, 13 Apr 2021 12:11:29 +0200 Message-Id: <20210413101131.3480173-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413101131.3480173-1-f4bug@amsat.org> References: <20210413101131.3480173-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.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.25, 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: Aleksandar Rikalo , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" TYPE_VIA_PM calls apm_init() in via_pm_realize(), so requires APM to be selected. Reported-by: BALATON Zoltan Fixes: dd0ff8191ab ("isa: express SuperIO dependencies with Kconfig") Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210302080531.913802-1-f4bug@amsat.org> --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 2691eae2f0c..55e0003ce40 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -48,6 +48,7 @@ config VT82C686 select SERIAL_ISA select FDC select USB_UHCI + select APM config SMC37C669 bool From patchwork Tue Apr 13 10:11:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12200017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C7BCC433ED for ; Tue, 13 Apr 2021 10:13:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8651613B7 for ; Tue, 13 Apr 2021 10:13:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8651613B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWG2e-0007dF-1r for qemu-devel@archiver.kernel.org; Tue, 13 Apr 2021 06:13:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWG1P-0006Et-Pq for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:51 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWG1O-0004li-9E for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:51 -0400 Received: by mail-wm1-x333.google.com with SMTP id u20so3863494wmj.0 for ; Tue, 13 Apr 2021 03:11:49 -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=cHETbRXCR+t9b893UAfzQ7dYkQDMKdnYYi5AYTvl98I=; b=cqUY481mlxn96npT+uSN34Rvjbgv89GqcMHxNiDNvio4UMWjC42jOnuqwCtXSrRi6f KjqO6FWrko5iSyQX5FrGO37Wtk0WIyFnJCqbyID14X3GqVCRI/eXCI0Zul+czpATUcEb OwIW+IcRi4mCvZcG2dCLro6LkqPOk3KvbXtH+e0DRqevcSgbvlI31Ec4T6orGWukfZMz 0+e+4RFHdWdjjHh2w/M0DizQiRc9pmNxl/EX0YPevqJbklO5Fn44jWTvqPzARNziGMFU oo0xWR7rK0nm7QxOTnQ/tzx+lOuq2S9uWDa7qPmzlV57l9fJqWfS8yljMyMFP8pyVr6h 0ODg== 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=cHETbRXCR+t9b893UAfzQ7dYkQDMKdnYYi5AYTvl98I=; b=KUR9zWRGOy3SvCiFPXJv/lPYb/a+4Mb9KsrFXjTlYIy4y5kVuEZ3EwLrwIA4EQ6VBI hcg9ewQVXNEAGE/mfDrgquCzu0xrxpZGyD1Hx71oFZn+6Ip6tWK8JothnkvM5/CXQWfu sj/FX95fI5MlEZbgpxPuzJd2cpWrICQOyn5hkLpeTwt5TRBXikKXdeH1mFgFn246wEu7 pGC5Vz2l5bw8Y9fIwgv4hW5AalyXzyMyrQHnnCXZeraXNAQHZCUmwmmHPVYxgq0NTZhn fygXO1mC4fTntaP2YwKgIoLOtX2ijcyCx9NcghKpTVG/f1FiWSBvm541mkCPxVIVpdsU SOIQ== X-Gm-Message-State: AOAM530nIaq2ZziyzbQglz4irs2OcgLxqfUwtZjknnGuFTyrt0iSKG7F wOMLdLUBGBu92GTU+0z7Jy/d4a05ILQ= X-Google-Smtp-Source: ABdhPJx1dJ5R3otNWtTTxXzDjsWhxu/smbj03EhH18V2hyArUlUcXSibY3Riq3ZH2tb//9eC6BAH4g== X-Received: by 2002:a1c:750d:: with SMTP id o13mr3333132wmc.76.1618308708156; Tue, 13 Apr 2021 03:11:48 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id p17sm1851536wmq.47.2021.04.13.03.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 03:11:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/3] hw/isa/piix4: Migrate Reset Control Register Date: Tue, 13 Apr 2021 12:11:30 +0200 Message-Id: <20210413101131.3480173-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413101131.3480173-1-f4bug@amsat.org> References: <20210413101131.3480173-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.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.25, 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: Aleksandar Rikalo , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" , =?utf-8?q?Herv=C3=A9_Pouss?= =?utf-8?q?ineau?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When adding the Reset register in commit 5790b757cfb we forgot to migrate it. While it is possible a VM using the PIIX4 is migrated just after requesting a system shutdown, it is very unlikely. However when restoring a migrated VM, we might have the RCR bit #4 set on the stack and when the VM resume it directly shutdowns. Add a post_load() migration handler and set the default RCR value to 0 for earlier versions, assuming the VM was not going to shutdown before migration. Fixes: 5790b757cfb ("piix4: Add the Reset Control Register") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Dr. David Alan Gilbert Message-Id: <20210324200334.729899-1-f4bug@amsat.org> --- hw/isa/piix4.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index a50d97834c7..b3b6a4378a3 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -93,12 +93,25 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xae] = 0x00; } +static int piix4_ide_post_load(void *opaque, int version_id) +{ + PIIX4State *s = opaque; + + if (version_id == 2) { + s->rcr = 0; + } + + return 0; +} + static const VMStateDescription vmstate_piix4 = { .name = "PIIX4", - .version_id = 2, + .version_id = 3, .minimum_version_id = 2, + .post_load = piix4_ide_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIX4State), + VMSTATE_UINT8_V(rcr, PIIX4State, 3), VMSTATE_END_OF_LIST() } }; From patchwork Tue Apr 13 10:11:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12200019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A5D8C433B4 for ; Tue, 13 Apr 2021 10:14:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1CF8613B7 for ; Tue, 13 Apr 2021 10:14:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1CF8613B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWG46-000179-Tp for qemu-devel@archiver.kernel.org; Tue, 13 Apr 2021 06:14:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWG1T-0006NT-UC for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:55 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWG1S-0004p7-FS for qemu-devel@nongnu.org; Tue, 13 Apr 2021 06:11:55 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f12so15888792wro.0 for ; Tue, 13 Apr 2021 03:11:54 -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=OjQxr/jFzbomVhE1MW9X6lY8//4Qu15uyh6N5jl5uwI=; b=fWg2n4QMGc/XXR8TtpILiRQdgOgZQHoUDz1QoS3jf2Pmj0u4btAIbBI+ap6Y9rp1xg EBOtngIp+fDjsvYtcmzOuRB7Td8ktrB0iyfYJdgURpD/HPi+gNSHnN1ieYx3NBvzyX52 n7y9UXdGt3V9sQ0/idZ4QXM3S4N7Bv+AgZ6uGZvSJumzD1v438+NxRQ2gWKBF1RTAz4C 8z9AfaLWUztnbCbND+zQHHaPfocVqXCvVhH1GOPxnuCcGtszDdIP8lRSWGHHIuj9z+aK KbsGeiXVC+QOTKT60IdfCHbApVX4SdB75CnwDGeR/dQaHeggHJ6lK/G5v8xZ6V9fHOaO 9mhw== 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=OjQxr/jFzbomVhE1MW9X6lY8//4Qu15uyh6N5jl5uwI=; b=ipgF5bf+O5zln1gCAHQxluWScuCx+0hiM0r6snpNHkpJY5NwqvIY+zmjhFPSTxYIba GIuIUKVONBra8PNiFw34C8RXMdDgUOjnWXFyfB37mb2jn/lMLgCJtaeIMqYbMmUmurGw deE00fnh8dEdIremgTP4pP4Kr1Cs+qh0YA6qOy57h6QFF3yqpcJms355rIZJ/U/9RbbV gDhD0qLa/tJdGTzJUyM3BeYb4dqVoUuueYYjHdv3QRv/ZdrEGA4+L3xg0+6wCj+LvrUJ HkCEtUoDkRIttx+hckyC9aUud9x/oDpATcpBBDTYdg22VSeV61H1drjslxpPAw+Hlok7 1CNA== X-Gm-Message-State: AOAM533Qo/W9deYtCVgoFmBilea5VD038O1cLsiT3NKos9det6E1K0Gk I8uZAlKGOjw0JIQN/eSJLIMS0LkFlmI= X-Google-Smtp-Source: ABdhPJxnYNeDJkqc6fq5vGm7SdWiXySvTbDgd1wOSmYrl7TH/hb8Vikfsy3IBJuygD+MoMjD8wUk5w== X-Received: by 2002:a5d:658c:: with SMTP id q12mr35645779wru.30.1618308713052; Tue, 13 Apr 2021 03:11:53 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id x14sm19275847wrw.13.2021.04.13.03.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 03:11:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/3] target/mips: Fix TCG temporary leak in gen_cache_operation() Date: Tue, 13 Apr 2021 12:11:31 +0200 Message-Id: <20210413101131.3480173-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413101131.3480173-1-f4bug@amsat.org> References: <20210413101131.3480173-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.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.25, 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: Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Fix a TCG temporary leak when translating CACHE opcode. Fixes: 0d74a222c27 ("make ITC Configuration Tags accessible to the CPU") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210406202857.1440744-1-f4bug@amsat.org> --- target/mips/translate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/mips/translate.c b/target/mips/translate.c index c518bf3963b..71fa5ec1973 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -12804,6 +12804,8 @@ static void gen_cache_operation(DisasContext *ctx, uint32_t op, int base, TCGv t1 = tcg_temp_new(); gen_base_offset_addr(ctx, t1, base, offset); gen_helper_cache(cpu_env, t1, t0); + tcg_temp_free(t1); + tcg_temp_free_i32(t0); } #if defined(TARGET_MIPS64)