From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930789; cv=none; d=zohomail.com; s=zohoarc; b=fH/zrWIk+LtYgrM6gljwgeKZXE9LVsmZOZ2gpKZnCfxAD4XqwJmjQPX/xwW3xHY79x/qRdyn+LdiOqjxTFmR0lUs+wVnsKW/WiAlMSeLnTc5K6H0UEW1eAMlX800NciRmMZXybRKbtqOvD9Rpcvx+J/m3xzhQaWblVfNrqoFLo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930789; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BEt+bnIEYXM3eqMtGHzHP7POB7seAo+l58iXMkd+kYE=; b=fDrZR1gRpq2cPmj5OoE/tISDf5tRyvbZ5/D0DpZinBvL65oIx/mn16dzXm2IlylxSDq6BOCHTSfbjgjdVUNwg836azjd+ybq3MrAlqNbfbhr5aeKq5tTm+lcspP9/04b1TkrltKSlf4L5w33RzlLcUkHbgDKHtvrHjTnR8mzAdk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930789122551.2693720710151; Wed, 20 Mar 2024 03:33:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFL-0007VE-TX; Wed, 20 Mar 2024 06:32:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFB-0007Oq-BX for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtF8-0004GY-9K for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:24 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-120-_OAEaWVrN4Gff6OEWnu19w-1; Wed, 20 Mar 2024 06:32:19 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a46df460e77so134054366b.1 for ; Wed, 20 Mar 2024 03:32:19 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id nb33-20020a1709071ca100b00a46da83f7fdsm2006865ejc.145.2024.03.20.03.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BEt+bnIEYXM3eqMtGHzHP7POB7seAo+l58iXMkd+kYE=; b=AgnIedo4dcqzK5JrHUhIzpEijSePxNVRtVIdnshr0dEuTmoyI7QfBK6smIn/4odxK2vhtA um7aV+bSlTuKOQ5LAYvYj+2N/6AUbVG8RypZziAtA38Xc4PEhbHfa9B/7rMCV5C5i0kMaJ QXOyvVuWFC+C+e9JRd3pJdkAtzHv2Pk= X-MC-Unique: _OAEaWVrN4Gff6OEWnu19w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930737; x=1711535537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BEt+bnIEYXM3eqMtGHzHP7POB7seAo+l58iXMkd+kYE=; b=CjRuit5kM95/94GJy2N2Il6y+TM4U2HjXTVA/sMGO0VHlGDUl1hyTloErEg5NweIxg MAFJf2ffhrAjcv7AVceGYP02JdkuDXlZPfMF4qYLZsO/ly4o42bjf5GQ1eRkThIH0oLP 5AjBWQ+j16JjWAy9juXcDMUxW2DJhsG4CI2LZA4n9Dq9ixl9q9s+exbhe5HetzvAGTXt 1Ha9koMGbtcr0hUJdOEjNFQHPWQ2/KyWPPUnv0cnSB4N47Af+102grZrzYENBgjHvWnf yiSLv3WYSs5IYS3h8vzJlhSLe0FjMZ0isXQYRVtUyUfJvDtOMHcNxyTfLqR8/V70W5ri ETjA== X-Gm-Message-State: AOJu0YxmXTLMRIT1m0kyvjuwMkRBo0lkQb0Y7suZxDAabsymHwZQ8gXa /Qi/nvcVLPfyrvaG7v2tNyNTrMvj+dHDOget6Xy0eyPI4Ozsm1IhkKdviP23gpS73R5Z/S10wRw lWSbrxLatUO3Ygh7sTTyRp5SGZ4qDthf5ZHRQDx2oal+aRTofs2zJJUbNULC1BPCwUoM3lQE+1W oeTaGeyzetH8AYighOWrGywW2a6Eow+/zlvyuy X-Received: by 2002:a17:906:3914:b0:a46:c4c6:38 with SMTP id f20-20020a170906391400b00a46c4c60038mr4751841eje.10.1710930737479; Wed, 20 Mar 2024 03:32:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGieTmAnLIk/KY+zYVyho0SOANxc17Kgop1vR2QER2H5m2ykn0Vx9quwzGaQdUqThwNh4USiA== X-Received: by 2002:a17:906:3914:b0:a46:c4c6:38 with SMTP id f20-20020a170906391400b00a46c4c60038mr4751821eje.10.1710930737004; Wed, 20 Mar 2024 03:32:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-stable@nongnu.org Subject: [PULL 1/6] target/i386: fix direction of "32-bit MMU" test Date: Wed, 20 Mar 2024 11:32:08 +0100 Message-ID: <20240320103213.1048405-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930790532100001 Content-Type: text/plain; charset="utf-8" The low bit of MMU indices for x86 TCG indicates whether the processor is in 32-bit mode and therefore linear addresses have to be masked to 32 bits. However, the index was computed incorrectly, leading to possible conflicts in the TLB for any address above 4G. Analyzed-by: Mark Cave-Ayland Fixes: b1661801c18 ("target/i386: Fix physical address truncation", 2024-02= -28) Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2206 Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 2 +- target/i386/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 952174bb6f5..6b057380791 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2334,7 +2334,7 @@ static inline bool is_mmu_index_32(int mmu_index) =20 static inline int cpu_mmu_index_kernel(CPUX86State *env) { - int mmu_index_32 =3D (env->hflags & HF_LMA_MASK) ? 1 : 0; + int mmu_index_32 =3D (env->hflags & HF_LMA_MASK) ? 0 : 1; int mmu_index_base =3D !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP64_IDX : ((env->hflags & HF_CPL_MASK) < 3 && (env->eflags & AC_MASK)) ? MMU= _KNOSMAP64_IDX : MMU_KSMAP64_IDX; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9a210d8d929..33760a2ee16 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7735,7 +7735,7 @@ static bool x86_cpu_has_work(CPUState *cs) static int x86_cpu_mmu_index(CPUState *cs, bool ifetch) { CPUX86State *env =3D cpu_env(cs); - int mmu_index_32 =3D (env->hflags & HF_CS64_MASK) ? 1 : 0; + int mmu_index_32 =3D (env->hflags & HF_CS64_MASK) ? 0 : 1; int mmu_index_base =3D (env->hflags & HF_CPL_MASK) =3D=3D 3 ? MMU_USER64_IDX : !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP64_IDX : --=20 2.44.0 From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930785; cv=none; d=zohomail.com; s=zohoarc; b=IG64LQR20zkhCK80BqIsNV0Tp2ttV3TBlFtB0Tv4vvzKpZf3yux3cbbKle1Pk0t1UsugF/C1c2Hn0a2cOoQKY+O41CGz5SnSoR49ODN24IoQH4SBa1z+dXFTmtnuaJuUCFwHHQ0SwLrpWIaUPPwsT0s14dC/M6Fd7+41ef4bmQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930785; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=NC6VFQI3BITyKwvW9iQb3R6XEVn7amreYFP68LSukmhqRiCieRo1RY2unLZ8y116fCHdfOzsVRnF+O6jLxKIlLVLuawjWoajHV8uAz+3EX5AfNSgyb4RlYXBIjwRakNgTtEMnITF2rQKaTAfsJpbKFm6M9ajKSJIxEEfTXxDnCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930785482449.8369934133856; Wed, 20 Mar 2024 03:33:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFP-0007eT-24; Wed, 20 Mar 2024 06:32:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFC-0007Oz-GZ for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFA-0004H8-8u for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:26 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-346-9fW11EPxNaGrrZPuTjM28A-1; Wed, 20 Mar 2024 06:32:22 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-568cd600ee6so1788938a12.0 for ; Wed, 20 Mar 2024 03:32:21 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id m24-20020aa7d358000000b0056729e902f7sm6762655edr.56.2024.03.20.03.32.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=i/EkhbselR9k2LjGput0c6G8sfI6+Gs42FmPUulig0e75mzN5O/IjizMAycQKwSfjGMA6y h+ONVMDHHxeP9jcy6R0G1x8WgHeLx3FoDzWbr0OtAZDj3o8UiLF4THyqt7JO9KAG8fSakK ycLPlbLLt74UubEdXD+MhaI8F/1gfW0= X-MC-Unique: 9fW11EPxNaGrrZPuTjM28A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930740; x=1711535540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=fk06wZ6qGU8PSgazrTHYuNmrziKqpXdxvSKlrpqkQ4Zm6xCj4K60CW8peFSSYlwcbP A0veuJYZ1GojVuNd1FEZGwfjC50dKN976uUYHqQaavmq9PEoGa9nF7sazv2dMTvF+2f5 6skUrf2S7a4Cre2iyenqKoYxu9FCM8MMmKkbJkGVVi8B+C2bzWD3Y8B0Q+JDaBoy2Ip5 gT5/Ly5GIWJ7KRzh3lAY8LK8gdnA9nXQA2qV8h+KdpJi6jD4n6PTjHx9S8t0tIEV53e1 k/qggveAmgOUlna28S6VbEOffJLq6Rdd9ve7V9u2P1YBch/fcYPm48MbXtMHkoC0mO+7 2ttQ== X-Gm-Message-State: AOJu0YwMJQxM4CunTmSpSq+LsX+9EvhGxYNmLBycvFBUfzXhn7WCG2n6 PCub0qlWpm1qBTMSIRTRflD2CVVVdSnf4VqHzqO6zXIkzS0xHW4XodkXaQYtVpGFQCFSrn2Mdxh OmA2Hf08SScR7xQivz4zsVzAacCk5cxAnOGPLxKwBIVPKlhFikNQgODfXWjJYRjq83Oi2mAlzDh B1dGg+NZvjlRIn9TUev46o4OMCTWgXZOsVjZSH X-Received: by 2002:a05:6402:2486:b0:566:c572:6fa0 with SMTP id q6-20020a056402248600b00566c5726fa0mr14862899eda.15.1710930740271; Wed, 20 Mar 2024 03:32:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHelUNNEi5ltwH4SQQLwP2l2wU2AlmxsZ+ZlYfh6zaUmwYi/FqO2XReLVo4voOWKtY/dcGzIQ== X-Received: by 2002:a05:6402:2486:b0:566:c572:6fa0 with SMTP id q6-20020a056402248600b00566c5726fa0mr14862878eda.15.1710930739786; Wed, 20 Mar 2024 03:32:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/6] vl: convert qemu_machine_creation_done() to Error ** Date: Wed, 20 Mar 2024 11:32:09 +0100 Message-ID: <20240320103213.1048405-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930786523100001 Content-Type: text/plain; charset="utf-8" Allow using Error ** to pass an error string up to qmp_x_exit_preconfig() and possibly main(). Signed-off-by: Paolo Bonzini --- system/vl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index 70f4cece7f9..0c970cf0203 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2653,7 +2653,7 @@ static void qemu_create_cli_devices(void) rom_reset_order_override(); } =20 -static void qemu_machine_creation_done(void) +static bool qemu_machine_creation_done(Error **errp) { MachineState *machine =3D MACHINE(qdev_get_machine()); =20 @@ -2684,7 +2684,8 @@ static void qemu_machine_creation_done(void) } =20 if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { - exit(1); + error_setg(errp, "could not start gdbserver"); + return false; } if (!vga_interface_created && !default_vga && vga_interface_type !=3D VGA_NONE) { @@ -2692,6 +2693,7 @@ static void qemu_machine_creation_done(void) "type does not use that option; " "No VGA device has been created"); } + return true; } =20 void qmp_x_exit_preconfig(Error **errp) @@ -2703,7 +2705,9 @@ void qmp_x_exit_preconfig(Error **errp) =20 qemu_init_board(); qemu_create_cli_devices(); - qemu_machine_creation_done(); + if (!qemu_machine_creation_done(errp)) { + return; + } =20 if (loadvm) { RunState state =3D autostart ? RUN_STATE_RUNNING : runstate_get(); --=20 2.44.0 From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930802; cv=none; d=zohomail.com; s=zohoarc; b=TK2H83Na7IYcL5WIYcRwvYJRrw7Aq5D3Sw8fuwixILehyHZjhNXlptS+Pzx2lWmpaDf4UTsKDjkuo5LW7+t0+aWAjRV5f2wVYmcvgMODZg6S1CHDrWMFRgwWfXpfVb7fRtJCtEqNwca2vXty2VraJ5sS+czi5WEdB1aySnQqb38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930802; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=TJjqOAFTCPJQwJBApDGw8XyG9n4ZFOpcZP/DpSbnm10=; b=FbD2XNARQVEuYjxEjVn/MgHGcTAUWKD/X1JFQoVPKjHWoup9L+cnlGB9z1IQYv2Ywt3moCHl9FgkD3YQYlIfN8OLqUfUZkTdM8sJWEd4ZpFaKs8hDlKyM3/oqex6sNt51ZQwj9PujISHQGbNkdoZq4JU8sIkj+UYgSsx/t5yl50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930802319964.4361120926108; Wed, 20 Mar 2024 03:33:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFM-0007Yk-PN; Wed, 20 Mar 2024 06:32:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFF-0007PW-73 for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFD-0004Hp-GQ for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:28 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-SvetAhwMPDycPIb_vnnqcA-1; Wed, 20 Mar 2024 06:32:24 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a46b82df33cso215929666b.0 for ; Wed, 20 Mar 2024 03:32:24 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id ww2-20020a170907084200b00a46cc48ab07sm2843130ejb.221.2024.03.20.03.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TJjqOAFTCPJQwJBApDGw8XyG9n4ZFOpcZP/DpSbnm10=; b=A4/nZtkvA+fH2D6nmhUhR8/ZeUUv6sz+msg5FLt8fm54plJCKDxgJ6SXVlVV/JzPc16bjc 4XGELRezn81FlbDLjfubzI3ASAc6/BU0JMv9P69ckcqmfruYNzvIv8EfISleKlD+vGWiL9 hZnWHAIxNm5yLF+InV9ySJu8Antn8IA= X-MC-Unique: SvetAhwMPDycPIb_vnnqcA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930742; x=1711535542; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TJjqOAFTCPJQwJBApDGw8XyG9n4ZFOpcZP/DpSbnm10=; b=vJ4DHRDBopJG9DgApuCYzJkEZqb3QKAp79YmqGtU0QcNdyc2ZpT5WZx1CWnKwqp5Ol yBcwCGzLlQZ6q3BrOZiF3Y9dQZgQr2XookUtTAM0mMF/qwmlz0p0kk7R8iJ2c0pXUcOz Q9b0d0CFqLlpI7wN/o+CfCv+3wKCEt8kXKZ58CqSkUuVUIHXpM9zyXNJpqifzjISd5XS bdFOWQCC81ru7wy6jtIVvLPQJVtuqgMTN0sLdbfKx+RZtq5wjMg53sXQTDTX8mi3+f7T aQePvEbIvLiCUYPYrS0lfXn8AEbXBKVTbIzxLKpNgM2KkUEju6oLRSbN9/ENUO9FUPW/ wCAg== X-Gm-Message-State: AOJu0Yy5awba4mFpjH/4Giv9iiHI3FQPb4R93iGZUfIMXjiChHgT7Wb1 fgf9F+/MXQJBgVQaiYhl5R+mwDCW36Qfpv3m/nLJMHQmQvY7S2YxFBuyfUENirNPxKIMe9C9F4l KWBzFSw0iuc62BMsb88qk8FdZJtnAse2sjjL0DpTxl5mhmYyI5KlksyI+YXoHkPd8L2Hq98PxGU JfQL/LHyAD8iDy1bOk5f/q092l7G9HGrmLhvfu X-Received: by 2002:a17:907:971c:b0:a46:9a9e:f3b0 with SMTP id jg28-20020a170907971c00b00a469a9ef3b0mr11742603ejc.67.1710930742645; Wed, 20 Mar 2024 03:32:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFaEb0C9fzby7FgomWCCS7qA66uyuh7JtG9q0oEd/uBa++hL9BfNW+/Ka90JNRZGkBNIZfCMQ== X-Received: by 2002:a17:907:971c:b0:a46:9a9e:f3b0 with SMTP id jg28-20020a170907971c00b00a469a9ef3b0mr11742593ejc.67.1710930742275; Wed, 20 Mar 2024 03:32:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/6] vl: do not assert if sev-guest is used together with TCG Date: Wed, 20 Mar 2024 11:32:10 +0100 Message-ID: <20240320103213.1048405-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930802630100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- system/vl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/system/vl.c b/system/vl.c index 0c970cf0203..c6442229824 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2676,11 +2676,10 @@ static bool qemu_machine_creation_done(Error **errp) =20 qdev_machine_creation_done(); =20 - if (machine->cgs) { - /* - * Verify that Confidential Guest Support has actually been initia= lized - */ - assert(machine->cgs->ready); + if (machine->cgs && !machine->cgs->ready) { + error_setg(errp, "accelerator does not support confidential guest = %s", + object_get_typename(OBJECT(machine->cgs))); + exit(1); } =20 if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { --=20 2.44.0 From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930767; cv=none; d=zohomail.com; s=zohoarc; b=iceVcLnBZtlz08UZTQg4FBYEZ+/Twd7yEIRTiocdyuPqy4v2SeGD/FULi4xc+nmya9KN9+vGN3dmRYbPu7+wXgNLFrwdUKMkEhSMdkrZ1sIYDgdOBSSAyj8hboqv43hnvElceiujRpikGOc1a0ENIeWsUlUp54WHBzbWJ3hcUAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930767; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tP3AQ3pbPz8m6UOga6Zsv2ln7wozO0aBuqOElcXzXaQ=; b=FR02cg41LiywHkG2aE8QAtwY5aAJvdGKczGS86QgBI+vANXWjns6skSVRh5F5QrFSDAPGhdhM3C1jQhgs33yp6kmp/Dv21F/4p4AoqaeoyBEvnIuU8ZpuO2BefMvPJEUld0i1/3wpOK6yS6ooO7nadt0XkwSUvh0mHxQzcqn1xg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930767585505.6757931718115; Wed, 20 Mar 2024 03:32:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFN-0007ab-BO; Wed, 20 Mar 2024 06:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFH-0007PY-Jd for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFE-0004IC-HH for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:30 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-x3VMJdPkPFC8G37QMFCYJg-1; Wed, 20 Mar 2024 06:32:26 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a46fd54fbc1so5647266b.3 for ; Wed, 20 Mar 2024 03:32:26 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id cn25-20020a0564020cb900b00568c3a2f4f8sm4527242edb.74.2024.03.20.03.32.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tP3AQ3pbPz8m6UOga6Zsv2ln7wozO0aBuqOElcXzXaQ=; b=Q7nLzq+T27FMwKVZr9Zt5cHGxDtskenD0Tir7lgORPzg/pEwYnZZ2Ss5ZpLka6BTmhv52Z 7rhenb8BhhLhUjHq8TvxTJkHl2Hv3Hnk8Yql6r94uUnQ28oVUzhxzAYrNFgZ/P+AlTUbQk pd9n6zzBOY+o1n3kWCrSxm4bNJMDEJ4= X-MC-Unique: x3VMJdPkPFC8G37QMFCYJg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930745; x=1711535545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tP3AQ3pbPz8m6UOga6Zsv2ln7wozO0aBuqOElcXzXaQ=; b=Y2p+BHEf2gHIEq5aVQIoIeOWzPFUSPoTD5Vy3jS0aVT+PG1cULmuwBWR18dwXt97Jl coHLd4HnHVMjl/AFVstwVwOkb8PyYBTZdKJNDmzvlDoxLc5S8/cZkjWslINEE4w0S8zI Mjl/I9/A3P40VbHifD5GoHTr4PZ+OCAPl9pHD9P2e9dQ8D3aMuVO3wVZBLk/LwwEsSxZ d6D9wg1dDljZv5rkpIZpahxcue3RU/I4nUCambohWJi0p3ic0qd3bcNLoQ/Gr5PkKgy7 orAv0xTlGAAJ6leSFIMXcWqoXielFm6RXnPyRzF3h4MoRxLsyNzm3QHdpgtOBnm2M4A6 maWQ== X-Gm-Message-State: AOJu0YzZSMhvm4mL7Qx+Fko0Jw99oqwAdI48nwTsZsKWY6Dlcsf2cc1d yvrdwr7Bp7jcGzxDIBCjj8vSQcHKsW+NDAQtTns8FruL2C8rObMkcBZorhcvObR/i5AIVkKbCWr 4rPZV+xIqpCRu6/8fOiqdQ/hCD4yKsMYEPLsEIzSvlbLGdFm8GUcHk0jOYVV4W0u3IhCun0W4dt gI/jOPTtH59YC8jy+6T7cVh+K6TMtJNaQHX8T0 X-Received: by 2002:a05:6402:528c:b0:568:c624:9177 with SMTP id en12-20020a056402528c00b00568c6249177mr10709816edb.35.1710930745156; Wed, 20 Mar 2024 03:32:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1pzCibz8Uhdu+ZMuSMseOfPsBi64Hi7C2qmjOdz0qzDHzGrZkEXyOGQJV7LhNxDpiTboHKA== X-Received: by 2002:a05:6402:528c:b0:568:c624:9177 with SMTP id en12-20020a056402528c00b00568c6249177mr10709795edb.35.1710930744698; Wed, 20 Mar 2024 03:32:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tao Su , Xiaoyao Li , Markus Armbruster Subject: [PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce() Date: Wed, 20 Mar 2024 11:32:11 +0100 Message-ID: <20240320103213.1048405-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930768450100005 Content-Type: text/plain; charset="utf-8" From: Tao Su monitor_puts() doesn't check the monitor pointer, but do_inject_x86_mce() may have a parameter with NULL monitor pointer. Revert monitor_puts() in do_inject_x86_mce() to fix, then the fact that we send the same message to monitor and log is again more obvious. Fixes: bf0c50d4aa85 (monitor: expose monitor_puts to rest of code) Reviwed-by: Xiaoyao Li Reviewed-by: Markus Armbruster Signed-off-by: Tao Su Message-ID: <20240320083640.523287-1-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/helper.c b/target/i386/helper.c index 2070dd0dda1..23ccb23a5b4 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -430,7 +430,7 @@ static void do_inject_x86_mce(CPUState *cs, run_on_cpu_= data data) if (need_reset) { emit_guest_memory_failure(MEMORY_FAILURE_ACTION_RESET, ar, recursive); - monitor_puts(params->mon, msg); + monitor_printf(params->mon, "%s", msg); qemu_log_mask(CPU_LOG_RESET, "%s\n", msg); qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); return; --=20 2.44.0 From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930806; cv=none; d=zohomail.com; s=zohoarc; b=ZE8awx+03i+Kt/YkpfVrI2eid7q10etTZqiq9XiuZeiQRAt6pHTwxCgyF/Emb9a5cq5JtMC8gzSW6cwGcjX2NceLkC2JrYGS7o5tfSXoBPEXq2P9kk5LzpsPKfpehWSiLAgZkY85uoSHQPdGuKKVR+Svf9P7N5kaKfoAQF+JaRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930806; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UPsOwUjjkUpLlUz7R/yokVcshcFaiD3ddgkd17IA1sk=; b=gMm9CONXTcYGveNWzm27Ab9BvZfXRubSkASxf/NOxnaG5U5gkUpayHGwdshFJYR1p8JU6h4uMCbdA74bWMKy/Ajwz2Og6aAOSosrMv7EBsd1r3EuN750W0jyzmpePfsVtr0PVL7CXVkKt87CKnJqtmeBz7VfTukt1L4gFD2ns3o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930806939335.447570542279; Wed, 20 Mar 2024 03:33:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFN-0007bH-Fh; Wed, 20 Mar 2024 06:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFL-0007Rg-0B for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFI-0004J4-M6 for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:34 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-151-FI7ZvslKNoKeglyOAG6YeQ-1; Wed, 20 Mar 2024 06:32:30 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a464f5e2499so289071466b.2 for ; Wed, 20 Mar 2024 03:32:30 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id q21-20020a1709066b1500b00a461e206c00sm7014509ejr.20.2024.03.20.03.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UPsOwUjjkUpLlUz7R/yokVcshcFaiD3ddgkd17IA1sk=; b=ArmQ6Wc3l9yjWltg0KY7obwvnC1H3j4dInwY7ZnYTdVi25VP0KJVQnTiE+uprEQDefj75p nN3TstVd4Ruu6MXnOEQBZq2vDLQhdu4M6n3xVroAY/WnPurnP89FpgKh5DNloc+/n4LjUw B7xlUeH9sQV3Uk8YkjbLkBgU982tbks= X-MC-Unique: FI7ZvslKNoKeglyOAG6YeQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930748; x=1711535548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UPsOwUjjkUpLlUz7R/yokVcshcFaiD3ddgkd17IA1sk=; b=nrb8/5D/++XFaydedRGpKUB4rGyUFCn7u8YAyZKwBcIknSL+qenpPvjczJBDS6zxAE Byssn3tC5eP6z9x69F9BA1ib7m47LDtZZtmsX1q5N41txFtVUNfghPMQKMb9nJYpMy5t ucWEdROJw0CWOhGuVN1ma0XmKi9Oc8c0n+Wrv/Fbz2yAKuDqJ6WI6gLJHJ3DkkSe3MZB Hl/tHvHWxe4VvGlQ7gUMTa98o+Dhif8slM3eHNoLaBkLoLhS6JCGxyKfWfyoRksm7ecP Odg10pDOs9BKFQuRosGw7F1D8+DNoz/HRQHnLaRTwGfn6U26QYIR7ldSqvf/5NuRbXho wcYg== X-Gm-Message-State: AOJu0YzFCW6ASmqsq2F0JA23uNZPyb59+ZAKU/36eiRm3falHdWt90Vp Vzfw8VueXuvr9KqijCBJlVubWl+WOnC02nD0o4DEuAcpSdvjoaE71/T6GpcKPqFbOb+/XFbu1/4 71NN2U9LvANk8S5G8YAOL7vyJU6DipYp1Cc7jeTKzV+tFW2hewojEvbbca9+MLcqiYxl4DOc1ex PHH7BXCX82bXe0nnAHToqYjpDBFMy45oS9EJT8 X-Received: by 2002:a17:906:6b09:b0:a45:ad29:725c with SMTP id q9-20020a1709066b0900b00a45ad29725cmr3219893ejr.62.1710930747834; Wed, 20 Mar 2024 03:32:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0a1lo5Hin/qhEUKgl4XtFBu6GZCGkqbtwLofH0ikc5uyOvHg5nw/iJB7GWu4RCaIX7nx/vg== X-Received: by 2002:a17:906:6b09:b0:a45:ad29:725c with SMTP id q9-20020a1709066b0900b00a45ad29725cmr3219885ejr.62.1710930747540; Wed, 20 Mar 2024 03:32:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/6] tests/plugins: fix use-after-free bug Date: Wed, 20 Mar 2024 11:32:12 +0100 Message-ID: <20240320103213.1048405-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930808581100001 rec->count.score is inside rec, which is freed before rec->count.score is. Reorder the instructions Reported by Coverity as CID 1539967. Cc: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- contrib/plugins/howvec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/plugins/howvec.c b/contrib/plugins/howvec.c index 2d10c87e0fb..94bbc53820a 100644 --- a/contrib/plugins/howvec.c +++ b/contrib/plugins/howvec.c @@ -167,9 +167,9 @@ static gint cmp_exec_count(gconstpointer a, gconstpoint= er b) static void free_record(gpointer data) { InsnExecCount *rec =3D (InsnExecCount *) data; + qemu_plugin_scoreboard_free(rec->count.score); g_free(rec->insn); g_free(rec); - qemu_plugin_scoreboard_free(rec->count.score); } =20 static void plugin_exit(qemu_plugin_id_t id, void *p) --=20 2.44.0 From nobody Wed May 15 09:43:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710930804; cv=none; d=zohomail.com; s=zohoarc; b=dZdBGLcd0iO3/l+CD9fnDDKmF97VCHKxGzsGWn5YECu9SyW1mXJRiba1Z203Xl0OtV7z4pI6x4OhGkt0sANV4U9UOqbe3ShXKOy6+knK0lY7uFMnWHNJiWuaM0cWYwx4lPzhaUdzMMBGEhovgugyFjZ6WKulLL/nnGYG66kWpgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710930804; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=qlJALeFak8LDWasQZpn/A/aSh2fPuC1/BRI+JrlavMU=; b=SoXiQKHiYPb2P9Bzx1fi3Ig6s9Ragt3t6LAFEt1fZRg61AubkctMzPjl4yUbgDXnvoHW2kdZf4DffeQ60NPmwdahxK62cg/W5P1PXjYuD+uCdu67N2QFIUyqcDIpKPbNY3FrN/YmUWDS4hWU5m8NVm/x52cwGgi/ALh/rDEOP2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710930804128689.1543442806083; Wed, 20 Mar 2024 03:33:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFN-0007cJ-NQ; Wed, 20 Mar 2024 06:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFM-0007Y4-DO for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFK-0004JL-4W for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:36 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-428-MPOZ_aWnOjyQWkRSs2JBhg-1; Wed, 20 Mar 2024 06:32:32 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-56b8c7b5086so1752423a12.2 for ; Wed, 20 Mar 2024 03:32:32 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id ef6-20020a05640228c600b00568c2ea2cefsm4512447edb.51.2024.03.20.03.32.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qlJALeFak8LDWasQZpn/A/aSh2fPuC1/BRI+JrlavMU=; b=ANDZ61W0d+r96t8bQXUBhOq8Y5WAxyvQeMc3bw3mT8D1pMG5BCI7N6N/rQT6nnC3dGAUQP OGlEMSsGsj6WDPKDeGxTWxNuRiX5bNUsFeEswIwb4amGjoSCerlecTEyQww+AVTtnFv0kQ 0W9PXPyS5FPJ2x3OACGV06klOckz2KE= X-MC-Unique: MPOZ_aWnOjyQWkRSs2JBhg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930751; x=1711535551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qlJALeFak8LDWasQZpn/A/aSh2fPuC1/BRI+JrlavMU=; b=rn0G0cjTuU8GS7z7LL8mVai8z47F2ec/D1Mi5IlGpuwN3LwKm4TSimRrzhrDWg5jEO yPPq0wrk6cLUNcsVOLQ6yiG0Iljm5Z2qq5cD+sTgYiuSG90JLNvJNV04/AirDOX3Dxsr nPAbqfQD2z0yvSFoL+NdXtzStSwrKwUchbJM47Fkq4nqx4xEkyL3DQl6iTzCGtmrV5h3 HZSEOUNBOyKEX8jBRcanmoDNgeuwZANn+MBOGA8J9i5Week2hj9QhlJ0MUljnwy+1Od2 gkw+XjJjOHPN82tSwOvU3Vq39i9cLRdLZl/A9VNJu1PIccCcySmEskN+pPgkFmJi/2UZ dOdg== X-Gm-Message-State: AOJu0Yw+115CzbGW9qheDgTOPzRsyv/q+NGBvhq0/TuCgmCeGeQ5v61d 6Pj6TZKfJPQJrGF1+apbTZAIYcV1tOSBv/mO7+jPSGFhGzj9t9/rZvAl5ub2ejUXvLGNtG//XEL gx8OPQnbuyJX61XGMpPHTPjHl3HQY0tdsssUGPx/rxPJdDTdWR3ENXxd/Hbd1OBmf7qcfqzUk// Zuc/T2a2+VuYuzIwpi9Ea8Er8XG32IJh9FuLek X-Received: by 2002:a05:6402:3648:b0:568:1b94:fb88 with SMTP id em8-20020a056402364800b005681b94fb88mr14589358edb.23.1710930751057; Wed, 20 Mar 2024 03:32:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpFJf+d+zsYO/sRZbIajE2pUWNHMYh3vNC9vCnJDZxZ1a20THeYcvPojM/h8bnnx734kk4tg== X-Received: by 2002:a05:6402:3648:b0:568:1b94:fb88 with SMTP id em8-20020a056402364800b005681b94fb88mr14589334edb.23.1710930750702; Wed, 20 Mar 2024 03:32:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 6/6] meson: remove dead dictionary access Date: Wed, 20 Mar 2024 11:32:13 +0100 Message-ID: <20240320103213.1048405-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710930804572100005 Content-Type: text/plain; charset="utf-8" The "link_depends" key has not been used since commit c46f76d1586 ("meson: specify fuzz linker script as a project arg", 2020-09-08), and even before that it was only used for fork-fuzzing which we removed in commit d2e6f9272d3 ("fuzz: remove fork-fuzzing scaffolding", 2023-02-16). So, remove it for a very small simplification of meson.build. Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b375248a761..c9c3217ba4b 100644 --- a/meson.build +++ b/meson.build @@ -3951,7 +3951,7 @@ foreach target : target_dirs c_args: c_args, dependencies: arch_deps + deps + exe['dependencies'], objects: lib.extract_all_objects(recursive: true), - link_depends: [block_syms, qemu_syms] + exe.get('link_depen= ds', []), + link_depends: [block_syms, qemu_syms], link_args: link_args, win_subsystem: exe['win_subsystem']) =20 --=20 2.44.0