From patchwork Mon May 6 07:50:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=b58Mr0OT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttn0JDqz1ymb for ; Mon, 6 May 2024 17:53:04 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t91-0005rd-T9; Mon, 06 May 2024 03:52:21 -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 1s3t8Y-0005il-JI for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:51 -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 1s3t8I-0001UC-Dh for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981893; 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=tkBKFh1uHjc74jYCPGWrYjt/t0FCbUHfDC8rQ9UiTvU=; b=b58Mr0OTGcte+kEf1vKkUT0lO3n0mr2uVs+CyBwSCiTWNNYVQlD/6iJKrffs7uH7r6n9Sw g1/SCd2FT/uGBOb/z4jcWYfLUoD3Gz4BgsO562UUQwBbhy3Ox7ZcFskRXLxB3AwiVs7ge7 VIqBGp2bjJHQqacDxzqfPhrqqt32vyU= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-Q2X3w0YfP6-0mpOcdwpIIQ-1; Mon, 06 May 2024 03:51:32 -0400 X-MC-Unique: Q2X3w0YfP6-0mpOcdwpIIQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a599dbd2b6aso89396066b.2 for ; Mon, 06 May 2024 00:51:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981890; x=1715586690; 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=tkBKFh1uHjc74jYCPGWrYjt/t0FCbUHfDC8rQ9UiTvU=; b=KbZKc3aD7gatMlW17qLlwrFEOHoV+/wm3kVKpN42xZYmgsNctsBo00OxJ80wXaN2md V74lx7nXgIwSlEl2afaDSVHHY5F5zrcaDzyYytOtZmhraTDmROZCbxY+H0kXEiHOoJDe kl/7QSvorWyiDwofAuUQg7pBY1szpQrH89bVJAoHH/M9j+AVReyZAC5MKNn1buad5Y57 1NGFEcdE3FAPl8NBoRKEJlcJR0CBJGaq1ExPMEL7KajRMJZvqfNQ98yXYYRL4QY6IfSf yrgGJQU7r0li6lxqLLquwvu/Qe070bHszB0MyEv0RZAfJsAkQCjmm3HohbJoGN/PKXjH peOw== X-Gm-Message-State: AOJu0Yx43zOboUZM38cVY4oB/E3PchGlDBjpGP2g4YqLSZVc+xoq6JCG Uxj9xLHStugF3J9OwR10IElZvp5Q2jsG+sRoEGv16/NHe29XqqYvXNexnrYArEcIyv/AaXNn5Vq 2NwmyJ5NMHdyRGWu5fw/HSycpTxotkGOtwGUFog2JDhMNQH/w6unaYD1xBivzusXIw79nexWL/6 coPlUdtcLrWbZ9QObmiikgwvOvChSMGs1S2HIj X-Received: by 2002:a17:907:9724:b0:a59:b359:3e14 with SMTP id jg36-20020a170907972400b00a59b3593e14mr3133828ejc.10.1714981890197; Mon, 06 May 2024 00:51:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5ZHa5Mfy3hpTH89lkjF861B+hFQWwvqYjvqgkZjswi1MTMI5pb2F7nwTfoCx0J17I1AJLJw== X-Received: by 2002:a17:907:9724:b0:a59:b359:3e14 with SMTP id jg36-20020a170907972400b00a59b3593e14mr3133816ejc.10.1714981889655; Mon, 06 May 2024 00:51:29 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id wk18-20020a170907055200b00a59df1df5c3sm118393ejb.47.2024.05.06.00.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Ruihan Li , Richard Henderson Subject: [PULL 01/46] target/i386: Give IRQs a chance when resetting HF_INHIBIT_IRQ_MASK Date: Mon, 6 May 2024 09:50:40 +0200 Message-ID: <20240506075125.8238-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Ruihan Li When emulated with QEMU, interrupts will never come in the following loop. However, if the NOP instruction is uncommented, interrupts will fire as normal. loop: cli call do_sti jmp loop do_sti: sti # nop ret This behavior is different from that of a real processor. For example, if KVM is enabled, interrupts will always fire regardless of whether the NOP instruction is commented or not. Also, the Intel Software Developer Manual states that after the STI instruction is executed, the interrupt inhibit should end as soon as the next instruction (e.g., the RET instruction if the NOP instruction is commented) is executed. This problem is caused because the previous code may choose not to end the TB even if the HF_INHIBIT_IRQ_MASK has just been reset (e.g., in the case where the STI instruction is immediately followed by the RET instruction), so that IRQs may not have a change to trigger. This commit fixes the problem by always terminating the current TB to give IRQs a chance to trigger when HF_INHIBIT_IRQ_MASK is reset. Reviewed-by: Richard Henderson Signed-off-by: Ruihan Li Message-ID: <20240415064518.4951-4-lrh2000@pku.edu.cn> Signed-off-by: Paolo Bonzini --- target/i386/tcg/translate.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index c05d9e52259..051ffb5e1fd 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2798,13 +2798,17 @@ static void gen_bnd_jmp(DisasContext *s) static void do_gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf, bool jr) { + bool inhibit_reset; + gen_update_cc_op(s); /* If several instructions disable interrupts, only the first does it. */ - if (inhibit && !(s->flags & HF_INHIBIT_IRQ_MASK)) { - gen_set_hflag(s, HF_INHIBIT_IRQ_MASK); - } else { + inhibit_reset = false; + if (s->flags & HF_INHIBIT_IRQ_MASK) { gen_reset_hflag(s, HF_INHIBIT_IRQ_MASK); + inhibit_reset = true; + } else if (inhibit) { + gen_set_hflag(s, HF_INHIBIT_IRQ_MASK); } if (s->base.tb->flags & HF_RF_MASK) { @@ -2815,7 +2819,9 @@ do_gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf, bool jr) tcg_gen_exit_tb(NULL, 0); } else if (s->flags & HF_TF_MASK) { gen_helper_single_step(tcg_env); - } else if (jr) { + } else if (jr && + /* give irqs a chance to happen */ + !inhibit_reset) { tcg_gen_lookup_and_goto_ptr(); } else { tcg_gen_exit_tb(NULL, 0); From patchwork Mon May 6 07:50:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931735 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=POeba1OC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttt046jz1yZk for ; Mon, 6 May 2024 17:53:10 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t8j-0005md-5O; Mon, 06 May 2024 03:52:01 -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 1s3t8c-0005jK-KB for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Z-0001Ui-86 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981896; 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=JS40WGMZssL8xSLN75H7ZLPUAK/PS4Fo0sIeTbJc6nU=; b=POeba1OCwKTJTt9MSziSWyus1PNe0JgRU+ppKYVZ07IcxHGQtrNqPFNWocxS2WoP1Ef2UM nGQi7h7USrFTT291rIxvMdieEunMP76aoK66a7uEb7QEpfnsLkP78NajcSjzy7EVD3ekMg jA//a4Nq8KY7pzzqdItpWYYbNrej/Nc= 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-446-Gx-aH9xePu-e8lRWt8T8TQ-1; Mon, 06 May 2024 03:51:35 -0400 X-MC-Unique: Gx-aH9xePu-e8lRWt8T8TQ-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a59a212d874so128293666b.1 for ; Mon, 06 May 2024 00:51:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981893; x=1715586693; 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=JS40WGMZssL8xSLN75H7ZLPUAK/PS4Fo0sIeTbJc6nU=; b=DyUNxx8D0NuYVGmgLHbDnjc0x+jhPC6Ev/9lpIUTUAjZmRwTOL6Z9oxVV1BXOFsY0t DMFsQWv7tHmQc7YSCgRiw9TwuW01zuEgR+SxnhlcaED3LQ5dkH6iANvl1ehKBhrIup5x oHr2CUS34gvnzXitoeV+jvQZ5rbSupDKy/KxczJSCJG9fPWLiUS/VTMdQrf03S7JwShi dcsTCEzxBBYufkKGIHkXDd+OPD9+PZpkDF3vgUh6I68Wg1y4IjbrQ4wB3skWPVCmay9m O/rKkoTUIyrCe84aNufkE0CXaYMs2NsraDbYU2eOFPEBTqNu1tE3WjUJ1W1DLs4x+rbb XXiw== X-Gm-Message-State: AOJu0YyW0PCWS4gy0GqwM7OQWhA/gcfyBncsoXJ//7IZq+RZ+ihhwY0u R9mcRxcagI4+BSMJ8vhUuBIrzysd8WV6jzlCflO7mK3eHJJhkbnRY/HMLxtAEI1NeR8u0auw8v5 kPfD2I8GZWGFoBy104OPNxXCdVeUwtBymrcTX2hLUuOfXNSx/nIr9J4LNqCRQ72oNjeuAtIWkjn NP7fJKOUITil+LLb5z7cGrT46zNZTSASTOrNid X-Received: by 2002:a17:906:1555:b0:a51:8d60:215a with SMTP id c21-20020a170906155500b00a518d60215amr5859708ejd.27.1714981893025; Mon, 06 May 2024 00:51:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERJiTImqjrq5t8Z9eAfaY6QWt/zgf6Bnq44WAYLRkxN9uRnMeQG5EG5eBwz1VmT4aSBlz6xg== X-Received: by 2002:a17:906:1555:b0:a51:8d60:215a with SMTP id c21-20020a170906155500b00a518d60215amr5859690ejd.27.1714981892621; Mon, 06 May 2024 00:51:32 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id s20-20020a170906455400b00a59c4a16e4asm1557962ejq.120.2024.05.06.00.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Fabiano Rosas Subject: [PULL 02/46] Kconfig: kvm: allow building without any board Date: Mon, 6 May 2024 09:50:41 +0200 Message-ID: <20240506075125.8238-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org KVM code might have to call functions on the PCIDevice that is passed to kvm_arch_fixup_msi_route(). This fails in the case where --without-default-devices is used and no board is configured. While this is not really a useful configuration, and therefore setting up stubs for CONFIG_PCI is overkill, failing the build is impolite. Just include the PCI subsystem if kvm_arch_fixup_msi_route() requires it, as is the case for ARM and x86. Reported-by: Philippe Mathieu-Daudé Tested-by: Fabiano Rosas Signed-off-by: Paolo Bonzini --- target/arm/Kconfig | 2 ++ target/i386/Kconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/target/arm/Kconfig b/target/arm/Kconfig index bf57d739cd1..5847c5a74a7 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -9,3 +9,5 @@ config ARM config AARCH64 bool select ARM + # kvm_arch_fixup_msi_route() needs to access PCIDevice + select PCI if KVM diff --git a/target/i386/Kconfig b/target/i386/Kconfig index ce6968906ee..46898946394 100644 --- a/target/i386/Kconfig +++ b/target/i386/Kconfig @@ -1,5 +1,7 @@ config I386 bool + # kvm_arch_fixup_msi_route() needs to access PCIDevice + select PCI if KVM config X86_64 bool From patchwork Mon May 6 07:50:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GS364NWK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv9520Q6z1yZk for ; Mon, 6 May 2024 18:05:29 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t95-0005tU-JG; Mon, 06 May 2024 03:52:23 -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 1s3t8d-0005jP-DV for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Z-0001Ut-MF for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981899; 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=U47eDFslvtODaOBLy6JXUf96nPFKYjL+ASHgodulSSE=; b=GS364NWKcGOVCtQ2d+bsXw8mzMktCE2YRh7OcoqtZC84RSNOro6JyLePSiODR6pWyWk7Ug +Ek3qcV9/XTCqiinDLjvhYwt+lCMiUbUN6BkTzp5d5jQo83AYjjyVRm+KDrNjLflvMhrmM JAAjEM4yvC36nRR4vxTM/xRfcIDff2I= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-ODbux_P3PqO8N_umyOs0Jg-1; Mon, 06 May 2024 03:51:37 -0400 X-MC-Unique: ODbux_P3PqO8N_umyOs0Jg-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a59a17f35c8so100093566b.0 for ; Mon, 06 May 2024 00:51:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981896; x=1715586696; 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=U47eDFslvtODaOBLy6JXUf96nPFKYjL+ASHgodulSSE=; b=p7xqT8LVTVeqPyxj3Syl7SBF7hCdJyv+iy3BwWQ5Sz6cqWsQN4sgNuRsQGpKweMjq7 75NNTFqGjNhQoeShxtXFBBvZhY0uEHFDCoUz+eP/LaffhkRqTCLQcAj1CPTFxFeXz19h +ooxQPAHwwinxVECcy4OW1tyiCpYUgKLJPzzMGJKhjQ7zyChbDgZQ1Ahk1L06QrPmoqt Xrh5qiRIqmD0Lac4k7xAXVvC0h9TqRRAl6JiBnhZQs3R/SvBK5ULNT34aswvGhicGr8l kLdzkvgi4YTeniYcqhdP7c3uT9mNdH10/gss3o37nOkzpHsgluazraqSwWAeNkmZUPgc QUNw== X-Gm-Message-State: AOJu0YykXC5bcc4f2bcfmjjXqQyutR+N1ypt+GyPz7zd9NNPRNqmwtBe N8twrsh7UDJG26kL7yFJ2JgaInCkNtZbKMOLcMAHhtzbLZLX490ArP4UP/kT2K8TEngRbKfqHPn BPAm3alKXnhDE9M7ys8AUzE1FEq/8+qZ55KnafxxVLMqQsIlMze2bm7FR1YMP6XqDKATjnjNZsn XeIs/sTa0Ll48F8OEyiWEuwDMzcJKQK5VoQW35 X-Received: by 2002:a17:907:9403:b0:a59:c9b1:cb64 with SMTP id dk3-20020a170907940300b00a59c9b1cb64mr2226473ejc.62.1714981895940; Mon, 06 May 2024 00:51:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFAodIeeAwqUU0lZ/vKcSPARM9xLUseQ7v9CTvDNCa1N3EO6YtpTX8R5KwaPf11UASNETz0zA== X-Received: by 2002:a17:907:9403:b0:a59:c9b1:cb64 with SMTP id dk3-20020a170907940300b00a59c9b1cb64mr2226459ejc.62.1714981895582; Mon, 06 May 2024 00:51:35 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id m19-20020a1709060d9300b00a599f627807sm3274717eji.140.2024.05.06.00.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 03/46] tests/qtest: skip m48t59-test if the machine is absent Date: Mon, 6 May 2024 09:50:42 +0200 Message-ID: <20240506075125.8238-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Together with the series at https://patchew.org/QEMU/20240423131612.28362-1-pbonzini@redhat.com/, this allows adding sparc-softmmu to the target list of the build-without-defaults CI job. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- tests/qtest/m48t59-test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c index b9cd209165a..605797ab785 100644 --- a/tests/qtest/m48t59-test.c +++ b/tests/qtest/m48t59-test.c @@ -262,11 +262,12 @@ int main(int argc, char **argv) base_setup(); g_test_init(&argc, &argv, NULL); - - if (g_test_slow()) { - /* Do not run this in timing-sensitive environments */ - qtest_add_func("/rtc/bcd-check-time", bcd_check_time); + if (qtest_has_machine(base_machine)) { + if (g_test_slow()) { + /* Do not run this in timing-sensitive environments */ + qtest_add_func("/rtc/bcd-check-time", bcd_check_time); + } + qtest_add_func("/rtc/fuzz-registers", fuzz_registers); } - qtest_add_func("/rtc/fuzz-registers", fuzz_registers); return g_test_run(); } From patchwork Mon May 6 07:50:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931731 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Sv/oH71q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttm43C9z1ydY for ; Mon, 6 May 2024 17:53:04 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t8j-0005mZ-59; Mon, 06 May 2024 03:52:01 -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 1s3t8d-0005jR-If for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Z-0001V5-Mn for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981901; 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=s4DvSUKViypdg4PBIo4khwTjt6DHzg9hai78TXVwSuA=; b=Sv/oH71qXhak98dm3r7wP7JTMIIaXCO3uXxWAXq1H2sxdsoyIr1EcWLcCnhwbXqUTu+Hgy sW5J5ihNsUsZP8ve1c/013G4MmJWZn0fkcwFVW4dyiOYcVsmMbCuUMuzJVgJZ9ZRIRxpAd 8hY0F67fM16u6dOqAKTbESpUb9VX9qg= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-97-BnRSNtGSNdGW-ntz1dV-vA-1; Mon, 06 May 2024 03:51:40 -0400 X-MC-Unique: BnRSNtGSNdGW-ntz1dV-vA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a5966e85bf6so304177566b.0 for ; Mon, 06 May 2024 00:51:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981898; x=1715586698; 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=s4DvSUKViypdg4PBIo4khwTjt6DHzg9hai78TXVwSuA=; b=xR+i6pja9prAZBU4xG0WsBk3HhPD9OavT5ShQSCrFFjR7qQYPVbCMko3a3s+uOuROf W3yySddkP5eLeWrsqYl0ZSJMrtYMFqZ41rLKG5cnpWPWlaBnpEWzPhnbN1i6hQA79SjO t30ITievMXnXmd2EE+hzDGmLWYWfgLE4tqiCg9m77ir1pL/ZxoLO/Fe7Yv/ge7N+7d1o TJNZmItYZpJoMmKKfpO0bY48WgHjFsNVpZaRcclBngtK1Y/qR4TRulMQ6gVbDn4JbE7d WRnsPP4k3hh9UAIh9JYY56y0kZmcBzvRDRad4y2jn73BRkqo8hTiRQB/sWmyoVgiacaZ HHXA== X-Gm-Message-State: AOJu0YyVXlEvxH0R2go5X4StszsFKyuWjMA+nOlOIk7aul0kG+HnVI59 kWxTYde5IvbDcHFQrZvfJxhGGXYMWwyRMDzR8YxWcrMBogRzD/nvfNUjSb4jzRE5PJz0cJbxyDp nwPBwPZ54SiBduhXGPOOy5yCagO2JgJyECU5ZSt8V/zXQFJiWS5LZnaZfy2PaLWh6u9gUzLYT+9 qNogL2BocnKT6OwIHSeOWYhvpOurTBrWEwVnCZ X-Received: by 2002:a17:907:983:b0:a59:92b0:e0d3 with SMTP id bf3-20020a170907098300b00a5992b0e0d3mr7248705ejc.34.1714981898420; Mon, 06 May 2024 00:51:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBY3iOLgUzOjCyH/zu1c9sp951ZiMA8tMgK9Hhx/ZZY1AG2L+QeEV09LaxZYKHv+bofxbLDw== X-Received: by 2002:a17:907:983:b0:a59:92b0:e0d3 with SMTP id bf3-20020a170907098300b00a5992b0e0d3mr7248691ejc.34.1714981898033; Mon, 06 May 2024 00:51:38 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id rs21-20020a170907037500b00a59b259e2ffsm2192988ejb.93.2024.05.06.00.51.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/46] gitlab-ci: adjust msys2-64bit to be able to run qtest Date: Mon, 6 May 2024 09:50:43 +0200 Message-ID: <20240506075125.8238-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org sparc-softmmu is able to run a subset of qtests when compiled --without-default-devices, so use it instead of x86_64-softmmu for the msys2 run. Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/windows.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 94834269ec7..d26dbdd0c0d 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -24,10 +24,7 @@ msys2-64bit: # changed to compile QEMU with the --without-default-devices switch # for this job, because otherwise the build could not complete within # the project timeout. - CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0 - # qTests don't run successfully with "--without-default-devices", - # so let's exclude the qtests from CI for now. - TEST_ARGS: --no-suite qtest + CONFIGURE_ARGS: --target-list=sparc-softmmu --without-default-devices -Ddebug=false -Doptimization=0 # The Windows git is a bit older so override the default GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet artifacts: From patchwork Mon May 6 07:50:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XAk+aLvx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttH24q1z1yZk for ; Mon, 6 May 2024 17:52:39 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t99-0005wJ-9e; Mon, 06 May 2024 03:52:27 -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 1s3t8c-0005jL-KH for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Y-0001XT-Nl for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981905; 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=irmtTqct8A65MzBRfGfL65/eckdbEHDoF5RjwLqL9+Y=; b=XAk+aLvx5C4WSDeQK7j9W9AJngGSDTrCp1+NXWZcwVelOGFRcZJChhKUvKMWPmXzAUDMWr tibwevePaq9qMkX1TwnvJ1XbgqQdmx+64syANHpG2aaUn1YADVKvSVa9XbzkgLFiwyTXoz B3wdCEet3Z0sooDvIaBugsDVg03wobE= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-194-49zWmaTQNh2OrRntU9dcZQ-1; Mon, 06 May 2024 03:51:42 -0400 X-MC-Unique: 49zWmaTQNh2OrRntU9dcZQ-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-56e645a8762so1133198a12.3 for ; Mon, 06 May 2024 00:51:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981901; x=1715586701; 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=irmtTqct8A65MzBRfGfL65/eckdbEHDoF5RjwLqL9+Y=; b=Sz/IC8Il3ZHhX+38MLQzuc/ZixS43Yp28J7Qtqv2l1AysG8SK6oQ/VEQ9cHT/bSK4C eIvIOehxA69PtYsaAGS8BLxkv76lsGbYN1S2cU1GeHLY+2dT+Be6kDLJLx0Od72J0g0l nc7xrIHP4wNAK77vve2Tyg5BMFYJ8hu1smQvQq5Rs2np5NVi3PSXgoxamb9VLsCloFnz MK6Xr/KR08RFuY2PhOJBkYJ/9XXosEhVCHAk339yCZk8AH5yTiEXTNPVYv3nyQhdu5Cq DYgMawatASuJHB73sRSr0g4c8xwkrbakyxmUt0whMx+NZgan6Tw0Xx8VPfPEwQl5htQT 3b6A== X-Gm-Message-State: AOJu0Yy5BB2B88626yjf/b7LbvMlFabKdCnsoEw/fFdtI/oWGB5D+vCv dD7t7lz4a8p1QAa3azz3VSgPH0YK3QGpB9xiqRaIaIyBAw5tTEMCMgnqyVx3M+UdDfoAFyDHPSi BYbHGOIk37W2ennw1NZodZIivRuZcg/A6m827KGUnl513Vds4FojpfEYFa91bRgCn+KTWTZsgKy jllWiMz0bFHE6W16xAi02qJTgcc0IFD8NYBorG X-Received: by 2002:a50:c30e:0:b0:56e:34e0:4699 with SMTP id a14-20020a50c30e000000b0056e34e04699mr6082475edb.30.1714981900843; Mon, 06 May 2024 00:51:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLTRoTBQLzuLNGHU08YJmbHYP1FJ1way6/iCEXZeCL8ZvYDH/kcyUTirM+pnjNcre8OVAWwQ== X-Received: by 2002:a50:c30e:0:b0:56e:34e0:4699 with SMTP id a14-20020a50c30e000000b0056e34e04699mr6082458edb.30.1714981900502; Mon, 06 May 2024 00:51:40 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id x2-20020a056402414200b00572cf08369asm4090322eda.23.2024.05.06.00.51.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/46] kvm: ppc: disable sPAPR code if CONFIG_PSERIES is disabled Date: Mon, 6 May 2024 09:50:44 +0200 Message-ID: <20240506075125.8238-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org target/ppc/kvm.c calls out to code in hw/ppc/spapr*.c; that code is not present and fails to link if CONFIG_PSERIES is not enabled. Adjust kvm.c to depend on CONFIG_PSERIES instead of TARGET_PPC64, and compile out anything that requires cap_papr, because only the pseries machine will call kvmppc_set_papr(). Signed-off-by: Paolo Bonzini --- target/ppc/kvm.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 63930d4a77d..46fccff7865 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -49,6 +49,8 @@ #include "elf.h" #include "sysemu/kvm_int.h" +#include CONFIG_DEVICES + #define PROC_DEVTREE_CPU "/proc/device-tree/cpus/" #define DEBUG_RETURN_GUEST 0 @@ -71,7 +73,6 @@ static int cap_hior; static int cap_one_reg; static int cap_epr; static int cap_ppc_watchdog; -static int cap_papr; static int cap_htab_fd; static int cap_fixup_hcalls; static int cap_htm; /* Hardware transactional memory support */ @@ -90,6 +91,12 @@ static int cap_fwnmi; static int cap_rpt_invalidate; static int cap_ail_mode_3; +#ifdef CONFIG_PSERIES +static int cap_papr; +#else +#define cap_papr (0) +#endif + static uint32_t debug_inst_opcode; /* @@ -1668,7 +1675,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) trace_kvm_handle_halt(); ret = kvmppc_handle_halt(cpu); break; -#if defined(TARGET_PPC64) +#if defined(CONFIG_PSERIES) case KVM_EXIT_PAPR_HCALL: trace_kvm_handle_papr_hcall(run->papr_hcall.nr); run->papr_hcall.ret = spapr_hypercall(cpu, @@ -1698,7 +1705,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) ret = 0; break; -#if defined(TARGET_PPC64) +#if defined(CONFIG_PSERIES) case KVM_EXIT_NMI: trace_kvm_handle_nmi_exception(); ret = kvm_handle_nmi(cpu, run); @@ -2054,6 +2061,7 @@ void kvmppc_enable_h_rpt_invalidate(void) kvmppc_enable_hcall(kvm_state, H_RPT_INVALIDATE); } +#ifdef CONFIG_PSERIES void kvmppc_set_papr(PowerPCCPU *cpu) { CPUState *cs = CPU(cpu); @@ -2075,6 +2083,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu) */ cap_papr = 1; } +#endif int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr) { @@ -2837,7 +2846,7 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) return data & 0xffff; } -#if defined(TARGET_PPC64) +#if defined(CONFIG_PSERIES) int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run) { uint16_t flags = run->flags & KVM_RUN_PPC_NMI_DISP_MASK; From patchwork Mon May 6 07:50:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931764 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=I0aq9lvO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv4Q6qfRz1xnS for ; Mon, 6 May 2024 18:01:26 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9A-0005x2-02; Mon, 06 May 2024 03:52:28 -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 1s3t8d-0005jS-Je for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Z-0001Xj-NJ for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981906; 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=NaFhvDsV4aiOiczV5OFhsyZUhVEImpMxri4NWO+aWMM=; b=I0aq9lvORKnzM9eK5ZiAOnpH9/IS8YINO7fJFC0VZ74R4ypy+QDgMoXzL7GJmz7CguV0RL 0N700u23/cmg8UKY372dS//36kEGK4atUdI/bZV/DwesY8+gZTrtUGMKB+DsDSoymd6HCZ dot9lliKMKpXr5IG4lb/IlarpgXJYsQ= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-yT3oX4s_OoaDSlgzV18CKA-1; Mon, 06 May 2024 03:51:45 -0400 X-MC-Unique: yT3oX4s_OoaDSlgzV18CKA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59c942611bso53291366b.0 for ; Mon, 06 May 2024 00:51:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981903; x=1715586703; 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=NaFhvDsV4aiOiczV5OFhsyZUhVEImpMxri4NWO+aWMM=; b=KQcqZrKFfTuBdwaFQqSijRPEeHiDG6fXPMEEVqhrGTQ0evHzQBICS8JYVDfUiIzcPF veVU4xuH53+54msjf1RODiUfVne5asWZiXPhl9uM5rcbEE2CufxquZ9o1imEZkzj3ibG 7vbZBjZsxQEpnoc3GPDMM8TBqpNf/EkB8SiJyLrqljL/HuavN4liKwoajwqgX0dN4jfb dVqjGq4TqxaswA+W4K4Df3DcOcsDxJigv+TEhcngQ1R8lyj5F5bvGkJPlah3zwI6UY/D ZIxEld8Xeco9KVQC2Ibl3lytnv7efwbtXhNKSeytvAzUD2ShH1B6GsduTviV1SwjGzGU f9lA== X-Gm-Message-State: AOJu0Yx2f3dlwzkq3RK5IE6uIhUfQMATo+SkFeZEVNrw16R73qj9ro8R ItQTRqol4zEFhwLfdXUPiAwA6o0pNnsOjYAAwNQrWrKOSHOJ9Gs0n/CtHBvWXOXj8ASllBbqr03 wTFkl6JENertPMcYdonMo5Dj3Od42Bahy25fIrRAir+jQ/FX74hyAVuY6jypWdnDq4B365+VaRI i7gvYhkXo9iYlerZ0qpEY8Wp5MdlkIgDgTTleO X-Received: by 2002:a50:d659:0:b0:572:1625:ae99 with SMTP id c25-20020a50d659000000b005721625ae99mr5901636edj.31.1714981903295; Mon, 06 May 2024 00:51:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxzrY/sFzbZX0zn5paavMmPOjTmDol1XfIskQew+lsNaDEue8viexc3xfKvt7bdJnQY/H1eA== X-Received: by 2002:a50:d659:0:b0:572:1625:ae99 with SMTP id c25-20020a50d659000000b005721625ae99mr5901631edj.31.1714981902993; Mon, 06 May 2024 00:51:42 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id fk4-20020a056402398400b005701eaa2023sm4909102edb.72.2024.05.06.00.51.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/46] configs: list "implied" device groups in the default configs Date: Mon, 6 May 2024 09:50:45 +0200 Message-ID: <20240506075125.8238-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Match the optional device groups to what is actually included in the config-devices.mak files. Signed-off-by: Paolo Bonzini --- configs/devices/arm-softmmu/default.mak | 2 ++ configs/devices/loongarch64-softmmu/default.mak | 3 +++ configs/devices/or1k-softmmu/default.mak | 4 ++++ configs/devices/ppc-softmmu/default.mak | 4 ++++ configs/devices/riscv32-softmmu/default.mak | 4 ++-- configs/devices/riscv64-softmmu/default.mak | 4 ++-- configs/devices/xtensa-softmmu/default.mak | 4 ++++ 7 files changed, 21 insertions(+), 4 deletions(-) diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak index 6ee31bc1ab9..c1cfb3bcf75 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -1,5 +1,7 @@ # Default configuration for arm-softmmu +# Uncomment the following lines to disable these optional devices: +# CONFIG_I2C_DEVICES=n # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n diff --git a/configs/devices/loongarch64-softmmu/default.mak b/configs/devices/loongarch64-softmmu/default.mak index 928bc117ef7..0893112b81d 100644 --- a/configs/devices/loongarch64-softmmu/default.mak +++ b/configs/devices/loongarch64-softmmu/default.mak @@ -1,3 +1,6 @@ # Default configuration for loongarch64-softmmu +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=n + CONFIG_LOONGARCH_VIRT=y diff --git a/configs/devices/or1k-softmmu/default.mak b/configs/devices/or1k-softmmu/default.mak index 89c39e31237..3aecdf9d738 100644 --- a/configs/devices/or1k-softmmu/default.mak +++ b/configs/devices/or1k-softmmu/default.mak @@ -1,5 +1,9 @@ # Default configuration for or1k-softmmu +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n + # Boards: # CONFIG_OR1K_SIM=y diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak index b85fd2bcd71..3061b26749a 100644 --- a/configs/devices/ppc-softmmu/default.mak +++ b/configs/devices/ppc-softmmu/default.mak @@ -1,5 +1,9 @@ # Default configuration for ppc-softmmu +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n + # For embedded PPCs: CONFIG_E500PLAT=y CONFIG_MPC8544DS=y diff --git a/configs/devices/riscv32-softmmu/default.mak b/configs/devices/riscv32-softmmu/default.mak index 94a236c9c25..07e4fd26df3 100644 --- a/configs/devices/riscv32-softmmu/default.mak +++ b/configs/devices/riscv32-softmmu/default.mak @@ -1,8 +1,8 @@ # Default configuration for riscv32-softmmu # Uncomment the following lines to disable these optional devices: -# -#CONFIG_PCI_DEVICES=n +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n # Boards: # diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak index 3f680594484..221963d4c5c 100644 --- a/configs/devices/riscv64-softmmu/default.mak +++ b/configs/devices/riscv64-softmmu/default.mak @@ -1,8 +1,8 @@ # Default configuration for riscv64-softmmu # Uncomment the following lines to disable these optional devices: -# -#CONFIG_PCI_DEVICES=n +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n # Boards: # diff --git a/configs/devices/xtensa-softmmu/default.mak b/configs/devices/xtensa-softmmu/default.mak index 49e4c9da88c..f650cad7609 100644 --- a/configs/devices/xtensa-softmmu/default.mak +++ b/configs/devices/xtensa-softmmu/default.mak @@ -1,5 +1,9 @@ # Default configuration for Xtensa +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n + # Boards: # CONFIG_XTENSA_SIM=y From patchwork Mon May 6 07:50:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EFIQ9pvv; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3R3kSVz1xnS for ; Mon, 6 May 2024 18:00:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9C-0005y5-1j; Mon, 06 May 2024 03:52:30 -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 1s3t8c-0005jM-KM for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:55 -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 1s3t8Z-0001Yf-Mt for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981909; 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=bwhnI0R3GJbUfLrtmrA6X5iWICM26TYwYhxih3BiOs4=; b=EFIQ9pvv5UXFnP+LX9ipDgFnH+ypME2ndU8QwKgr0C1D0XEnEqRuX1k8kely1g98shiok7 0tOwJ7KzwhjJrzqr9E/KonGE1ahzpcyGSK5yXDif2g8qN82Dm9qifhZMlNqNEQ8LpIbqoD HrLsFfd/ZKgRgEyuxiy3+ykDe5bVgFI= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-aR6RhZp2OLijQ4mCBq1Q4g-1; Mon, 06 May 2024 03:51:48 -0400 X-MC-Unique: aR6RhZp2OLijQ4mCBq1Q4g-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-516d46e1bafso496252e87.2 for ; Mon, 06 May 2024 00:51:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981906; x=1715586706; 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=bwhnI0R3GJbUfLrtmrA6X5iWICM26TYwYhxih3BiOs4=; b=j3MEaz/QTU8DDbFWdSlZ7jRjPEEzSuqYMdY0TwXvrHQxqgmz83D4SNqbAdbvHyvQ6d qIycmm1IA6NPbo67+QyZSq6ePJ8n4bvJQzykmzyMhnC4/QcPq+le54ltUCXuHKa9c3V6 aA4hyqCXGf44RvEcmEyCCVj8GRf1WOGYV9LxmoWkwf3pqgN4hetGX6SUz2Y9ZXy+e3kZ /AoTpjpNnstObBDiJOTxuc3tDb8t6H6g6s5e34iS2rRU/3pZPwkl2S5vkw3+15myDjqu KfMBU1jogX9fSEDlWEYsi2uNbJN9L2NEUlmpn8AUm7xJXYNL20fNMLwsDH7Zbs9GZtut zcLw== X-Gm-Message-State: AOJu0YxoXM/p+fgPwrnApRgGousBqRwbfFo9YA+WRCvam7p+kOE4/A8d ko4VNf6VUrkgIJOvPjwKWHhzlZVLKEqtExJq2Al5nIUFTH/OjUPDO9uKRCjCPhi7t1q5k3ouCX0 5apwJhqaZUV/M7iLUbSEozuDqA0eYKCtmznOsJlenqVaVz9q4PQyzW8yQORVVP055HIIHqOLZzU OPbHREoPEf+0JS76mb3z6sdGu3umqGT4h12ulO X-Received: by 2002:a05:6512:3d87:b0:51e:876d:17d0 with SMTP id k7-20020a0565123d8700b0051e876d17d0mr10268994lfv.52.1714981906077; Mon, 06 May 2024 00:51:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzvB75/UivXRK0PmL+BoKxQuM6fAyZaJAclBfH0YtZutrTWkWYCvi/4O5bypeaNhMplSOU/w== X-Received: by 2002:a05:6512:3d87:b0:51e:876d:17d0 with SMTP id k7-20020a0565123d8700b0051e876d17d0mr10268967lfv.52.1714981905543; Mon, 06 May 2024 00:51:45 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id zj1-20020a170907338100b00a59c00edc42sm1784003ejb.73.2024.05.06.00.51.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/46] alpha: switch boards to "default y" Date: Mon, 6 May 2024 09:50:46 +0200 Message-ID: <20240506075125.8238-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Start with Alpha. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/alpha-softmmu/default.mak | 5 ++--- .gitlab-ci.d/buildtest.yml | 2 +- hw/alpha/Kconfig | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/devices/alpha-softmmu/default.mak b/configs/devices/alpha-softmmu/default.mak index d186fe8e9b1..3de6a9f5779 100644 --- a/configs/devices/alpha-softmmu/default.mak +++ b/configs/devices/alpha-softmmu/default.mak @@ -5,6 +5,5 @@ #CONFIG_PCI_DEVICES=n #CONFIG_TEST_DEVICES=n -# Boards: -# -CONFIG_DP264=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_DP264=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 6394b8f41e4..c6c9c242c5c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -661,7 +661,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu s390x-softmmu sh4-softmmu + TARGETS: alpha-softmmu avr-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index 9af650c94ec..7f3455ce1e1 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -1,5 +1,7 @@ config DP264 bool + default y + depends on ALPHA imply PCI_DEVICES imply TEST_DEVICES imply E1000_PCI From patchwork Mon May 6 07:50:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LdX+lzKt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv8T5Q3qz1xnS for ; Mon, 6 May 2024 18:04:57 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t96-0005tr-9e; Mon, 06 May 2024 03:52:24 -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 1s3t8f-0005kC-NK for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:57 -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 1s3t8d-0001ak-Bx for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981914; 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=CW/1kX4ANigUxRpi1OYcRoObb0Qjg2nEgWj2lY20vQ4=; b=LdX+lzKtL2XlIQhmlB/Is/BCqgHFTZrAY7ZZ6BJ3CUaJFsY0N0r23jbyvUMmewg2W9n7B9 UvXgTNJXWGXRLmp4nxs64nyV82FPw2Rt8baPy91UpULgE/8+vW/H2lbTJu9VrNAofPodYK Mx9Qq+wbi5cyRk7+y4LH4yrRVc2lu4s= 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-191-GLP3x1P0PaCl_CdQccsjXA-1; Mon, 06 May 2024 03:51:50 -0400 X-MC-Unique: GLP3x1P0PaCl_CdQccsjXA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a51fdbd06c8so127629066b.3 for ; Mon, 06 May 2024 00:51:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981908; x=1715586708; 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=CW/1kX4ANigUxRpi1OYcRoObb0Qjg2nEgWj2lY20vQ4=; b=NiV9G3ZW7cMLnmt/8tfb34MqzVpQTrkOm8uGKmaQRAJ841P+v5X/Ur31xIqK3p0RA9 AUZj+1vnsx1DgDyGgfORhhe5yecBOc+hanzDn2cmHzfHDvyZzby+wGWFTZek6EXHqOrE vHyN/OY9D6d0YI+bQvkoYQRN1nGzG6Ipc+CaBYkpVj/+8ycgdc/9luxf4LD78VWtGgfs IgZxFhLmELBA1DC6pISqrGrwp0GEbFE/7Y7Ng9wOpp4gZF+iccS9F72Kx6YU+rt3p5Dy NbxaDS5H0SM05DO+VYFBouKAowDDbg9xW3VIMBnCvYMbwi/atrnUxH/Vo1wMYifeuvtL YHHg== X-Gm-Message-State: AOJu0Yyyalk9j1CWoU+7RcD2pvBzRNoedQMksHXBcni5I5wVx9TQsFWb 8gFEa3ZW5wG6v2+PK93h6ufsr4wWC10LJLg6ww7EKYLG4X3QysD36aEUYPXIe9iuEgG2SgQjsIo SF0GNla6PpNvJMtI+Qn1vGKnU63cP/PqtnQaDwsi6fAnpeREcybbIyPCaqQPiXDd2hAwgV0bWyC hVsU4El+TSXgnYJ+xWV7XChUL7c20DewFweDCF X-Received: by 2002:a17:907:724b:b0:a59:b88c:2b2a with SMTP id ds11-20020a170907724b00b00a59b88c2b2amr3267938ejc.50.1714981908520; Mon, 06 May 2024 00:51:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGBoPltGXRGumTyJYsUXMm4/PQziMWcmaXmvnlga41lsQIkSyc8SbGS9TMQUw2dA+e+iGCfBQ== X-Received: by 2002:a17:907:724b:b0:a59:b88c:2b2a with SMTP id ds11-20020a170907724b00b00a59b88c2b2amr3267919ejc.50.1714981907915; Mon, 06 May 2024 00:51:47 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id x19-20020a170906135300b00a599e418208sm3304946ejb.9.2024.05.06.00.51.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/46] arm: switch boards to "default y" Date: Mon, 6 May 2024 09:50:47 +0200 Message-ID: <20240506075125.8238-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For ARM targets, boards that require TCG are already using "default y". Switch ARM_VIRT to the same selection mechanism. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/arm-softmmu/default.mak | 3 ++- .gitlab-ci.d/buildtest.yml | 1 + hw/arm/Kconfig | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak index c1cfb3bcf75..31f77c20269 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -5,7 +5,8 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -CONFIG_ARM_VIRT=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_ARM_VIRT=n # These are selected by default when TCG is enabled, uncomment them to # keep out of the build. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index c6c9c242c5c..3a03cdb0151 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -648,6 +648,7 @@ build-tci: - make check-tcg # Check our reduced build configurations +# requires libfdt: aarch64, arm build-without-defaults: extends: .native_build_job_template needs: diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index fe1f9643bd9..98c264ed219 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,5 +1,7 @@ config ARM_VIRT bool + default y + depends on ARM imply PCI_DEVICES imply TEST_DEVICES imply VFIO_AMD_XGBE From patchwork Mon May 6 07:50:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931744 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=h7R2SIuI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtx01Rzsz1yZk for ; Mon, 6 May 2024 17:55:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t96-0005u1-Rh; Mon, 06 May 2024 03:52:24 -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 1s3t8h-0005kb-28 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:59 -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 1s3t8f-0001bw-FI for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981915; 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=0DIuiCzMSL0+YSjMXWZ5/ZMwYhFwNNGbX4Rtfk9cIAE=; b=h7R2SIuIP7KPRD1VQYhBPDVm55ysrBSFvimtD3xS11Vg6DBa3V5WeudPQzERAH7zE0t+lH XvAxwOwQ/6xAGrX6gifzmzG+s7j+sstZNv3t4GX55FvjFBpxydpw+QTSXu/N+fGapYqVPT eM6dlfoqlatJm2y4PFSvpHkGW7Heg80= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-nhjBiH54NvmhwQK1EQPWgg-1; Mon, 06 May 2024 03:51:53 -0400 X-MC-Unique: nhjBiH54NvmhwQK1EQPWgg-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-5202218b4d3so1324508e87.3 for ; Mon, 06 May 2024 00:51:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981911; x=1715586711; 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=0DIuiCzMSL0+YSjMXWZ5/ZMwYhFwNNGbX4Rtfk9cIAE=; b=kXEK23mh5PqeCW2OMTBDn2IcgJ09IySD2TtnXyaHTCZhUc/pL6bwi+le8ZUptXmlSr FKkiYAvhWXPxnwXDHy0wxZAzWaffREVkVQfZUl8/cakz6nrlpj5xqplJNJ6ZCpNuAGEr 8ppJChbrpBgsPDfnoXE//Bm4KSbekwXYAFAWTfYP2D9ChGAwFUN/gu6JaLVM/IZ9lIb7 6Xgz/chqtr60i83gYMKMiJv+qNHrfiYQBuURPNdj7Bf2+MC4EMyBGHwAVkh/1rI/WcQf AmIKjQWW42r3XQ4x+y9E9zmS7ZNKviiBtMj5XG7i6tprLTiOxINyaybTaSqk/u3OziWD 3/3w== X-Gm-Message-State: AOJu0Yy5TBU9ej1KmzGfKAzTTqmkEv2MDR3AUXE9h6q/ksJ3IRalQwsX rXBtZMdXojLjSRkXh0SnnhWyIhostKka9IneTQKwyMtvZ0RzTKX78IflYKGUrzapZdbOXB+gNqE FremP7/OUnr7H0E23jxEatqy/BNOEW/XOACg8vzTkDYK4nGDJV+gH2PFoURuIb/YICDSrYe4P3h RC4xr/hRiQINvWCTxvEiGfwfcXLtvgRBX5jmIe X-Received: by 2002:ac2:43a7:0:b0:51f:488d:274b with SMTP id t7-20020ac243a7000000b0051f488d274bmr7380948lfl.9.1714981911087; Mon, 06 May 2024 00:51:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5y4XSOJBGkYbB0DiMot1XTqK1b7oEUD78cvcqzv2a/rQeyWtSA2lt8AkN3DzlmPQE22fcmA== X-Received: by 2002:ac2:43a7:0:b0:51f:488d:274b with SMTP id t7-20020ac243a7000000b0051f488d274bmr7380934lfl.9.1714981910727; Mon, 06 May 2024 00:51:50 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id bk1-20020a170907360100b00a59c841ebb2sm1388352ejc.201.2024.05.06.00.51.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/46] avr: switch boards to "default y" Date: Mon, 6 May 2024 09:50:48 +0200 Message-ID: <20240506075125.8238-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with AVR. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/avr-softmmu/default.mak | 5 ++--- hw/avr/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/devices/avr-softmmu/default.mak b/configs/devices/avr-softmmu/default.mak index 80218add98c..4207e7b3ce2 100644 --- a/configs/devices/avr-softmmu/default.mak +++ b/configs/devices/avr-softmmu/default.mak @@ -1,5 +1,4 @@ # Default configuration for avr-softmmu -# Boards: -# -CONFIG_ARDUINO=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_ARDUINO=n diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index d31298c3cce..b29937be414 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -5,5 +5,8 @@ config AVR_ATMEGA_MCU select AVR_POWER config ARDUINO + bool + default y + depends on AVR select AVR_ATMEGA_MCU select UNIMP From patchwork Mon May 6 07:50:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FKJcSlzw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtvn5QzJz1yZk for ; Mon, 6 May 2024 17:53:57 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t96-0005u0-RX; Mon, 06 May 2024 03:52:24 -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 1s3t8h-0005lF-Jc for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:59 -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 1s3t8g-0001cF-37 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:51:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981917; 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=fbRcX/gpwNAE5Vz8aXltJ8y/z7iGDUMqF8FDXO7YTrk=; b=FKJcSlzwQOlJ+6WFe0mcREwhRWq3v1+0HdhcFWpPxDlgHgiJmC8Vqqcflj5j8deeoFts82 zWgrZfAeYhKTcKwQaFsK9fzJxVl6HJovPn9q/GWCnKw1c3U2VKX7QRzAjicfB9IZfg2SdK ++N5d4wS3qqVYoa73SpjQlaC8oBiGDQ= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-JTlkYXEtNxOPvP1NPmPStw-1; Mon, 06 May 2024 03:51:55 -0400 X-MC-Unique: JTlkYXEtNxOPvP1NPmPStw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59c0ecd59cso80944666b.2 for ; Mon, 06 May 2024 00:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981914; x=1715586714; 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=fbRcX/gpwNAE5Vz8aXltJ8y/z7iGDUMqF8FDXO7YTrk=; b=tcyN1AO+2zGOR6Xmv7m2S+2EcaHP6pNvH4jyK3qJyjiQTG/VSJcQchGj4QnSPxhmvN aCVB2NkHDiLG7I+etKKRqNQu/wJK3xoqchtMQKVptWHuP8vXYUCiMEwrFW2blFeN9rfy I958/eLiDSm5JUuMqzgyCnglvsHDf34TIfrClAj1PZzE12QxUkyuKnJRcCnKnSvkXeRS k9jaL+P6BGnYKsQVY/VNieo3UDzdRear4ZJzn9mr1JDFlqIDXTXLaqGLa6tOsyqkLVqX Zos+LbXpg6PFH2NxkdWvYGdvBzpDIVzmqxX6rS/1Fdplx1ppNSVRMS8eR8NohctvXghQ i7Jg== X-Gm-Message-State: AOJu0YwWGyl/KbAHx/W6GrvU7LDqRviMQxbbdL+ZAA9cgpM5ZAexBJ4J tw479RobEYFgfXM4lYmrC8uHE4L/3zgDTTPMNUum4ABnCjwwUKaRHXQMcsgHxJ+hUEthkKEC01X UV1o75dEXq3TO07jLcRfSdx+fen1FfieeD1FsoyIyImWokz91iykgNMyyqn/b0smZisiGrZo+WZ g2MZ1v7zHjkx9h5WYEeeYV2pxc7QhjXe9w0D+P X-Received: by 2002:a17:907:72c3:b0:a59:c327:25b with SMTP id du3-20020a17090772c300b00a59c327025bmr3838279ejc.12.1714981913761; Mon, 06 May 2024 00:51:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbwUXK78DOT3sgz02OV/1U7wlH5CqztiV4RjBKZKrp28UiBgNHuOWS9opKzrs5LIqwyAXTUQ== X-Received: by 2002:a17:907:72c3:b0:a59:c327:25b with SMTP id du3-20020a17090772c300b00a59c327025bmr3838260ejc.12.1714981913437; Mon, 06 May 2024 00:51:53 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id bf14-20020a170907098e00b00a59c3e28917sm1571335ejc.70.2024.05.06.00.51.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/46] cris: switch boards to "default y" Date: Mon, 6 May 2024 09:50:49 +0200 Message-ID: <20240506075125.8238-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with CRIS. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/cris-softmmu/default.mak | 5 ++--- .gitlab-ci.d/buildtest.yml | 3 ++- hw/cris/Kconfig | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/devices/cris-softmmu/default.mak b/configs/devices/cris-softmmu/default.mak index 5932cf4d06f..ff73cd40847 100644 --- a/configs/devices/cris-softmmu/default.mak +++ b/configs/devices/cris-softmmu/default.mak @@ -1,5 +1,4 @@ # Default configuration for cris-softmmu -# Boards: -# -CONFIG_AXIS=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_AXIS=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 3a03cdb0151..f4dc5666467 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -662,7 +662,8 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: alpha-softmmu avr-softmmu s390x-softmmu sh4-softmmu + TARGETS: alpha-softmmu avr-softmmu cris-softmmu + s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index 884ad2cbc0d..26c7eef7437 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -1,5 +1,7 @@ config AXIS bool + default y + depends on CRIS select ETRAXFS select PFLASH_CFI02 select NAND From patchwork Mon May 6 07:50:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L81vWV+o; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv5y5LRzz1yZk for ; Mon, 6 May 2024 18:02:46 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9A-0005x3-1S; Mon, 06 May 2024 03:52:28 -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 1s3t8j-0005nO-H6 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:01 -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 1s3t8i-0001cg-1w for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981919; 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=iN4tbNSzLnnxZylnaIpsJ38zvZ6eIX3lpJVpzpt9iIU=; b=L81vWV+oFNp4AxhIbrqUjXGk84AxusQXHkhIHfgj3n56rFgJ15tuI+yQc6q2f9FOH90HII VmZw6sp58zZIvuHa0+49Rb/lpMtQF3F86Dfy5GnGwJwrFqLZpRZHlegBHvU7NdqbrGxpsw uSA/CXeFZjG++lsCZSsoPKjbKvn6FRw= 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-150-Cnz3ngx6OXCYPRKSGg76mQ-1; Mon, 06 May 2024 03:51:57 -0400 X-MC-Unique: Cnz3ngx6OXCYPRKSGg76mQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59c02f798bso98239266b.1 for ; Mon, 06 May 2024 00:51:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981916; x=1715586716; 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=iN4tbNSzLnnxZylnaIpsJ38zvZ6eIX3lpJVpzpt9iIU=; b=RkyCBUS4xkT88zpQXYccNp6SLr5oWHED64ncQXYESpRycn3P3QjAZUwLKvCf+vYtRX Vv0SzSwzj1kOidcmZ5qLpYv+SW0LF33VihvNQuwnVeM9nzn91v9DTxAqn+mlnEGTbhtE 0w8TZTNUoS10EwMbjwX3YthHDZIcWBF/SWNy11kYlufUwttX2aDwOHJ5NG2UyQlqv9NV MaEzDthI7aR1Wc9H2m5JeksgSuVf0mOOdUJmT4tvoh1BAKEvnbj8VhaP1sT71xF2xwVq 0AE6/Rnl6qCmDgrF9svGj2p2X5+jyU8jkpQHBo8XH1vivn9cynaVZiH9Xxcgw8J9kQC0 Al8g== X-Gm-Message-State: AOJu0YzMnjnq/uuY15dXyqZHuhOzZoNzV8lzs6TKxgxf4sFT7pNVQ5SB PIuoWWl/whNjCUSNKARp64qHMFwzTHwjp1wMkqhzAwdjei+YqnJlSa1AuYxF+/Uov3+JPF5JTM+ p1aXMudVTwoWWviM/Pasf/zJMT4uHtaJQcKvsQ3WSZvfEConbUjC2pwkIDrY6pIc1RhaFE6ngPX pAyIkVhHOLAAdaSWv2+GeoeGoyHm385r67bydI X-Received: by 2002:a17:906:b858:b0:a59:a282:5dbd with SMTP id ga24-20020a170906b85800b00a59a2825dbdmr5691781ejb.66.1714981916103; Mon, 06 May 2024 00:51:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEszT7UWcHMI2CfPXwjJuy1hwAjF2JBB5MnKqWapjNPKVFMuKN8Kn1xbAH/prdcQKVjUbG8PA== X-Received: by 2002:a17:906:b858:b0:a59:a282:5dbd with SMTP id ga24-20020a170906b85800b00a59a2825dbdmr5691767ejb.66.1714981915705; Mon, 06 May 2024 00:51:55 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id a6-20020a1709064a4600b00a59c3a49fc6sm1612424ejv.72.2024.05.06.00.51.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/46] hppa: switch boards to "default y" Date: Mon, 6 May 2024 09:50:50 +0200 Message-ID: <20240506075125.8238-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with PARISC. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/hppa-softmmu/default.mak | 5 ++--- .gitlab-ci.d/buildtest.yml | 2 +- hw/hppa/Kconfig | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/devices/hppa-softmmu/default.mak b/configs/devices/hppa-softmmu/default.mak index b0364bb88f2..059510cdbb7 100644 --- a/configs/devices/hppa-softmmu/default.mak +++ b/configs/devices/hppa-softmmu/default.mak @@ -4,6 +4,5 @@ # #CONFIG_PCI_DEVICES=n -# Boards: -# -CONFIG_HPPA_B160L=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_HPPA_B160L=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f4dc5666467..6531758d968 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -662,7 +662,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: alpha-softmmu avr-softmmu cris-softmmu + TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index ee7ffd2bfb5..d4d457f4ab4 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,5 +1,7 @@ config HPPA_B160L bool + default y + depends on HPPA imply PCI_DEVICES imply E1000_PCI imply USB_OHCI_PCI From patchwork Mon May 6 07:50:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=M8q1Jx2Z; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttp4pq1z1ydY for ; Mon, 6 May 2024 17:53:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t99-0005wB-Sj; Mon, 06 May 2024 03:52:27 -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 1s3t8l-0005nw-Vj for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:05 -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 1s3t8k-0001dE-9L for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981921; 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=mLtwWTWfNv2VfsTY39DtTXStmqm0cUSHqzSKDrvw7yw=; b=M8q1Jx2Z04f/wb2ARp7ElrZ2VwflmeVi39QTSk0wkYRh2dxSw6eoynTD7dUCRY2JdSnQSX ubKjQIysQzhi9B6bz1rxGD42xiVTsn8RDUE31aYLyGf9eBJZ/oQli1G4qKDMzI1d7w2Sah 13P2HtY54h94OHW3+OHe5esidMMlKcs= 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-279-lIHBQG9dPbuYH7BYjg2xZg-1; Mon, 06 May 2024 03:51:59 -0400 X-MC-Unique: lIHBQG9dPbuYH7BYjg2xZg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a59c3cf5f83so65095766b.2 for ; Mon, 06 May 2024 00:51:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981918; x=1715586718; 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=mLtwWTWfNv2VfsTY39DtTXStmqm0cUSHqzSKDrvw7yw=; b=Ba7U60HzlLmasRIlLnnrh8+jWP3TXon4SebY3PLzeNXFf+Rligf0HM3Ha0fUnv17Kp 0GA8CFTRqy/krI5GjPHUAt27s1mxWmMUXLXLn2kHf4BbsOoVHa726Yg+CDyQrxh1en+O g5Dx3WkkFp3QmDr5/cFsUQY/sv8M2fHXmx76LkH5p1I0fw3WANquMDG0ferilI9wk4FT P9RtG9riC392lFHgaPE8115R3NexAo6SPet745Ih11auP4PjShmd1nfIc5jWTUIBKmEt 9WXPkd29m378eOlujt9WjtMv15DTC8p0MSgPfJSm0a7Ju4qbzvqkBeKoiPB/rOonW5Or cQ4Q== X-Gm-Message-State: AOJu0YwO/O21wpgEQHrruuvfiI09Ux60arKXyUqF6v3e47InZxeSg6Ad NR7QSHmsSmZc0jBpmPzEaYZfigDqf+0YlMA15f1ysdKi03W6byLngR9BWgIkvoFe6tL+wL2y6R8 zlAIAogwf1XhOL4/wcoeXENhR94uWxe30OfuOUl8NFaoy8V3WlSx6ClE/meEhZA6EJwH/iM172d yQNWeodeOC5jXKi+7rbnyDJwNTZVp/ozUzpP4c X-Received: by 2002:a17:906:3c59:b0:a59:ab57:7418 with SMTP id i25-20020a1709063c5900b00a59ab577418mr2632456ejg.71.1714981918341; Mon, 06 May 2024 00:51:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgCG9AfPlAsDNGUXVrEoK7u/PvLi5jA/zEgiCva7eGVY/2DNlSoCfAtBZwr5hBBo46k+RXFA== X-Received: by 2002:a17:906:3c59:b0:a59:ab57:7418 with SMTP id i25-20020a1709063c5900b00a59ab577418mr2632449ejg.71.1714981917954; Mon, 06 May 2024 00:51:57 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id a24-20020a170906671800b00a59c5a129basm1510345ejp.80.2024.05.06.00.51.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/46] i386: switch boards to "default y" Date: Mon, 6 May 2024 09:50:51 +0200 Message-ID: <20240506075125.8238-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with i386. No changes to generated config-devices.mak files, other than adding CONFIG_I386 to the x86_64-softmmu target. Signed-off-by: Paolo Bonzini --- configs/devices/i386-softmmu/default.mak | 11 +++++------ .gitlab-ci.d/buildtest.yml | 3 ++- hw/i386/Kconfig | 10 +++++++++- target/i386/Kconfig | 1 + 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak index 598c6646dfc..448e3e3b1ba 100644 --- a/configs/devices/i386-softmmu/default.mak +++ b/configs/devices/i386-softmmu/default.mak @@ -24,9 +24,8 @@ #CONFIG_VTD=n #CONFIG_SGX=n -# Boards: -# -CONFIG_ISAPC=y -CONFIG_I440FX=y -CONFIG_Q35=y -CONFIG_MICROVM=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_ISAPC=n +# CONFIG_I440FX=n +# CONFIG_Q35=n +# CONFIG_MICROVM=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 6531758d968..75222c4450b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -648,7 +648,8 @@ build-tci: - make check-tcg # Check our reduced build configurations -# requires libfdt: aarch64, arm +# requires libfdt: aarch64, arm, i386, x86_64 +# does not build without boards: i386, x86_64 build-without-defaults: extends: .native_build_job_template needs: diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index a6ee052f9a1..4362164962c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -66,6 +66,8 @@ config PC_ACPI config I440FX bool + default y + depends on I386 imply E1000_PCI imply VMPORT imply VMMOUSE @@ -81,6 +83,8 @@ config I440FX config ISAPC bool + default y + depends on I386 imply VGA_ISA select ISA_BUS select PC @@ -91,6 +95,8 @@ config ISAPC config Q35 bool + default y + depends on I386 imply VTD imply AMD_IOMMU imply E1000E_PCI_EXPRESS @@ -108,6 +114,8 @@ config Q35 config MICROVM bool + default y + depends on I386 select SERIAL_ISA # for serial_hds_isa_init() select ISA_BUS select APIC @@ -142,4 +150,4 @@ config VMMOUSE config XEN_EMU bool default y - depends on KVM && (I386 || X86_64) + depends on KVM && I386 diff --git a/target/i386/Kconfig b/target/i386/Kconfig index 46898946394..ad9291d3b8f 100644 --- a/target/i386/Kconfig +++ b/target/i386/Kconfig @@ -5,3 +5,4 @@ config I386 config X86_64 bool + select I386 From patchwork Mon May 6 07:50:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z4OJxBz1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXvBf1XRQz1yZk for ; Mon, 6 May 2024 18:06:50 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t97-0005uK-53; Mon, 06 May 2024 03:52:25 -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 1s3t8n-0005o4-Vr for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:06 -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 1s3t8m-0001dV-If for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981923; 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=Tpj0GLKdyQenhxApFtKcWrPJj8IHK+zOooWEIXzunbA=; b=Z4OJxBz1zDzbQEtph0v6gR6+orTCHZIYs3q5/Rb8ZPBWc/ENZk/LBPvy76QwY5fAzvDT1R XCFUul6U1lJOZ1K+AZRkTU8e0od+6/GvM+Z7qk94N9XucNiedw/G44juh29XlaqIi8JAYI KPKGBSM+6CkQ+le0wndfxq6yLqIe2I8= 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-609-HpUuD6daOaSMRGMGtyowxQ-1; Mon, 06 May 2024 03:52:02 -0400 X-MC-Unique: HpUuD6daOaSMRGMGtyowxQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59cbb6f266so53706266b.3 for ; Mon, 06 May 2024 00:52:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981920; x=1715586720; 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=Tpj0GLKdyQenhxApFtKcWrPJj8IHK+zOooWEIXzunbA=; b=j0fFHCkMXpKK3Gvsf4xLaGS5k560BiaDGvlOedGGMIga9sfopSwB7Mv8KC3wpn2Sju DxcrHEanjKBSSb/koDAi9CQaKo/7b2oLQCj4fzYvyTMfoMebsH7tMETpqXzEqkn5S8ey gsqwlwRZtaanoskJCNYNHj/1GRSLn4uOPowiVU00U/Na+Cx3Wfgl8h6NUVnvQjgODRFH FnlsN1/0fCvfFtmvJr+ZGdGlpyHTVKLDvrmRghs+7G6dcpxKU+MpSRywwbhzEAMuRlZ9 4N6RxUzjoOqJkr/RTOc1WfBttaBY1yXaL3WbLY12pjlYWE9pLcfWmI9bq0nVwSewHScO JUJA== X-Gm-Message-State: AOJu0YzFjHCieei++Y42EhKytJ2dOpjuiXzsLWh+RWEWkmbVh+OLKqq1 X1nRufQxmvG9utqhseX3LfPMlNMmU5jcokKaogwl5L1hiFcwn3DrosfoV3eU/V5e44LSV32QUBT WWObAib4bNq8BOkJ3tPJxsr+Ikdf604gZUvMpe8COIFQdj9VxMwhT0q7LW/21LS9trTe2Rws0ih lai2mpqYXndx9Xkq6QCBNR/LE7nMlbAtiypuDb X-Received: by 2002:a17:906:ddb:b0:a59:bfd6:bf2c with SMTP id p27-20020a1709060ddb00b00a59bfd6bf2cmr3833946eji.7.1714981920571; Mon, 06 May 2024 00:52:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJxDIuqJSJw5yF5zNogglTpt690fUknOLHcXwCcv6f48mWw6z+EOdKZVnWAr3Vyha4KVVaHQ== X-Received: by 2002:a17:906:ddb:b0:a59:bfd6:bf2c with SMTP id p27-20020a1709060ddb00b00a59bfd6bf2cmr3833926eji.7.1714981920211; Mon, 06 May 2024 00:52:00 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id fy20-20020a170906b7d400b00a59ac65a13csm2546977ejb.179.2024.05.06.00.51.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:51:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/46] loongarch: switch boards to "default y" Date: Mon, 6 May 2024 09:50:52 +0200 Message-ID: <20240506075125.8238-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with Loongarch. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/loongarch64-softmmu/default.mak | 3 ++- .gitlab-ci.d/buildtest.yml | 4 ++-- hw/loongarch/Kconfig | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/devices/loongarch64-softmmu/default.mak b/configs/devices/loongarch64-softmmu/default.mak index 0893112b81d..ffe705836fd 100644 --- a/configs/devices/loongarch64-softmmu/default.mak +++ b/configs/devices/loongarch64-softmmu/default.mak @@ -3,4 +3,5 @@ # Uncomment the following lines to disable these optional devices: # CONFIG_PCI_DEVICES=n -CONFIG_LOONGARCH_VIRT=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_LOONGARCH_VIRT=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 75222c4450b..a82848ba55b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -648,8 +648,8 @@ build-tci: - make check-tcg # Check our reduced build configurations -# requires libfdt: aarch64, arm, i386, x86_64 -# does not build without boards: i386, x86_64 +# requires libfdt: aarch64, arm, i386, loongarch64, x86_64 +# does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template needs: diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig index 5727efed6d8..78640505630 100644 --- a/hw/loongarch/Kconfig +++ b/hw/loongarch/Kconfig @@ -1,5 +1,7 @@ config LOONGARCH_VIRT bool + default y + depends on LOONGARCH64 select PCI select PCI_EXPRESS_GENERIC_BRIDGE imply VIRTIO_VGA From patchwork Mon May 6 07:50:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a/w0js4r; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttm31MWz1yZk for ; Mon, 6 May 2024 17:53:04 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t93-0005sl-NR; Mon, 06 May 2024 03:52:21 -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 1s3t8r-0005p3-FN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:12 -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 1s3t8p-0001dl-Ss for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981926; 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=eITcF/h9MNjyV6fka9J98I4MflYQxu806VbEWIkwiqU=; b=a/w0js4rEC4YJSwfVkmps2AbRj2YIBlO1YYxJyKwJVDp8rVpURpebVb98CgHfzLW8YjPlR igT3MO0ySz1OIZsH2cRgBxUxTbQ/Ve3NS+h/Q1r4iOy0BaG+cUp0p5l2I/WnD+uI5wwEh5 pFmPpHSP5mp/UtINFim4TfM4sYRFBy8= 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-519-V6F_0eSWNEWB2qpa3k6-Ng-1; Mon, 06 May 2024 03:52:04 -0400 X-MC-Unique: V6F_0eSWNEWB2qpa3k6-Ng-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a59cdf2141eso36349266b.2 for ; Mon, 06 May 2024 00:52:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981923; x=1715586723; 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=eITcF/h9MNjyV6fka9J98I4MflYQxu806VbEWIkwiqU=; b=Vd5lzEa+0GsuaQ0qLB087noAUgtE3rcFSI1vtVceA/V5JUXiG6iW0vSG8/jNCkuy/c /jc1241XdM7/uCfUG4dEs7RIxoCpPnfuTVXUr9frHWYBXsNLPNDOoKJQviWHWejn6twz rrGIsnCGsuopataOZUsISQzO0U0gk1g7J71y+9K0uqtWOxo+CyzFWPvS0SPXZautx+vE mLwfMqPZnNt9wjR2xGYlSe0xEjmOZgWSvHRJN0rnRl+JKGt3BHjn+4GkEObAE0o4YGXY UhezV56nvJFUp6lHvw27Cqs71dAz+MPDE5bh8RlgCohjGII7xm8d6WadigfU4XY0FUqO MR+A== X-Gm-Message-State: AOJu0YwsE+sQPw1bB/MJ1TUh3Nk2k6drpzPqnp1OuoaRP9NbwR8kJh61 yB6glAMKyDh3zCJMb6ycLPRrnFRBFz5Zj+ma6HutBNdal+Ok44poqwYyclYnXge+MEg7WBkOBSL QkZBrTNekZoHb2AlbMMJqhe2WLRwjFixmbXmTnrMJv4K+8JaMVj+OQJiPzrqVuK3g0PvKjDd2Hi ZvTOSLh55IWlvRm0yKrnnUM0LiBtwCuvykfOUX X-Received: by 2002:a17:906:26d7:b0:a59:7ed4:fad5 with SMTP id u23-20020a17090626d700b00a597ed4fad5mr5185549ejc.54.1714981923000; Mon, 06 May 2024 00:52:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJf2lfL6FEtXsvvNAZvQ4mkJAM5hMsWgRgjpdoyZgm9VAEl5aGPNz5XXe5mZucpzCbRGMHkQ== X-Received: by 2002:a17:906:26d7:b0:a59:7ed4:fad5 with SMTP id u23-20020a17090626d700b00a597ed4fad5mr5185531ejc.54.1714981922632; Mon, 06 May 2024 00:52:02 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id bk15-20020a170906b0cf00b00a52244ab819sm5008600ejb.170.2024.05.06.00.52.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/46] m68k: switch boards to "default y" Date: Mon, 6 May 2024 09:50:53 +0200 Message-ID: <20240506075125.8238-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with m68k. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/m68k-softmmu/default.mak | 13 ++++++------- .gitlab-ci.d/buildtest.yml | 2 +- hw/m68k/Kconfig | 10 ++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/configs/devices/m68k-softmmu/default.mak b/configs/devices/m68k-softmmu/default.mak index 8dcaa28ed38..3ceda6b041b 100644 --- a/configs/devices/m68k-softmmu/default.mak +++ b/configs/devices/m68k-softmmu/default.mak @@ -1,9 +1,8 @@ # Default configuration for m68k-softmmu -# Boards: -# -CONFIG_AN5206=y -CONFIG_MCF5208=y -CONFIG_NEXTCUBE=y -CONFIG_Q800=y -CONFIG_M68K_VIRT=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_AN5206=n +# CONFIG_MCF5208=n +# CONFIG_NEXTCUBE=n +# CONFIG_Q800=n +# CONFIG_M68K_VIRT=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a82848ba55b..a91e8d359d5 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -663,7 +663,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu + TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index d88741ec9d1..0092cda4e9c 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -1,20 +1,28 @@ config AN5206 bool + default y + depends on M68K select COLDFIRE select PTIMER config MCF5208 bool + default y + depends on M68K select COLDFIRE select PTIMER config NEXTCUBE bool + default y + depends on M68K select FRAMEBUFFER select ESCC config Q800 bool + default y + depends on M68K select MAC_VIA select NUBUS select MACFB @@ -29,6 +37,8 @@ config Q800 config M68K_VIRT bool + default y + depends on M68K select M68K_IRQC select VIRT_CTRL select GOLDFISH_PIC From patchwork Mon May 6 07:50:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gUZ1DGig; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtvh37QCz1yZk for ; Mon, 6 May 2024 17:53:52 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9N-0006Qz-Ku; Mon, 06 May 2024 03:52:41 -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 1s3t8u-0005pj-37 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:12 -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 1s3t8r-0001e3-FX for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981928; 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=cP3nWL94R08Eo67ZV+TaTc1CdPSmPODit+By5QzQoEE=; b=gUZ1DGigP0OlyS0Awr0xNNZvvrt9ZbqcEyHlTKfM5/9JiBt9r+M2Af2+s74xwq2JiE5C+Z fwAYuf7B5oG4yAZwR1WQkPXnGarQLbo8/NoKMaYv5EgHQgZqII1MQ8Gzo8lWVi9wiSDsX5 Eh4p40Nz6DSLgoLVGemketaFfnVAx6k= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-398-MMSJi--VOT-puKbRGEWYxQ-1; Mon, 06 May 2024 03:52:06 -0400 X-MC-Unique: MMSJi--VOT-puKbRGEWYxQ-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-572ba1df326so501289a12.2 for ; Mon, 06 May 2024 00:52:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981925; x=1715586725; 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=cP3nWL94R08Eo67ZV+TaTc1CdPSmPODit+By5QzQoEE=; b=p4DoxWE2zqHK0tbXLDlR5OLWxOPqMvZYCHeguYqDnVlFEk+3KI4MRL5F/vZUNaRAUV KtbC4w9yssUA3eeaKJ2NQkf4dHSg0e6Glx475f3u3Exj50pXtvAyhypm3S0f28/DChSP 3zvtURKGDjvaTS4k5vWGGCBwdtti23jWsG2h7PqKMzhJgSxEKwl0YrNmnMEDYoOvuwYO 7eqWqI6ab7j1NQP+HUAbG49861Nu8GGW/O6ITiTsCGxjm2HqEmJOQzLTwsL/zrLYix6j fcV6U7UdjoOaGnZvi2DgiGNUaIKTsFcf5tPK8snXsQ+7sttMFhxiqPad6piTn7XQ6BOS a7/w== X-Gm-Message-State: AOJu0YwAqkR4cfIkq6Brb+cMLKAiPlfd7Dr2kkzSXAEfNaPM8O60HZah i04TqIq1Fqp0z+Cdna7eVlqnrWrxjK8RwepynPlqBqKXerjMHFLwKdv9rcqJHtJIQxarAT/RoGG JXg4PA9nNhc6mNRDmPrWuU0DaOG7+etdGOZkOmqZdCrirTZw35h3D06DOmuCfPJH6yTShTHbJfg c7gc9FyaKhp20yQsWi+A6brh3XEQNA0O9zjRSm X-Received: by 2002:a50:8a96:0:b0:572:65d3:803c with SMTP id j22-20020a508a96000000b0057265d3803cmr7680805edj.0.1714981925306; Mon, 06 May 2024 00:52:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHy9p1zDeCaFNCPq87ATV8ryWATOXqbWc8CoJP6jDYnU7Gokxn6w26XZyA7AtCA+hqDVtPWHg== X-Received: by 2002:a50:8a96:0:b0:572:65d3:803c with SMTP id j22-20020a508a96000000b0057265d3803cmr7680790edj.0.1714981924903; Mon, 06 May 2024 00:52:04 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id ze15-20020a170906ef8f00b00a59ae3efb03sm2425669ejb.3.2024.05.06.00.52.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/46] microblaze: switch boards to "default y" Date: Mon, 6 May 2024 09:50:54 +0200 Message-ID: <20240506075125.8238-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with Microblaze. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/microblaze-softmmu/default.mak | 9 ++++----- .gitlab-ci.d/buildtest.yml | 3 ++- hw/microblaze/Kconfig | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configs/devices/microblaze-softmmu/default.mak b/configs/devices/microblaze-softmmu/default.mak index db8c6e4bba3..583e3959bb7 100644 --- a/configs/devices/microblaze-softmmu/default.mak +++ b/configs/devices/microblaze-softmmu/default.mak @@ -1,7 +1,6 @@ # Default configuration for microblaze-softmmu -# Boards: -# -CONFIG_PETALOGIX_S3ADSP1800=y -CONFIG_PETALOGIX_ML605=y -CONFIG_XLNX_ZYNQMP_PMU=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_PETALOGIX_S3ADSP1800=n +# CONFIG_PETALOGIX_ML605=n +# CONFIG_XLNX_ZYNQMP_PMU=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a91e8d359d5..e2e92f25c58 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -648,7 +648,8 @@ build-tci: - make check-tcg # Check our reduced build configurations -# requires libfdt: aarch64, arm, i386, loongarch64, x86_64 +# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, +# x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index e2697ced9cc..d78ba843fac 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -1,5 +1,7 @@ config PETALOGIX_S3ADSP1800 bool + default y + depends on MICROBLAZE select PFLASH_CFI01 select XILINX select XILINX_AXI @@ -8,6 +10,8 @@ config PETALOGIX_S3ADSP1800 config PETALOGIX_ML605 bool + default y + depends on MICROBLAZE select PFLASH_CFI01 select SERIAL select SSI_M25P80 @@ -18,4 +22,6 @@ config PETALOGIX_ML605 config XLNX_ZYNQMP_PMU bool + default y + depends on MICROBLAZE select XLNX_ZYNQMP From patchwork Mon May 6 07:50:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YS8rZR4G; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3342VNz1xnS for ; Mon, 6 May 2024 18:00:15 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9E-00068E-7P; Mon, 06 May 2024 03:52:32 -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 1s3t8v-0005qT-OC for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:14 -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 1s3t8t-0001eK-S8 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981931; 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=D0edKtfywX3SnvAhiP6Z2wG4KJKnWgcP/HKkK2g/aBA=; b=YS8rZR4GSRwowVP4OHHMZ8KonboD+V6GKTFvb3R9D+xh9a5EcBbZNfTVQONfofR10FX+Nn Q0+uf4Dkrp0uc8bQclKwB+UexmycRzorRQGBKZtntXvqq2SlO6SzcAMIX9Ts3SvL4xmrep eW5WKNNj5aakADUYsMf66GAmoPunhPE= 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-175-jhNOLEpcNpi9j3l971kqyg-1; Mon, 06 May 2024 03:52:09 -0400 X-MC-Unique: jhNOLEpcNpi9j3l971kqyg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59c2583f0bso51903866b.1 for ; Mon, 06 May 2024 00:52:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981927; x=1715586727; 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=D0edKtfywX3SnvAhiP6Z2wG4KJKnWgcP/HKkK2g/aBA=; b=vms090WsuHbx+5vtPpy9qgGv72WivzXSttQ3VwgY39lhKA62sEbs/mpIdF70sTdfZw iSRgrAfAf4zMVZIVGypHo049gVjrGtAZW0Re4cqYR+5ViI0vQFkHuMY9m/5lAUe5EIo1 X4hxbTmiw1+1IKE3OhaD2WA8pljGloS/tjNJ/7kItuH+0oYsMFxQIw+C6sEZGKC8h1Hz nTCWCy4XC+OiirpSfO7urqv2wBOERaTk8FxF3uOufHB/sxczLFNXuWGAVc5cBSAc1qQm DqfNg2UuAvdMD2j34qtaK9+kWHwbYpF6vUuSRChLGY8jAvSPHCueN2disidvv0eHfjL0 9JmA== X-Gm-Message-State: AOJu0YyRloXeQii5of0x2AETawGprXsbQVybUxl+T4t++cmmmq9Bhr/Y NpCTAmHgE/CbIHOj9RKsdQBiJI++CqUXUVhum2u2w7S7a3/rQGppLKzmTRfZvDQxW+NczhQRkv1 4C4V9lPjK1rbBufDqDXqu6aypo+GUh5LR2jl+5PJec6VZLQb4lYCAhR5MFyV1w5PJnynqoSb/il 9L9AXk2qssjG4sxe5mt0gxe0xwV+3T78xcNeWg X-Received: by 2002:a17:907:980d:b0:a59:cfab:50d with SMTP id ji13-20020a170907980d00b00a59cfab050dmr1272069ejc.2.1714981927535; Mon, 06 May 2024 00:52:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZS2Qrjc+l3+yBbOFnIp+kZcWbkUWQE38GaQKhMZOH0GQtGvj7bV5hrVRu7Xe0bfTCJjvFSw== X-Received: by 2002:a17:907:980d:b0:a59:cfab:50d with SMTP id ji13-20020a170907980d00b00a59cfab050dmr1272055ejc.2.1714981927177; Mon, 06 May 2024 00:52:07 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id w24-20020a17090652d800b00a59aa17f23fsm2573863ejn.203.2024.05.06.00.52.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/46] meson: make target endianneess available to Kconfig Date: Mon, 6 May 2024 09:50:55 +0200 Message-ID: <20240506075125.8238-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. MIPS boards may only be available for big-endian or only for little-endian emulators, add a symbol so that this can be described with a "depends on" clause. Signed-off-by: Paolo Bonzini --- meson.build | 12 +++++++----- target/Kconfig | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 5db2dbc12ec..43da4923721 100644 --- a/meson.build +++ b/meson.build @@ -3005,7 +3005,7 @@ foreach target : target_dirs } endif - accel_kconfig = [] + target_kconfig = [] foreach sym: accelerators if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } @@ -3015,10 +3015,10 @@ foreach target : target_dirs else config_target += { 'CONFIG_TCG_BUILTIN': 'y' } endif - accel_kconfig += [ sym + '=y' ] + target_kconfig += [ sym + '=y' ] endif endforeach - if accel_kconfig.length() == 0 + if target_kconfig.length() == 0 if default_targets continue endif @@ -3078,6 +3078,9 @@ foreach target : target_dirs configuration: config_target_data)} if target.endswith('-softmmu') + target_kconfig += 'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y' + target_kconfig += 'CONFIG_TARGET_BIG_ENDIAN=' + config_target['TARGET_BIG_ENDIAN'] + config_input = meson.get_external_property(target, 'default') config_devices_mak = target + '-config-devices.mak' config_devices_mak = configure_file( @@ -3088,8 +3091,7 @@ foreach target : target_dirs command: [minikconf, get_option('default_devices') ? '--defconfig' : '--allnoconfig', config_devices_mak, '@DEPFILE@', '@INPUT@', - host_kconfig, accel_kconfig, - 'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y']) + host_kconfig, target_kconfig]) config_devices_data = configuration_data() config_devices = keyval.load(config_devices_mak) diff --git a/target/Kconfig b/target/Kconfig index 5275a93ad02..7f64112e9e7 100644 --- a/target/Kconfig +++ b/target/Kconfig @@ -17,3 +17,6 @@ source sh4/Kconfig source sparc/Kconfig source tricore/Kconfig source xtensa/Kconfig + +config TARGET_BIG_ENDIAN + bool From patchwork Mon May 6 07:50:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HQj3UxhA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3D5w3qz213t for ; Mon, 6 May 2024 18:00:24 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t98-0005w9-KG; Mon, 06 May 2024 03:52:26 -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 1s3t8x-0005r7-AN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:17 -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 1s3t8v-0001eo-PT for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981933; 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=/DU50XkwxYuhVEPBKoJ+oPs10H2H4J3RCxabXElmSlk=; b=HQj3UxhAH94Xmm7DobP80eUgDlgzejyHG1c5XjgSQRGvakHQVj9URmG0u6mEjVvaDMT80F hkVnCYYmWAFw62NfsY6dIOoZte8sD0Q6Q3J4RgmaO6s80jjYnzFL3oRF4CJ90a2DGxPdXz DYVbujhVNSch9gPfPMlr/f2O0KRFUco= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-BLuM4K8aPhWFYvTiU4nOLQ-1; Mon, 06 May 2024 03:52:11 -0400 X-MC-Unique: BLuM4K8aPhWFYvTiU4nOLQ-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-572ef3eb368so215269a12.1 for ; Mon, 06 May 2024 00:52:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981930; x=1715586730; 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=/DU50XkwxYuhVEPBKoJ+oPs10H2H4J3RCxabXElmSlk=; b=rp9SYc9kKHvF2qvP00z6MoajbBdMJhAD898jUJUvZxt8ASQ3yfZ2luWQC61sYsoja/ gqSD9y3DKO6hAiMVw2yDKoBZ4o+UC9WhlSG4M5hRc712xE1EB9NdkCB8FyWZ3GqpEYh+ w6IUcguChpbps8x3Qs2QDDN/5cy476ksc3KauboIOwtFe9iCp3qu+EV/HXKCcNZES9QQ fpS9kr2xIKsc6Hq6a7cLmQ4nYFqybwH+6uIKnI+DpXkYASlWxal6MLD+ZkE2WS2rIR9E JRO4znKodvB7pBMYlYLrADF7p5vVLwHjH++UveraVM1Ju5hh8QhDekwp01kvgChdFrFc I7Gg== X-Gm-Message-State: AOJu0YwCobcYib34CVCuVVSK1cv4i1MUoJ70a+3UafI4RlrgrygW+Y5v 7w7bDHq/8Uj+lcYxqRhm0GFEISyBj7DI8G4qWM/973ykKErXyfyX1is7zVhC4JujP6Fk2CcZYjU Z5OXKQsC3heC30MSSiRMDBI7Snz9Yq7DwLe22gGS1um1xrVXSKRPWZS+f2k0o01JakXlzpl1DC0 8OqeCik12pW1njJ5fZqyUM50a3ngQWMf/IKO3h X-Received: by 2002:a50:8e16:0:b0:572:a17d:a302 with SMTP id 22-20020a508e16000000b00572a17da302mr4940693edw.42.1714981930094; Mon, 06 May 2024 00:52:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZ1+JV4lAk76pz7VFh1V5aSwRct4x0ttUcgJXg2KVa7LVUKokJ3k7xa2dhB4uAsJ30L6fkDA== X-Received: by 2002:a50:8e16:0:b0:572:a17d:a302 with SMTP id 22-20020a508e16000000b00572a17da302mr4940683edw.42.1714981929766; Mon, 06 May 2024 00:52:09 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id d10-20020a50ea8a000000b00571c1df911fsm4845755edo.37.2024.05.06.00.52.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/46] mips: switch boards to "default y" Date: Mon, 6 May 2024 09:50:56 +0200 Message-ID: <20240506075125.8238-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with MIPS. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/mips-softmmu/common.mak | 5 +++-- configs/devices/mips64-softmmu/default.mak | 4 +++- configs/devices/mips64el-softmmu/default.mak | 10 ++++++---- .gitlab-ci.d/buildtest.yml | 3 ++- hw/mips/Kconfig | 12 ++++++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 416a5d353e8..b50107feafe 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -4,5 +4,6 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -CONFIG_MALTA=y -CONFIG_MIPSSIM=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_MALTA=n +# CONFIG_MIPSSIM=n diff --git a/configs/devices/mips64-softmmu/default.mak b/configs/devices/mips64-softmmu/default.mak index 566672f3c22..1b8d7ced1c6 100644 --- a/configs/devices/mips64-softmmu/default.mak +++ b/configs/devices/mips64-softmmu/default.mak @@ -1,4 +1,6 @@ # Default configuration for mips64-softmmu include ../mips-softmmu/common.mak -CONFIG_JAZZ=y + +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_JAZZ=n diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak index 88a37cf27f1..9dce346c4fb 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -1,7 +1,9 @@ # Default configuration for mips64el-softmmu include ../mips-softmmu/common.mak -CONFIG_FULOONG=y -CONFIG_LOONGSON3V=y -CONFIG_JAZZ=y -CONFIG_MIPS_BOSTON=y + +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_FULOONG=n +# CONFIG_LOONGSON3V=n +# CONFIG_JAZZ=n +# CONFIG_MIPS_BOSTON=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index e2e92f25c58..811132443a7 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# x86_64 +# mips64el, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template @@ -665,6 +665,7 @@ build-without-defaults: --disable-qom-cast-debug --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu + mips-softmmu mips64-softmmu mipsel-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 5c83ef49cf6..9bccb363eb9 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,5 +1,7 @@ config MALTA bool + default y + depends on MIPS imply PCNET_PCI imply PCI_DEVICES imply TEST_DEVICES @@ -13,11 +15,15 @@ config MALTA config MIPSSIM bool + default y + depends on MIPS select SERIAL select MIPSNET config JAZZ bool + default y + depends on MIPS64 select ISA_BUS select RC4030 select I8259 @@ -38,6 +44,8 @@ config JAZZ config FULOONG bool + default y + depends on MIPS64 && !TARGET_BIG_ENDIAN imply PCI_DEVICES imply TEST_DEVICES imply ATI_VGA @@ -48,6 +56,8 @@ config FULOONG config LOONGSON3V bool + default y + depends on MIPS64 && !TARGET_BIG_ENDIAN imply PCI_DEVICES imply TEST_DEVICES imply VIRTIO_PCI @@ -69,6 +79,8 @@ config MIPS_CPS config MIPS_BOSTON bool + default y + depends on MIPS64 && !TARGET_BIG_ENDIAN imply PCI_DEVICES imply TEST_DEVICES select FITLOADER From patchwork Mon May 6 07:50:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TIq7txPV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv5x2qK6z1xnS for ; Mon, 6 May 2024 18:02:45 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t98-0005vU-4p; Mon, 06 May 2024 03:52:26 -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 1s3t90-0005rZ-7Z for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:19 -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 1s3t8y-0001fJ-QA for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981935; 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=8lqW75R0kfx7mTOUqcSRaHg3gZohk47UGz1fTQcjeIM=; b=TIq7txPVaiOab6BQqhtyeBDTEnMKEz+aCy1wgF+QFNoscmqYABRdn1XobC+a//U30mOLtN JUOUpZ12/DKp/XH5r+Niz4bNYZZz6IcoFgrTdLPEcjqKlVlncDmGjBkCZHbN7+PthUEQny 5qcci2ZjmIib9UG2/rBOsxFJ5ZiVhq4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-199-1bxTInLcPbOekdHWk8VG7w-1; Mon, 06 May 2024 03:52:14 -0400 X-MC-Unique: 1bxTInLcPbOekdHWk8VG7w-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5729ec37366so846500a12.0 for ; Mon, 06 May 2024 00:52:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981932; x=1715586732; 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=8lqW75R0kfx7mTOUqcSRaHg3gZohk47UGz1fTQcjeIM=; b=EM0rDf8uX8CLZL4gYUr4tgbyEqU0j5i8Xg1Mk8AL+pqw/+ZPVFv/WGK/FGk3fiTdvu W8XflfcqHPwxQs03y2A0eVn0I9Q2J/QfrLffzFeVilwwsw1/6Bv7WQg7Hw8jka57f/2j U+leMhccW2LPGvmOtJtxECbo64f/nlYpXrljsHyjsMRUwFPik3NQz1rZzPaAnybb/Usw zN21tfBGUq+ZJrdqE2dFQlJHuhPIQrxrMtnZLCC71fSw3/cVcBnCUGHjERilrMWRWi5E baWA0gIuEEYydxFE2cZRf+48daaXzO+xKz1j3gqLWeIG/z52Mi3CcFoRtYETimAizEWe FkRQ== X-Gm-Message-State: AOJu0Yzs5BNjbMdzE01VyZaPQXk1cr5LjXRNCR81PtbVqu+VMw5rvfcc i0jPz2QUr1Z+5yqslQNXbs5W8kF0JFEVnfDapp9OC3R5anEeK1P8i4QwIFJsrZZQ/tRa2pvfITy sIWT8962JnIvCZpF3oDHbopGdxyUyICJphU/or30XUmutXOugTHRCDTxpWRxVVKzUA396KtPVGp sDQbWK0jLOgEAy9k2S01EcF8G+XWynxgFI/eRy X-Received: by 2002:a50:d69a:0:b0:56e:5735:db2b with SMTP id r26-20020a50d69a000000b0056e5735db2bmr6619427edi.29.1714981932567; Mon, 06 May 2024 00:52:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdZGwzDz0rMx1uOrDSEGgnwPZ7uVHbH46UET/dGuuoEL4DXdyTPbzk23sappGmawUR7QlPYQ== X-Received: by 2002:a50:d69a:0:b0:56e:5735:db2b with SMTP id r26-20020a50d69a000000b0056e5735db2bmr6619419edi.29.1714981932202; Mon, 06 May 2024 00:52:12 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id q12-20020a50c34c000000b00572459a4ffesm5074877edb.56.2024.05.06.00.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/46] openrisc: switch boards to "default y" Date: Mon, 6 May 2024 09:50:57 +0200 Message-ID: <20240506075125.8238-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with OpenRISC. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/or1k-softmmu/default.mak | 5 ++--- .gitlab-ci.d/buildtest.yml | 2 +- hw/openrisc/Kconfig | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/devices/or1k-softmmu/default.mak b/configs/devices/or1k-softmmu/default.mak index 3aecdf9d738..efe3bc278bc 100644 --- a/configs/devices/or1k-softmmu/default.mak +++ b/configs/devices/or1k-softmmu/default.mak @@ -5,6 +5,5 @@ # CONFIG_TEST_DEVICES=n # Boards: -# -CONFIG_OR1K_SIM=y -CONFIG_OR1K_VIRT=y +# CONFIG_OR1K_SIM=n +# CONFIG_OR1K_VIRT=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 811132443a7..49cd50c354d 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# mips64el, x86_64 +# mips64el, or1k, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig index 97af258b556..9c9015e0a5d 100644 --- a/hw/openrisc/Kconfig +++ b/hw/openrisc/Kconfig @@ -1,5 +1,7 @@ config OR1K_SIM bool + default y + depends on OPENRISC select SERIAL select OPENCORES_ETH select OMPIC @@ -7,6 +9,8 @@ config OR1K_SIM config OR1K_VIRT bool + default y + depends on OPENRISC imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES From patchwork Mon May 6 07:50:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iEVY5SOS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttp2HFsz1yZk for ; Mon, 6 May 2024 17:53:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9B-0005xr-5q; Mon, 06 May 2024 03:52:29 -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 1s3t95-0005th-Nd for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:23 -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 1s3t90-0001fW-Mp for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981938; 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=2O6NkoKmrksa12eVEharYVLqF8b32WlHGoQ/R+mZ2AE=; b=iEVY5SOSDSkmkxSxJLDOLYuQ6Mqbsg0SCMDCoo+qbm0Rasr7DcEtdplTugdtrOYjebUQh1 IGEIKRX2wHD2D3xwUheYyCwqupZOd2xhu8QauZzH8JqBBikwngKK/7KsmefGX4lT62Neu0 7J6I3upHrD2qU22sxhOSavU0bGLtUkY= 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-629-6emRyYctNGy4UCknkRyvbg-1; Mon, 06 May 2024 03:52:16 -0400 X-MC-Unique: 6emRyYctNGy4UCknkRyvbg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a59ad486084so71590866b.1 for ; Mon, 06 May 2024 00:52:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981935; x=1715586735; 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=2O6NkoKmrksa12eVEharYVLqF8b32WlHGoQ/R+mZ2AE=; b=ZrMhpU5EV5blfxumT68uG72KDUoovoMO+O59ENks7GuOtszgQ2FIuwDMFvyl7AEBHg Av9MNAZetIydPGmm346oJyQNqy980GmHE9dYIMg6cl3ZR/SnIYCnylkhVUjc1rsATuah zQvaSe6KK6MWsd5mghHUcX7V72VhGkTi0SmgrjMoC89zI61vOkUSlybPWy2kfUh1090Z ic5S5m9WfvcdpKB6YRgBXCiUita1SATeQaF08n/gUqQk/zYH2ODno1WTpR56elw/eVUn kN60CcVjlCnfV8vBJUwBw6HqaTMr0Ignrwa8snWWPablK5K4DDoT4KR56aP3UW+NQLT5 nV7Q== X-Gm-Message-State: AOJu0YxCu6dJNWD607e5omPyLyAGUhrEQtXIgZOIykWvf80zhsmPVEex ssKxyykjbHcE1hekwTzTMH0OmFHyR6Y1pD7KoFxTS2I+boD5RrSQ16kPAapIzQjncmRvPlUYhoW IWsg9Ml1aCXzg5rkGLAZh3sSABlMcUmZbi5FYfEkVS05khPgTMAnjamUuf3p62KUSV640Vk+Vpd WspmJmMhFq9prDRN3X9i5aKgvB6toYxZNCgPLP X-Received: by 2002:a17:906:19d7:b0:a59:a8a4:a5a0 with SMTP id h23-20020a17090619d700b00a59a8a4a5a0mr3503942ejd.36.1714981935193; Mon, 06 May 2024 00:52:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmoGLiWDHzydWXV6uKXo1yW7H+wLVfziRcfKHjcay8cZumtiJRRVSTNbNu3r8Bz/D09ekmiQ== X-Received: by 2002:a17:906:19d7:b0:a59:a8a4:a5a0 with SMTP id h23-20020a17090619d700b00a59a8a4a5a0mr3503923ejd.36.1714981934600; Mon, 06 May 2024 00:52:14 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id s10-20020a170906c30a00b00a59a08c722fsm3148752ejz.184.2024.05.06.00.52.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/46] ppc: switch boards to "default y" Date: Mon, 6 May 2024 09:50:58 +0200 Message-ID: <20240506075125.8238-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with PowerPC/POWER. No changes to generated config-devices.mak files, other than adding CONFIG_PPC to the ppc64-softmmu target. Signed-off-by: Paolo Bonzini --- configs/devices/ppc-softmmu/default.mak | 26 ++++++++++++----------- configs/devices/ppc64-softmmu/default.mak | 8 +++---- .gitlab-ci.d/buildtest.yml | 2 +- hw/ppc/Kconfig | 26 +++++++++++++++++++++++ target/ppc/Kconfig | 1 + 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak index 3061b26749a..460d15e676b 100644 --- a/configs/devices/ppc-softmmu/default.mak +++ b/configs/devices/ppc-softmmu/default.mak @@ -4,22 +4,24 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -# For embedded PPCs: -CONFIG_E500PLAT=y -CONFIG_MPC8544DS=y -CONFIG_PPC405=y -CONFIG_PPC440=y -CONFIG_VIRTEX=y +# Boards are selected by default, uncomment to keep out of the build. + +# Embedded PPCs: +# CONFIG_E500PLAT=n +# CONFIG_MPC8544DS=n +# CONFIG_PPC405=n +# CONFIG_PPC440=n +# CONFIG_VIRTEX=n # For Sam460ex -CONFIG_SAM460EX=y +# CONFIG_SAM460EX=n # For Macs -CONFIG_MAC_OLDWORLD=y -CONFIG_MAC_NEWWORLD=y +# CONFIG_MAC_OLDWORLD=n +# CONFIG_MAC_NEWWORLD=n -CONFIG_AMIGAONE=y -CONFIG_PEGASOS2=y +# CONFIG_AMIGAONE=n +# CONFIG_PEGASOS2=n # For PReP -CONFIG_PREP=y +# CONFIG_PREP=n diff --git a/configs/devices/ppc64-softmmu/default.mak b/configs/devices/ppc64-softmmu/default.mak index b90e5bf4558..e8ad2603133 100644 --- a/configs/devices/ppc64-softmmu/default.mak +++ b/configs/devices/ppc64-softmmu/default.mak @@ -3,8 +3,6 @@ # Include all 32-bit boards include ../ppc-softmmu/default.mak -# For PowerNV -CONFIG_POWERNV=y - -# For pSeries -CONFIG_PSERIES=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_POWERNV=n +# CONFIG_PSERIES=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 49cd50c354d..a5f4b4d3793 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# mips64el, or1k, x86_64 +# mips64el, or1k, ppc, ppc64, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 37ccf9cdcaf..78f83e78ce5 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,5 +1,7 @@ config PSERIES bool + default y + depends on PPC64 imply USB_OHCI_PCI imply PCI_DEVICES imply TEST_DEVICES @@ -23,6 +25,8 @@ config SPAPR_RNG config POWERNV bool + default y + depends on PPC64 imply PCI_DEVICES imply TEST_DEVICES select ISA_IPMI_BT @@ -38,6 +42,8 @@ config POWERNV config PPC405 bool + default y + depends on PPC select M48T59 select PFLASH_CFI02 select PPC4XX @@ -45,6 +51,8 @@ config PPC405 config PPC440 bool + default y + depends on PPC imply PCI_DEVICES imply TEST_DEVICES imply E1000_PCI @@ -62,6 +70,8 @@ config PPC4XX config SAM460EX bool + default y + depends on PPC select PFLASH_CFI01 select IDE_SII3112 select M41T80 @@ -75,6 +85,8 @@ config SAM460EX config AMIGAONE bool + default y + depends on PPC imply ATI_VGA select ARTICIA select VT82C686 @@ -82,6 +94,8 @@ config AMIGAONE config PEGASOS2 bool + default y + depends on PPC imply ATI_VGA select MV64361 select VT82C686 @@ -90,6 +104,8 @@ config PEGASOS2 config PREP bool + default y + depends on PPC imply PCI_DEVICES imply TEST_DEVICES select CS4231A @@ -106,6 +122,8 @@ config RS6000_MC config MAC_OLDWORLD bool + default y + depends on PPC imply PCI_DEVICES imply SUNGEM imply TEST_DEVICES @@ -117,6 +135,8 @@ config MAC_OLDWORLD config MAC_NEWWORLD bool + default y + depends on PPC imply PCI_DEVICES imply SUNGEM imply TEST_DEVICES @@ -147,14 +167,20 @@ config E500 config E500PLAT bool + default y + depends on PPC select E500 config MPC8544DS bool + default y + depends on PPC select E500 config VIRTEX bool + default y + depends on PPC select PPC4XX select PFLASH_CFI01 select SERIAL diff --git a/target/ppc/Kconfig b/target/ppc/Kconfig index 3ff152051a3..0283711673e 100644 --- a/target/ppc/Kconfig +++ b/target/ppc/Kconfig @@ -3,3 +3,4 @@ config PPC config PPC64 bool + select PPC From patchwork Mon May 6 07:50:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931752 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JOk1NQhX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv2m6Dncz1xnT for ; Mon, 6 May 2024 18:00:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9H-0006De-MB; Mon, 06 May 2024 03:52: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 1s3t97-0005uM-4W for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:25 -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 1s3t95-0001h6-GL for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981941; 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=iCgAKilFMtFyGnLR98ktMLMEg7TiqKvecQepTbmci8Q=; b=JOk1NQhXoaVBh7sVZYyVBqoSAijGo1kYHThjmkpCS+S4gpZRSp9Nl6GlqAyao/l4doP9ij GkvW5IWCJtWlEGNP3l8MVB+vkx8kWIIfIBq42a1Koc4b2d5cAdnZiZ40KDjp2bncdAw6Ev d57Q1mykU6eGSNry+lsMXqeoRnEdsM4= 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-251-BLgFiuNtMuqOZKaNYMxxkQ-1; Mon, 06 May 2024 03:52:18 -0400 X-MC-Unique: BLgFiuNtMuqOZKaNYMxxkQ-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-572a98b4020so822929a12.1 for ; Mon, 06 May 2024 00:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981937; x=1715586737; 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=iCgAKilFMtFyGnLR98ktMLMEg7TiqKvecQepTbmci8Q=; b=Wh0tcb9sz6AB52cqx26zC4dSwyPW9upchSlQkvzHkh6S85evjSi0lSli/PX2z+dhpI 1xlmR2DBNT8IkbNWmcDNcO+CJLaU1J3m4CIc/Fr+S/5Dq/Iewj8fqYJHHEERpt4jdOYu +yvo5Jam1ZIWPTaCf9n1svbdN8J2vPNDug0iCtjrjM7yZEnerxDr+Th2E19Ps0nilTAu jflfvaUKIESrCNSPFcahFH3UL8b1+1TqADbKwtRVNOVHm8k1RDxMXgJn7dUCD0FAKl3w Vy+4JMI1bcO3wlLPTk++9TlZJ5P6Eh9eoDiBB9xHfdhxjS1SifYhn3rYuvFP3+uoqSBn 8J2A== X-Gm-Message-State: AOJu0YxA7O1wMeloHj+3/jomzGz/kaDv1VwfZdgIWBLUFXbENtjHGFAK nbHrZ1qMYEUWM0nnwrLLyxwoP7FM7Pup7RNIoYt/SeqnaqIbDaJ2QqxQo1mLs+PZwTZqStaVwOX tCUk3J+GXJZpGOyOPTYIq22hBBfzLYSQgSmOZFbdMmhtqaw2PjWpqkPlVG+mCP7f99waBQv9nvZ xbrffHxxorV/ezjUnhp3zcwQNwu6N42wMENHbH X-Received: by 2002:a50:99d8:0:b0:56c:d47:e403 with SMTP id n24-20020a5099d8000000b0056c0d47e403mr5838528edb.28.1714981937437; Mon, 06 May 2024 00:52:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMVJ1toRyPZ/8sV9SH+Ji+ajKkaP/dhcVhLvj9diMv9vn/FcANNl2HJ0F1yD89gwHIuWbwfw== X-Received: by 2002:a50:99d8:0:b0:56c:d47:e403 with SMTP id n24-20020a5099d8000000b0056c0d47e403mr5838511edb.28.1714981937055; Mon, 06 May 2024 00:52:17 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id i15-20020a0564020f0f00b005726dceb2easm4907453eda.20.2024.05.06.00.52.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/46] riscv: switch boards to "default y" Date: Mon, 6 May 2024 09:50:59 +0200 Message-ID: <20240506075125.8238-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with RISC-V. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/riscv32-softmmu/default.mak | 13 ++++++------- configs/devices/riscv64-softmmu/default.mak | 15 +++++++-------- .gitlab-ci.d/buildtest.yml | 2 +- hw/riscv/Kconfig | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/configs/devices/riscv32-softmmu/default.mak b/configs/devices/riscv32-softmmu/default.mak index 07e4fd26df3..c2cd86ce05f 100644 --- a/configs/devices/riscv32-softmmu/default.mak +++ b/configs/devices/riscv32-softmmu/default.mak @@ -4,10 +4,9 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -# Boards: -# -CONFIG_SPIKE=y -CONFIG_SIFIVE_E=y -CONFIG_SIFIVE_U=y -CONFIG_RISCV_VIRT=y -CONFIG_OPENTITAN=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_SPIKE=n +# CONFIG_SIFIVE_E=n +# CONFIG_SIFIVE_U=n +# CONFIG_RISCV_VIRT=n +# CONFIG_OPENTITAN=n diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak index 221963d4c5c..39ed3a0061a 100644 --- a/configs/devices/riscv64-softmmu/default.mak +++ b/configs/devices/riscv64-softmmu/default.mak @@ -4,11 +4,10 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -# Boards: -# -CONFIG_SPIKE=y -CONFIG_SIFIVE_E=y -CONFIG_SIFIVE_U=y -CONFIG_RISCV_VIRT=y -CONFIG_MICROCHIP_PFSOC=y -CONFIG_SHAKTI_C=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_SPIKE=n +# CONFIG_SIFIVE_E=n +# CONFIG_SIFIVE_U=n +# CONFIG_RISCV_VIRT=n +# CONFIG_MICROCHIP_PFSOC=n +# CONFIG_SHAKTI_C=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a5f4b4d3793..a65b5fc9560 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# mips64el, or1k, ppc, ppc64, x86_64 +# mips64el, or1k, ppc, ppc64, riscv32, riscv64, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index fc72ef03799..5f5f9e31bb0 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -8,6 +8,8 @@ config IBEX config MICROCHIP_PFSOC bool + default y + depends on RISCV64 select CADENCE_SDHCI select CPU_CLUSTER select MCHP_PFSOC_DMC @@ -21,12 +23,16 @@ config MICROCHIP_PFSOC config OPENTITAN bool + default y + depends on RISCV32 select IBEX select SIFIVE_PLIC select UNIMP config RISCV_VIRT bool + default y + depends on RISCV32 || RISCV64 imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES @@ -51,6 +57,8 @@ config RISCV_VIRT config SHAKTI_C bool + default y + depends on RISCV64 select RISCV_ACLINT select SHAKTI_UART select SIFIVE_PLIC @@ -58,6 +66,8 @@ config SHAKTI_C config SIFIVE_E bool + default y + depends on RISCV32 || RISCV64 select RISCV_ACLINT select SIFIVE_GPIO select SIFIVE_PLIC @@ -68,6 +78,8 @@ config SIFIVE_E config SIFIVE_U bool + default y + depends on RISCV32 || RISCV64 select CADENCE select CPU_CLUSTER select RISCV_ACLINT @@ -85,6 +97,8 @@ config SIFIVE_U config SPIKE bool + default y + depends on RISCV32 || RISCV64 select RISCV_NUMA select HTIF select RISCV_ACLINT From patchwork Mon May 6 07:51:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HOD1G6Cw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3S0sf6z1yZk for ; Mon, 6 May 2024 18:00:36 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9f-0007Rg-5T; Mon, 06 May 2024 03:52:59 -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 1s3t9C-0005yN-6o for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:30 -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 1s3t97-0001hP-2f for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981944; 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=c1J72qMEdQMNMOsNvSGFzl7NaeouKzIePtfnpA/e1t8=; b=HOD1G6CwkNpHRW8zIaD/5eCTKcPUvtVDgKVFNBvwsYNpst2vJ45VSVfkdFFKDIUMYxwNnP IAg6dbrIDgVApNH4EbJW9svAIEfqVWuP64mNH3TWluqzHyi6G/qzRcjMxOndpCIIbqSMrm ICbH281Wfz1txQzL3UBSVRrO6dFVCqM= 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-85-aIU9EAT8MLm-0i-r2qSsoA-1; Mon, 06 May 2024 03:52:21 -0400 X-MC-Unique: aIU9EAT8MLm-0i-r2qSsoA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a59c02f798bso98270566b.1 for ; Mon, 06 May 2024 00:52:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981940; x=1715586740; 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=c1J72qMEdQMNMOsNvSGFzl7NaeouKzIePtfnpA/e1t8=; b=RK/aAzx6J6B36N++wbB1595GEWQei+yftIsFutUvcxj5Mx0EaTPmaJ5WnMIqAwKFpF Zc1Sg0W8ve25Gf1wx9YsexYNUKvBwTWCqa05u5Zqplykc6U3562ajpFg5jZS2kbEhhlW uQzZW3xkxz/JRnOq4ok3MHF+pMHWzvE6RzLRm5FYCo3MyMvwLtP1tmSDdEFMFbIBoqAy fYFM05FrAsxlB4f86v+NDLaAeQfBpC//zCs+1HOWndC3zmKVJb3NzF220K2w6YBnm72J IFeBI0nYayqAdl0XJDoH8iGDqkNJtsQx+jhTrr8qytD8HNsRmuSWJ7Ad9gGMIwX2JhCV 6/7w== X-Gm-Message-State: AOJu0Yz1wLMnj6zHOhcWqc6vpcd/KFsrmBLKFQGpHJGNFZTZV/EbDurh ozl98qh52pv+RHHMusEP4iXktWfLtGbzXne3K1zs8/SdXpIiAttFSeGhgU+cbz21qfvod5Y18I6 RfHkrpaK8PG6mOR0W2sY9J0n6H90+iDIZ+R9CEdTaQNXoaH4HrEsWW1UJod/E9Neyt7FwdS878a VGRL0BChiiAoxjEym+udzPF7HuuwbCsEQCFAfV X-Received: by 2002:a50:99d2:0:b0:572:7d5b:9923 with SMTP id n18-20020a5099d2000000b005727d5b9923mr9403287edb.22.1714981939847; Mon, 06 May 2024 00:52:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElELRl0i2e1EKL9cWolbHJ180GBGraOlT1Y1DMnSzXMzyoVUewmcC+h2oSAEuN4vaK7eE0lQ== X-Received: by 2002:a50:99d2:0:b0:572:7d5b:9923 with SMTP id n18-20020a5099d2000000b005727d5b9923mr9403268edb.22.1714981939421; Mon, 06 May 2024 00:52:19 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id u9-20020aa7d989000000b0057030326144sm4884702eds.47.2024.05.06.00.52.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/46] rx: switch boards to "default y" Date: Mon, 6 May 2024 09:51:00 +0200 Message-ID: <20240506075125.8238-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with RX. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/rx-softmmu/default.mak | 3 ++- .gitlab-ci.d/buildtest.yml | 2 +- hw/rx/Kconfig | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/devices/rx-softmmu/default.mak b/configs/devices/rx-softmmu/default.mak index df2b4e4f426..e7caebe1974 100644 --- a/configs/devices/rx-softmmu/default.mak +++ b/configs/devices/rx-softmmu/default.mak @@ -1,3 +1,4 @@ # Default configuration for rx-softmmu -CONFIG_RX_GDBSIM=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_RX_GDBSIM=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a65b5fc9560..13f505f20d7 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -649,7 +649,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, -# mips64el, or1k, ppc, ppc64, riscv32, riscv64, x86_64 +# mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64 # does not build without boards: i386, loongarch64, x86_64 build-without-defaults: extends: .native_build_job_template diff --git a/hw/rx/Kconfig b/hw/rx/Kconfig index 2b297c5a6a6..b2fa2b7eec3 100644 --- a/hw/rx/Kconfig +++ b/hw/rx/Kconfig @@ -7,4 +7,6 @@ config RX62N_MCU config RX_GDBSIM bool + default y + depends on RX select RX62N_MCU From patchwork Mon May 6 07:51:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931748 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WmTlu49L; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtzJ3D0Bz1xnT for ; Mon, 6 May 2024 17:57:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9d-0007J2-9r; Mon, 06 May 2024 03:52:58 -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 1s3t99-0005wH-3d for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52: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 1s3t97-0001hb-K0 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981945; 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=66X98Fkv+2DNq3mOuHqUSiSO+Feayago3MqQ7S1J/PY=; b=WmTlu49LBAPHvnbtJdWs3Rfv5XdRwMEilVQpTa/VP30D3HhIr1fNRt5Bk3kyyyur0MDLVw GWO7oj5Ck5BYRYkqJCLQDY/ZhirL/hGTGHtHeNv65QuAiX6Abq6FAESFVwstnsaKLFc1JX VLnUWEQINdAbMWjYL6CBPN2c+QblzlY= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-V6CvMinlOs2ZxTL4wjFE_A-1; Mon, 06 May 2024 03:52:23 -0400 X-MC-Unique: V6CvMinlOs2ZxTL4wjFE_A-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-572eea3758dso935880a12.0 for ; Mon, 06 May 2024 00:52:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981942; x=1715586742; 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=66X98Fkv+2DNq3mOuHqUSiSO+Feayago3MqQ7S1J/PY=; b=d88EwfzMkdkHd84WUxS0z4AHOcnkn2AMTzQ0N+1Y0ZhddILseQwTtEbGqvcCGTEJgW kIioqpKLr1uwpGiWjKT4UVnQVRYaTIEG/0CqjxXUnGUSnxQmCjCW1qHtJq8PLWmOU1RC I7zShgWNp7/1L2+uRlU+7KAZhQnHSoF8RyduOKAyAsnM580IrhwSXQL7d/srk54OOtGt uRqYqMA/cO/OKTu6P2+d9htc3cKWDYTf6pj/NnDDPS3z69Jmkdm2Qyjw/3rMkbc3W7cq pbp/agPL97ypSfMcPHKtArfmjQrePcwFpcTQHMoh24RP4/wZurwhnX5wgjfwYHsyDPRC 67nA== X-Gm-Message-State: AOJu0YwvIDFKdiGyJKFBeo8foEiNjk8dnkk+Mx09tqQCEgVQd8+UxY07 fSTNR0EAN8/1wE4POgoFPNs5xfaLxWAA+yzicN5QlvNmJYBgBclO7FVwf06DLiv8+tziLGaV0y6 GCddrycTWhQxdxQxwn7BFdeHg5Oy+R2cLn4dIxdJrazetu5v5t/k32Z4maA7X2ZGQsCYPLcgaaL rG2Zi8r/tQJGPMrSkSgSlD3L6c81qlRyUkZ/sl X-Received: by 2002:a50:9fc8:0:b0:572:99fa:1095 with SMTP id c66-20020a509fc8000000b0057299fa1095mr10999403edf.18.1714981942091; Mon, 06 May 2024 00:52:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOFGA3FNCajSih961nc6YZepATIQrc5dWE0+w+MZYGZkDCxulIl5yHMgttl7zU+E2OElihig== X-Received: by 2002:a50:9fc8:0:b0:572:99fa:1095 with SMTP id c66-20020a509fc8000000b0057299fa1095mr10999386edf.18.1714981941663; Mon, 06 May 2024 00:52:21 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id u1-20020aa7d541000000b00572eebbfc61sm1926215edr.35.2024.05.06.00.52.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/46] s390x: switch boards to "default y" Date: Mon, 6 May 2024 09:51:01 +0200 Message-ID: <20240506075125.8238-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with s390. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/s390x-softmmu/default.mak | 5 ++--- .gitlab-ci.d/buildtest.yml | 4 ++-- hw/s390x/Kconfig | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/devices/s390x-softmmu/default.mak b/configs/devices/s390x-softmmu/default.mak index 6d87bc8b4b0..340c1092922 100644 --- a/configs/devices/s390x-softmmu/default.mak +++ b/configs/devices/s390x-softmmu/default.mak @@ -9,6 +9,5 @@ #CONFIG_WDT_DIAG288=n #CONFIG_PCIE_DEVICES=n -# Boards: -# -CONFIG_S390_CCW_VIRTIO=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_S390_CCW_VIRTIO=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 13f505f20d7..2475262c5c8 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -650,7 +650,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64 -# does not build without boards: i386, loongarch64, x86_64 +# does not build without boards: i386, loongarch64, s390x, x86_64 build-without-defaults: extends: .native_build_job_template needs: @@ -666,7 +666,7 @@ build-without-defaults: --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu mips-softmmu mips64-softmmu mipsel-softmmu - s390x-softmmu sh4-softmmu + sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index 26ad1044858..3bbf4ae56e4 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -1,5 +1,7 @@ config S390_CCW_VIRTIO bool + default y + depends on S390X imply VIRTIO_PCI imply TERMINAL3270 imply VFIO_AP From patchwork Mon May 6 07:51:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Jc6JYpjW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtv61sbYz1yZk for ; Mon, 6 May 2024 17:53:22 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9Q-0006dE-VR; Mon, 06 May 2024 03:52:45 -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 1s3t9E-00067Y-2P for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52: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 1s3t9A-0001i9-Tn for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981948; 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=2j7P3TXePI6sdhQMICKDlQARo6sQhFnL+fIFYEDqzOI=; b=Jc6JYpjWSzbDm8d02tjWDUvRDaZP95VLfqcyWVAM2z3FpghYN8lNfVPkbEipPuyjQDdZb0 fxLu8uug26U/jVmlBO17R5hYjj1ZojKObgXzo9cTmhVKARAtn5huSGTvMFKlyTyj8BBuLe 7nDPeg2r+ZAcA0N8Lg0hpzla76vr/X8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-209-DF35RQfGPau7W343LxDczg-1; Mon, 06 May 2024 03:52:26 -0400 X-MC-Unique: DF35RQfGPau7W343LxDczg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59cb20ea3bso57586166b.3 for ; Mon, 06 May 2024 00:52:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981944; x=1715586744; 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=2j7P3TXePI6sdhQMICKDlQARo6sQhFnL+fIFYEDqzOI=; b=C9Vmh/ZAgaNRTBiUr+pwvZKtUhQZa8dmUbNcq1hMx3GGa4QpMm0m/gu6dySWk5YfWN asiQl4Xe9wOhDPICRbe0oDa5R+NsENSrPQzgbfR1p2Ml1ofr/Xkd5mbaM/ScX4XiGiey JbsYlN8IUWJ8yz50s+LR8MeFVEOLklK2I/47HJNMl3L4+uSl1KPPE8DBNnDG1E8aQ5dt 6yc/Fn5FMh7cZj7HoprFBWDtMg+rPtAWe9c+zIbe7eM07qIdPJrBsKls06S7qVjEPRhG TDQWXkpEC/5z5On/6hUtNhBBnUr+bkAWTXw3ZRpUqQiqaAqJOoDPTTJHZ47c5pHjlKrJ ZaMw== X-Gm-Message-State: AOJu0Yx0/GOeo1qkNYuP6xGe3HwsS3AbKusMLZax9R1A/H1jKSY/ouCZ Cp5i7qLvQoDekXty6lthuqfYonDNX5uIGL2ETdqEOWUrfETLaKRr15iANPFj6PaYmBs+rn1PKyB dJJBTaYnuCPPyEpSM9wTq4itnywc5Gm503C63a6vWKxz7naoZzUqZPGzy+qavVVrD+Dktvj1R6Z PE6l8KMZdY+I1IqT1aE5wvfqnywBWL/k4cBrj4 X-Received: by 2002:a17:906:2bd6:b0:a59:d4f0:cfc3 with SMTP id n22-20020a1709062bd600b00a59d4f0cfc3mr752505ejg.59.1714981944323; Mon, 06 May 2024 00:52:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzO2xg7a/lLihw3DtoyRaN1Fee881hP1Vi2lJBANXR/MrddwW5LRDanE7DmUTHRVcMv0NkJA== X-Received: by 2002:a17:906:2bd6:b0:a59:d4f0:cfc3 with SMTP id n22-20020a1709062bd600b00a59d4f0cfc3mr752486ejg.59.1714981943907; Mon, 06 May 2024 00:52:23 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id b19-20020a1709062b5300b00a59a05a8030sm3157895ejg.25.2024.05.06.00.52.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/46] sh4: switch boards to "default y" Date: Mon, 6 May 2024 09:51:02 +0200 Message-ID: <20240506075125.8238-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with SH. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/sh4-softmmu/default.mak | 7 +++---- .gitlab-ci.d/buildtest.yml | 3 +-- hw/sh4/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/devices/sh4-softmmu/default.mak b/configs/devices/sh4-softmmu/default.mak index 565e8b0b5df..c06a427053a 100644 --- a/configs/devices/sh4-softmmu/default.mak +++ b/configs/devices/sh4-softmmu/default.mak @@ -5,7 +5,6 @@ #CONFIG_PCI_DEVICES=n #CONFIG_TEST_DEVICES=n -# Boards: -# -CONFIG_R2D=y -CONFIG_SHIX=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_R2D=n +# CONFIG_SHIX=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 2475262c5c8..fd665931847 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -650,7 +650,7 @@ build-tci: # Check our reduced build configurations # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64 -# does not build without boards: i386, loongarch64, s390x, x86_64 +# does not build without boards: i386, loongarch64, s390x, sh4, sh4eb, x86_64 build-without-defaults: extends: .native_build_job_template needs: @@ -666,7 +666,6 @@ build-without-defaults: --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu mips-softmmu mips64-softmmu mipsel-softmmu - sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index e0c4ecd1a53..99a76a94c3f 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,5 +1,7 @@ config R2D bool + default y + depends on SH4 imply PCI_DEVICES imply TEST_DEVICES imply RTL8139_PCI @@ -13,6 +15,8 @@ config R2D config SHIX bool + default y + depends on SH4 select SH7750 select TC58128 From patchwork Mon May 6 07:51:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931750 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LRp7wqRd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtzv1Gjqz1xnT for ; Mon, 6 May 2024 17:57:31 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9P-0006VA-8z; Mon, 06 May 2024 03:52:44 -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 1s3t9J-0006IN-Di for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:39 -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 1s3t9D-0001iJ-PY for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981950; 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=hA/8UtUIcMrHoVNho/dJKKg/niTLU5xv9W0wZ+L1SHs=; b=LRp7wqRd/c0wOkdyv8KkvtZMCRxwY54fZIGzxQ5TJfzWAKPqtuXCwIcSD2brbMMaSLPdDW nP9P6OEuqBSOk0UgLCB0BZuWWcHn9S4BZ+zKJTmQZlD4hkzFXyMUu1qNfyz3K6rqXsPXQC EYVH424RBZ6GjXUkTrwZPCH3vHyvBZc= 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-217-gTbeYtNwOtaVocA5qAj1rA-1; Mon, 06 May 2024 03:52:28 -0400 X-MC-Unique: gTbeYtNwOtaVocA5qAj1rA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59c7586f7cso47850966b.3 for ; Mon, 06 May 2024 00:52:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981946; x=1715586746; 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=hA/8UtUIcMrHoVNho/dJKKg/niTLU5xv9W0wZ+L1SHs=; b=nK2eq7DsaeOq/YqkRIjP+loQHWnE2im/lX00bDbDguXHwXZZGx/QKb2hGc13RkZLqE y4RtylsOQeXIEkqVL621OqgPoq88odlXCsPiDypyU76OxOYELfB4bzErFDZJ5ig9DPWJ nwbbwr+630FNMlf+ampZ6HuMGzBJdj/D1IaE5scQt+8rrCBPyqGKTyVNW8JSXhnSMuE2 /+GkhnRVHAYQCascc+0KadSMKlYXWy4BN4BSMYGdVNix7HTa8ju/VCsA8C22M6rheEED Sk9kKt5pukx108NvVXr7JNeiB+sKyfTFusJYlB+exL0m7r08AtfkweAu6/y/TpL6hU7R YrMA== X-Gm-Message-State: AOJu0YzW0bGlOK1wp/8V6pfwLkRcqff+i9HhAGN+qZ3Z9airTjLzmPYa O05N0FZ/pgdhvdLJtnp9EkDflwPowzlIkQURN6g78XAeGMyhwGMS/LweaHloJzA/nOrRNNhsHgr WPEjX/XLZdeSUqPe13leqDSiPzxKxFtxCtA4zCfTeAAz0tlpo0HpOM5HEqnWhQRQ4sNVfzjIW6O e2CdrR5lccKa/lq0+XFpZzFAl5Xg2WLrdaaG80 X-Received: by 2002:a17:907:7da2:b0:a59:b784:ced5 with SMTP id oz34-20020a1709077da200b00a59b784ced5mr3104776ejc.67.1714981946716; Mon, 06 May 2024 00:52:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6/zJExYOzfJK/Bdf+yc/FAx5Rhgrju58bzmjZYOwZ2VzbBMnC7H4xkxYmMXOysKDFgtUr0Q== X-Received: by 2002:a17:907:7da2:b0:a59:b784:ced5 with SMTP id oz34-20020a1709077da200b00a59b784ced5mr3104764ejc.67.1714981946271; Mon, 06 May 2024 00:52:26 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id em19-20020a170907289300b00a59c2da005csm1670932ejc.215.2024.05.06.00.52.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/46] sparc: switch boards to "default y" Date: Mon, 6 May 2024 09:51:03 +0200 Message-ID: <20240506075125.8238-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with SPARC and SPARC64. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/sparc-softmmu/default.mak | 7 +++---- configs/devices/sparc64-softmmu/default.mak | 7 +++---- .gitlab-ci.d/buildtest.yml | 5 +++-- hw/sparc/Kconfig | 4 ++++ hw/sparc64/Kconfig | 4 ++++ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/configs/devices/sparc-softmmu/default.mak b/configs/devices/sparc-softmmu/default.mak index ee852181151..87668fda5ea 100644 --- a/configs/devices/sparc-softmmu/default.mak +++ b/configs/devices/sparc-softmmu/default.mak @@ -5,7 +5,6 @@ #CONFIG_TCX=n #CONFIG_CG3=n -# Boards: -# -CONFIG_SUN4M=y -CONFIG_LEON3=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_SUN4M=n +# CONFIG_LEON3=n diff --git a/configs/devices/sparc64-softmmu/default.mak b/configs/devices/sparc64-softmmu/default.mak index e50030a229c..fa82f39a200 100644 --- a/configs/devices/sparc64-softmmu/default.mak +++ b/configs/devices/sparc64-softmmu/default.mak @@ -6,7 +6,6 @@ #CONFIG_SUNHME=n #CONFIG_TEST_DEVICES=n -# Boards: -# -CONFIG_SUN4U=y -CONFIG_NIAGARA=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_SUN4U=n +# CONFIG_NIAGARA=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index fd665931847..5d2ce161187 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -665,8 +665,9 @@ build-without-defaults: --disable-qom-cast-debug --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu - mips-softmmu mips64-softmmu mipsel-softmmu - sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user + mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu + sparc64-softmmu + hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check build-libvhost-user: diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 79d58beb7a6..3cc165dbfb7 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,5 +1,7 @@ config SUN4M bool + default y + depends on SPARC && !SPARC64 imply TCX imply CG3 select CS4231 @@ -18,6 +20,8 @@ config SUN4M config LEON3 bool + default y + depends on SPARC && !SPARC64 select GRLIB config GRLIB diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 7e557ad17b0..3b948a22907 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,7 @@ config SUN4U bool + default y + depends on SPARC64 imply PCI_DEVICES imply SUNHME imply TEST_DEVICES @@ -16,6 +18,8 @@ config SUN4U config NIAGARA bool + default y + depends on SPARC64 select EMPTY_SLOT select SUN4V_RTC select UNIMP From patchwork Mon May 6 07:51:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JaMx4ITZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3D0GZdz1ymb for ; Mon, 6 May 2024 18:00:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9P-0006V9-8f; Mon, 06 May 2024 03:52:44 -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 1s3t9H-0006H4-FN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52: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 1s3t9F-0001ig-Uc for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981953; 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=K/prTIhlaPSYU+OZp1YLxgxehGwBhQi8DUGU7rgz56I=; b=JaMx4ITZRdAs1Tdl56hfaPrMBbnFxJz78kfguDsVIlf//Bk+44eix0ru63nM6h6/nN0p78 BtakKYyfgjE5ulby5IDLzexQ+280317MiUA2K2Issjlp+FA3jNIjI6zsDAyQNcLz2LBiPT YxflRVPsjFywCqIPH5lgwQwl2A5A+j4= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-BzWjIcbHMLSZtkma2H_GqQ-1; Mon, 06 May 2024 03:52:30 -0400 X-MC-Unique: BzWjIcbHMLSZtkma2H_GqQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59ad2436f8so123919066b.2 for ; Mon, 06 May 2024 00:52:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981949; x=1715586749; 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=K/prTIhlaPSYU+OZp1YLxgxehGwBhQi8DUGU7rgz56I=; b=KHBYPXMULE/0sazJLdM23APgM/uVjXo3Znr2TrwvfpRdaG9LUd2Zl168KkvtrdAVdi SfrfA3gT4rSB56vnHtl5AmKgxh8+P0R7FCzk6b/vcV1TDbHRjsPvhsOQC/5vPnoSP/gP bTlNYu/EyLnJfmkhH48FGMn4jthtrk4uYHaxJMQ/zC0OR2DBYVRCMLoONZnpAitQSbWQ i4idB6RYzqnmqm3oUQOsmrVk+8gESK49dfnmNXehj0LUgPI423Pv4yV15ltIeUasHtHp cnjzNAiuTcGeOb0iRwFBy9alkLV1RAPKkPCSRXHyiQCFPcn/DlVusPnzbXpvgDEDLXL1 068w== X-Gm-Message-State: AOJu0YyWTUkQr9JZEgszKWHD+mZkU5MVD6CzyhD/pmua3wmWRLbrGNuU 1IABjr3btO5cKVpOoh4QjiQ+0ZaBg6kMToYrihEtiPoEi8CHh2KXApToOnAGkgL7XymeCIxwlEE taXvAYU11d8WQKD8wECupOe3urcv6yCrNDRtDlIRafaQQaJbg5iUI6kfAGzbPQY0VpiT7l+AkLc S11J4p8Pjj4snz9WYux8QVnk2XuFMkzAMKV6Ha X-Received: by 2002:a17:907:8688:b0:a59:c872:191c with SMTP id qa8-20020a170907868800b00a59c872191cmr2009566ejc.38.1714981949411; Mon, 06 May 2024 00:52:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDxQWhiMJzkARYFHd+RIR47ElwCCBpvn9LMsqbplIrOEAtxB69IbcoExKJSeUoiArofpnF3A== X-Received: by 2002:a17:907:8688:b0:a59:c872:191c with SMTP id qa8-20020a170907868800b00a59c872191cmr2009547ejc.38.1714981948689; Mon, 06 May 2024 00:52:28 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id mb15-20020a170906eb0f00b00a59cc6d06f2sm1125940ejb.218.2024.05.06.00.52.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/46] tricore: switch boards to "default y" Date: Mon, 6 May 2024 09:51:04 +0200 Message-ID: <20240506075125.8238-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with TriCore. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/tricore-softmmu/default.mak | 7 +++++-- .gitlab-ci.d/buildtest.yml | 2 +- hw/tricore/Kconfig | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configs/devices/tricore-softmmu/default.mak b/configs/devices/tricore-softmmu/default.mak index cb8fc286eb2..c7ab542244b 100644 --- a/configs/devices/tricore-softmmu/default.mak +++ b/configs/devices/tricore-softmmu/default.mak @@ -1,2 +1,5 @@ -CONFIG_TRICORE_TESTBOARD=y -CONFIG_TRIBOARD=y +# Default configuration for tricore-softmmu + +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_TRICORE_TESTBOARD=n +# CONFIG_TRIBOARD=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5d2ce161187..bdd4dc49b17 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -666,7 +666,7 @@ build-without-defaults: --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu - sparc64-softmmu + sparc64-softmmu tricore-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig index 33c1e852c33..6c04f64949d 100644 --- a/hw/tricore/Kconfig +++ b/hw/tricore/Kconfig @@ -1,8 +1,12 @@ config TRICORE_TESTBOARD + default y + depends on TRICORE bool config TRIBOARD bool + default y + depends on TRICORE select TC27X_SOC config TC27X_SOC From patchwork Mon May 6 07:51:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931758 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Q2KEXNaD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3J0CYKz1xnS for ; Mon, 6 May 2024 18:00:27 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9S-0006ls-70; Mon, 06 May 2024 03:52:46 -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 1s3t9K-0006KP-Mp for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:39 -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 1s3t9J-0001iw-6E for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981955; 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=6r3byvH2Usubh0E9Dk3mThpH/HP7+bovyE0721TMtTY=; b=Q2KEXNaDB/UIm75Z4VMp46UOcc613e/0qQL2cnF2mrgjjA3SDy/VGqaGo5CyE8I510VWs3 Dxx1RICqtXubbV4OFDDSBHrju0VWFVTrCPnFxHSWm2I22h2van9Y2o0paoXS2g5S2u5ctv JkfP4TJUyPikP+jzpoigMscIbpqVSsM= 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-637-uxnHyJMNPaurwo86pduJPA-1; Mon, 06 May 2024 03:52:33 -0400 X-MC-Unique: uxnHyJMNPaurwo86pduJPA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59ad2436f8so123924666b.2 for ; Mon, 06 May 2024 00:52:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981952; x=1715586752; 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=6r3byvH2Usubh0E9Dk3mThpH/HP7+bovyE0721TMtTY=; b=BZ+3Luk0BDxsgjsx94PrFYylNycPoOZV+mi6aF1iHpcDATWsCOA6T3ZkmTM9gcYKIK tvfxxAW53w85F8Hpp9MXLvGcpmq2jqLP9ORKzlgYugdMXrVcD+epXeNcgPEaubuyBP6Z 1GcgJ4eqKT9QaegF5oThWqd81B9ak5D0zz5anoQJ7CimK9DKUOmVplUpxiXv+fbYbtH7 z8+qmzrYxnUhKTysPqFuc0x7jHZjB25+q6S5+BwM4pRr26EaSDZ6OIAMjLIKSYUUsKxJ azqakmXJzGmM65k5xEQ8wm0i6DUhPqSdSU5pXvGePWdUe+Azhmx8kUhFd/mZaSXXGQAJ Z3GQ== X-Gm-Message-State: AOJu0Yz9asPW8Agf6S1LhC6jTnMZIRl/8xsiAhzo3NYRQl0dRQo4jISb aEvdWQRkKUTcdR5Ik8GV9fWAMvSozkPxjzw3iFLq6rtrEhR+A3ZmR/CFLISnnPRn7vqfK1WWZ7w BjIFXlaz1AsvBZjXyUJUxTRWzRa8R3Lid0s9xQf7TACDkEMB7PitsTCqdrRebPo6EnlM0V8AS4Q TsWTGG/QX8PnS8IpPWTtCET82HtqHEl2WIDrKl X-Received: by 2002:a17:906:1c0e:b0:a59:aff8:c713 with SMTP id k14-20020a1709061c0e00b00a59aff8c713mr2563441ejg.10.1714981952053; Mon, 06 May 2024 00:52:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0P7VcbRgOVdo96LcpCV8zr06zeGhw3xhA+3Pr6ytBgvoCV7ffmOIHD53jiSCqmNwyhyqLhA== X-Received: by 2002:a17:906:1c0e:b0:a59:aff8:c713 with SMTP id k14-20020a1709061c0e00b00a59aff8c713mr2563430ejg.10.1714981951662; Mon, 06 May 2024 00:52:31 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id b8-20020a170906834800b00a59b126af69sm2225365ejy.159.2024.05.06.00.52.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/46] xtensa: switch boards to "default y" Date: Mon, 6 May 2024 09:51:05 +0200 Message-ID: <20240506075125.8238-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some targets use "default y" for boards to filter out those that require TCG. For consistency we are switching all other targets to do the same. Continue with Xtensa. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini --- configs/devices/xtensa-softmmu/default.mak | 9 ++++----- .gitlab-ci.d/buildtest.yml | 2 +- hw/xtensa/Kconfig | 6 ++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configs/devices/xtensa-softmmu/default.mak b/configs/devices/xtensa-softmmu/default.mak index f650cad7609..fbc3079a943 100644 --- a/configs/devices/xtensa-softmmu/default.mak +++ b/configs/devices/xtensa-softmmu/default.mak @@ -4,8 +4,7 @@ # #CONFIG_PCI_DEVICES=n -# Boards: -# -CONFIG_XTENSA_SIM=y -CONFIG_XTENSA_VIRT=y -CONFIG_XTENSA_XTFPGA=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_XTENSA_SIM=n +# CONFIG_XTENSA_VIRT=n +# CONFIG_XTENSA_XTFPGA=n diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index bdd4dc49b17..e9402a68a79 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -666,7 +666,7 @@ build-without-defaults: --disable-strip TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu - sparc64-softmmu tricore-softmmu + sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index 0740657ea58..443b415c2ba 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -1,14 +1,20 @@ config XTENSA_SIM + default y + depends on XTENSA bool config XTENSA_VIRT bool + default y + depends on XTENSA select XTENSA_SIM select PCI_EXPRESS_GENERIC_BRIDGE select PCI_DEVICES config XTENSA_XTFPGA bool + default y + depends on XTENSA select OPENCORES_ETH select PFLASH_CFI01 select SERIAL From patchwork Mon May 6 07:51:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fbWO3+MA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv4S6y3Sz1xnS for ; Mon, 6 May 2024 18:01:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9R-0006ia-R7; Mon, 06 May 2024 03:52:45 -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 1s3t9L-0006Kx-KN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:40 -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 1s3t9K-0001jA-4Z for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981957; 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=n3vpEUsRGRbH/fpvacNXxdrZu8llumdrJ7M6KLKOzzM=; b=fbWO3+MAZVbXzAQXPtrYtk3sJYHDCCh8XKf9etDjGV2wBls8GCM0e+mnv+071JcWGv1jBh Scotgb+CnhurbKhh/7eK5zHIxFVurQAqW8nKJP85Uv1braBNRH7hFwnpdWMzKX8o7uz6MT zSWvRToWgPZqqA3/Y7HgCb/EGVVthos= 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-497-K42BlKPpPnq_ZKYuuNz5OQ-1; Mon, 06 May 2024 03:52:35 -0400 X-MC-Unique: K42BlKPpPnq_ZKYuuNz5OQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59caea8836so47211966b.1 for ; Mon, 06 May 2024 00:52:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981954; x=1715586754; 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=n3vpEUsRGRbH/fpvacNXxdrZu8llumdrJ7M6KLKOzzM=; b=mVVLi0IpeB0cGVlN56imijQO2SmGNmfQZo8/Wf2uRfk6/OlpxcuaWnhVutVJmpflbP ud9cOA38024ZZHQbiHb4ZFLiPqpaH/vs3B7/fYRn3QeW4bh54uwu/ziYvqLrDbI6u7lI SWCGA6aTE1kHaTcBlpxWrtq3FYH+PFg6s0N6Z+tgcjhEhWmF+x4g4Dsd3S2GJJYGqiJo cUI3kwmA8hScpsSCJ0FIzmL2tzomsPdXfrMJ55k2p6I0ScAZdWmyXCcerTY76wz/wShU NIWeXjUN7dLEYz2zYzZhaQOhoOQ0sHaJIwlGO/fGRIAhSRX7cb7uapyCEmcP5cKFAkNO d1lw== X-Gm-Message-State: AOJu0YwnCpBuHPBlcVlIhgIz5CvQPuTE5C2VwT5dmeg/L5EcxI6EqFGF 2syvKIO6J6wQO/IqO1f5WMHHRSknvd1RYIr7DTPP7Li5uNZPyZQdyirT+jZJu9HrdDKQ2ceNXaV 7pBrtfkBSEeCdaPjYmiva737137lLabC8BFQpPc13/n+77PCIErcKnd+W87ALRoCWTKw2G1+8e8 OEEMSJuQ9ISY0UU/NeqXCjoqQgUfV1DYUqkC9A X-Received: by 2002:a17:907:29c4:b0:a59:9cc1:7330 with SMTP id ev4-20020a17090729c400b00a599cc17330mr3959550ejc.64.1714981954404; Mon, 06 May 2024 00:52:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd/xr1Oud7WQgc9pO/J3MgJJQyuziJrF2NZGTe34CAsqwe3zuJUGGVUIZnxEXo2bzntFzAqw== X-Received: by 2002:a17:907:29c4:b0:a59:9cc1:7330 with SMTP id ev4-20020a17090729c400b00a599cc17330mr3959538ejc.64.1714981953977; Mon, 06 May 2024 00:52:33 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id l12-20020a1709066b8c00b00a59c0ecd559sm1744622ejr.112.2024.05.06.00.52.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/46] docs: document new convention for Kconfig board symbols Date: Mon, 6 May 2024 09:51:06 +0200 Message-ID: <20240506075125.8238-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Boards have been switched to use "default y" and are now listed in default-configs/*.mak only for convenience. Document this change and the new possibilities that it allows. Signed-off-by: Paolo Bonzini --- docs/devel/kconfig.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index ccb9a46bd77..52d4b905f67 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -211,6 +211,8 @@ declares its dependencies in different ways: config SUN4M bool + default y + depends on SPARC && !SPARC64 imply TCX imply CG3 select CS4231 @@ -228,8 +230,16 @@ declares its dependencies in different ways: directives. A device should be listed under ``select`` if the board cannot be started at all without it. It should be listed under ``imply`` if (depending on the QEMU command line) the board may or - may not be started without it. Boards also default to false; they are - enabled by the ``default-configs/*.mak`` for the target they apply to. + may not be started without it. Boards default to true, but also + have a ``depends on`` clause to limit them to the appropriate targets. + For some targets, not all boards may be supported by hardware + virtualization, in which case they also depend on the ``TCG`` symbol, + Other symbols that are commonly used as dependencies for boards + include libraries (such as ``FDT``) or ``TARGET_BIG_ENDIAN`` + (possibly negated). + + Boards are listed for convenience in the ``default-configs/*.mak`` + for the target they apply to. **internal elements** From patchwork Mon May 6 07:51:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ivAqDiJr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv5y3mbVz1xnS for ; Mon, 6 May 2024 18:02:46 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9V-0006w3-Cl; Mon, 06 May 2024 03:52:49 -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 1s3t9P-0006Zy-CM for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:44 -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 1s3t9N-0001jR-2d for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981960; 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=DStBOVuOMmNiEoCX8orG6MRwWNCRdkFLsbdf73i2SnU=; b=ivAqDiJrHtJpvbbmfSzpjCqYvBm3i6c9wZALzysB2oFli12hkLcU1LVCNGdsnvUhgVE++A qBrQCPJ+ulm27nwPMC/ZRQvUfQdQA5Qrm+nXRFJLZjEAMNMLuaH5fmVUWGEEZ20dSg3Zgu PA+Gmuyd3toFWbz9z5hp5G0VT0hAkw8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-401-Zec38qQJN8KGz8oNffmcEg-1; Mon, 06 May 2024 03:52:38 -0400 X-MC-Unique: Zec38qQJN8KGz8oNffmcEg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59ab39c8b6so108764666b.2 for ; Mon, 06 May 2024 00:52:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981957; x=1715586757; 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=DStBOVuOMmNiEoCX8orG6MRwWNCRdkFLsbdf73i2SnU=; b=X+OzXG1Uq0+ntna2IXWvsoWW18UL1yQiZe0+8oJ54I45yQW3RVH8Bl/+nevw5q1HG9 Aav/aKtpYl6cLxPdwOnpQIt2KOgNJzr1+h+1/1vokc5pnWZ7Xx5M4WGjYpxwiuH+Uewe EU5XnF4mu6J52Sfh3CdCS/s4UrxOvRk7g9lw5RBhDYD37riJwBgBUwjr1z6h5K628ApQ JhBDBtkfGlklVJTDYo+9RbIoP6HRqtl0yJr8tK3eAtvl7dB2//H7SH3jjKR2yhualT0v IewtxC9cTyaAP9WWyk+IgFjEiCMLSYKxm3AczyLXE1lgnLVRP01ZJioqvsHuNumNmU9R XgqA== X-Gm-Message-State: AOJu0Yxtqq6UZ5Xt9uFZv/Rf+l6vsqQbqw58U6WkDZ92658MDEeQu1zq TQzzxe7iZtJuMm0V/DPHgtuldFNOzye24kx/JuQ7eCHp9GVlzc3XIe7789ZutCo3aTUol+FOksn Zz6LPwd2jWha579sGjD8YQDfJkPhwZ0CThZhDTaui/Ctp0CQqiX/4bqRfvqhEhkotOqjbl+OFsS N8+ptcXIycfolzPHLRIB2pNUVNj6evE1A2NK+k X-Received: by 2002:a17:907:94c1:b0:a59:cdf4:f939 with SMTP id dn1-20020a17090794c100b00a59cdf4f939mr1434285ejc.3.1714981956771; Mon, 06 May 2024 00:52:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgPVtQ9nPlYPZc2v9qdz8sHrzfGCINPXEIEAnLVZyGaqajrIo1wEBKtnkmVodDkM2X16mdJQ== X-Received: by 2002:a17:907:94c1:b0:a59:cdf4:f939 with SMTP id dn1-20020a17090794c100b00a59cdf4f939mr1434269ejc.3.1714981956342; Mon, 06 May 2024 00:52:36 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id fw14-20020a170906c94e00b00a59bf41edbesm1842051ejb.146.2024.05.06.00.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Lei Wang Subject: [PULL 28/46] target/i386: Introduce SapphireRapids-v3 to add missing features Date: Mon, 6 May 2024 09:51:07 +0200 Message-ID: <20240506075125.8238-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Lei Wang Add the missing features(ss, tsc-adjust, cldemote, movdiri, movdir64b) in the SapphireRapids-v3 CPU model. Signed-off-by: Lei Wang Message-ID: <20240424072912.43188-1-lei4.wang@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index aa3b2d83912..e5723f232c0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3970,6 +3970,17 @@ static const X86CPUDefinition builtin_x86_defs[] = { { /* end of list */ } } }, + { + .version = 3, + .props = (PropValue[]) { + { "ss", "on" }, + { "tsc-adjust", "on" }, + { "cldemote", "on" }, + { "movdiri", "on" }, + { "movdir64b", "on" }, + { /* end of list */ } + } + }, { /* end of list */ } } }, From patchwork Mon May 6 07:51:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z6VOMPKR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtwQ2HM2z1yZk for ; Mon, 6 May 2024 17:54:30 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9a-00074v-Ut; Mon, 06 May 2024 03:52:56 -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 1s3t9R-0006eH-0l for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:45 -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 1s3t9P-0001js-GU for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981962; 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=rXL8u/WSR5nc+uR+16Rj/aOdLSI5R+KIVqaTq5s6rWg=; b=Z6VOMPKRfCjj3GlSte1IVNSwtkEw/MZdFotUhz2eBrvyddV7/f6l+toI8yX79m78BvNqmE 56f9WF5Mk+8q6QgA6vvc6yOKVo6VKXx+zxHTAWbhUaF3Z3pbXShiTMOqrZW8C++835GZSj jqKN42GPXq8onFXliAyConFYiALpkwM= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-RoqkaXvLOXy9WnaoCv2vUw-1; Mon, 06 May 2024 03:52:41 -0400 X-MC-Unique: RoqkaXvLOXy9WnaoCv2vUw-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-56c3dc8d331so625861a12.2 for ; Mon, 06 May 2024 00:52:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981959; x=1715586759; 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=rXL8u/WSR5nc+uR+16Rj/aOdLSI5R+KIVqaTq5s6rWg=; b=ZMhsXgrcz0QCVPgqsNZsea1VdylH9MTZ40LxWZ5KphdOnmT3R+J1cTq6M2IkG/zei1 zVb5knGupA7ydQ19V2JMCtjGLXEWvApZUBMB/XhQeZnB0o+UO5ZNfNh7FPUaQyFxt6qT 7jkYvVbODOw+N8EkN43aWhiCBTnMj5/8tNw79ZZOMFwejwleoI7YNq+RVnjGlPYYYlDc v4v7eRASdGgXlZVNH9vouHnlWl9D/8yV2e84L7MdztNatMtn7oEmgaVxJZ5lDY8beBNt VEglEuJYE6GcdTsz3g7kM9WbFuhtDixi5Eph/D2VRV+ecMS6p2Mr32ncc125OSSdWTJf 92Tg== X-Gm-Message-State: AOJu0YxXaMyv95yUDVaLUHmbNKBMqytJi1AbtKvi6cnP86lp038oGPjd j17s6gGne3I5JlyGSNsZuJW7o1APcMFfpegT6nD2MYlQNkXPZotGfhRBei8eMxa82+gVN4qE5j1 zNVU8zoSs95U+TGUqgLQR1XQCWHTSPBZbvokUw38sBj1G6+YP8JOMHpiMmqMOozqe0c+1VVFd5q 3iVZUzyoXzv/7WzocjKbuU1r2f8pU0+XyBU+Gr X-Received: by 2002:a50:f603:0:b0:56f:e609:743 with SMTP id c3-20020a50f603000000b0056fe6090743mr6411162edn.35.1714981959652; Mon, 06 May 2024 00:52:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGW7mNMPoufFYIMPya8+3wvyUjp23TPTuknlUZKaYSt3Dzg8dCqJS1KRWCY760t42Nr00ENzA== X-Received: by 2002:a50:f603:0:b0:56f:e609:743 with SMTP id c3-20020a50f603000000b0056fe6090743mr6411150edn.35.1714981959285; Mon, 06 May 2024 00:52:39 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id fj20-20020a0564022b9400b00572336c900asm4840451edb.74.2024.05.06.00.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Roman Kiryanov , Daniel Berrange Subject: [PULL 29/46] bitmap: Use g_try_new0/g_new0/g_renew Date: Mon, 6 May 2024 09:51:08 +0200 Message-ID: <20240506075125.8238-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Avoids an explicit use of sizeof(). The GLib allocation macros ensure that the multiplication by the size of the element uses the right type and does not overflow. While at it, change bitmap_new() to use g_new0 directly. Its current impl of calling bitmap_try_new() followed by a plain abort() has worse diagnostics than g_new0, which uses g_error to report the actual allocation size that failed. Cc: qemu-trivial@nongnu.org Cc: Roman Kiryanov Reviewed-by: Daniel Berrange Signed-off-by: Paolo Bonzini --- include/qemu/bitmap.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h index 97806811eeb..1cf288445f3 100644 --- a/include/qemu/bitmap.h +++ b/include/qemu/bitmap.h @@ -92,17 +92,14 @@ long slow_bitmap_count_one(const unsigned long *bitmap, long nbits); static inline unsigned long *bitmap_try_new(long nbits) { - long len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - return g_try_malloc0(len); + long nelem = BITS_TO_LONGS(nbits); + return g_try_new0(unsigned long, nelem); } static inline unsigned long *bitmap_new(long nbits) { - unsigned long *ptr = bitmap_try_new(nbits); - if (ptr == NULL) { - abort(); - } - return ptr; + long nelem = BITS_TO_LONGS(nbits); + return g_new0(unsigned long, nelem); } static inline void bitmap_zero(unsigned long *dst, long nbits) @@ -265,10 +262,10 @@ unsigned long bitmap_find_next_zero_area(unsigned long *map, static inline unsigned long *bitmap_zero_extend(unsigned long *old, long old_nbits, long new_nbits) { - long new_len = BITS_TO_LONGS(new_nbits) * sizeof(unsigned long); - unsigned long *new = g_realloc(old, new_len); - bitmap_clear(new, old_nbits, new_nbits - old_nbits); - return new; + long new_nelem = BITS_TO_LONGS(new_nbits); + unsigned long *ptr = g_renew(unsigned long, old, new_nelem); + bitmap_clear(ptr, old_nbits, new_nbits - old_nbits); + return ptr; } void bitmap_to_le(unsigned long *dst, const unsigned long *src, From patchwork Mon May 6 07:51:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FYzpzr9i; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtvl0yScz1yZk for ; Mon, 6 May 2024 17:53:55 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9a-000753-UU; Mon, 06 May 2024 03:52:56 -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 1s3t9U-0006vP-8r for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:49 -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 1s3t9S-0001kO-PN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981966; 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=Jbyp55wNTG92uU0JjszKTSa5YnO873pTqXSIixUoRHU=; b=FYzpzr9ijyDeJjJqdwy9mMrrIl+IL4vw7854UriqZx+O9fHSOFNooazTRPiUWm1mKZi2+o J2tnLAW8mfbqb7SS2xBKQAvTvn+x5mU1hCkQcMx6mvHN+g1mp+s2uJJdeS1ayLFa0HhWO5 SBgN28Unin2y0MxPdhoX0MqpT5pMU4Y= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-543-zqT_sUdxNFaKxEF6mmwLAg-1; Mon, 06 May 2024 03:52:44 -0400 X-MC-Unique: zqT_sUdxNFaKxEF6mmwLAg-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-51f60b1644cso1404925e87.1 for ; Mon, 06 May 2024 00:52:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981962; x=1715586762; 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=Jbyp55wNTG92uU0JjszKTSa5YnO873pTqXSIixUoRHU=; b=rcgMTSCf2bzCpvDET6tq3hGSqvybVVoVLM08lUcVus49pzzpcfYQyrYOo/IfOq8pst ZG2lDh7Jox+pHhBQHnP3CRghdqJhybB0vgInuSmj6fr6lXFTZ3KZ4WP83MGktQhjqS3I U8s2ijm7rMdYmtJwh0H+PRsEAt/pxllUuV1X/VKbBGj9Inn+jWg5dY6RKmYbafEVGcf6 uM3t5Q38jTm4eiSVDwl8NBUDPee5NpbPB67NoxLlkpiOpADlswz0Lxvfcyxv6OaX9ADU v3B7xPINV4PrB8zumhEckT1hB9AiA6RUsGzr/TOxJk0MICEGHBxtM7YPhZgxgXbVXx47 cNOg== X-Gm-Message-State: AOJu0Yxae7QBUTiWWZ4XS3ZU92smHJH8uTmqDkaCuJUF5iyAUOdn3O1f 1MvOcEVaxFCceY9A7stGogboVr2+uq/f1Afriy2KVeLziHMYB0RjPpea0XoW8W3GffBoCGZfvsn HZBweTMWdg78DceH20tQe5iryyQBButwGsbKZ6xOj4FmOGfbS8nc7XSDNNyExLvvlw+NczteNxG BF8GrAvDncoKnAHE0QJ/9A5HFDBMDTVaqOA4eG X-Received: by 2002:ac2:5a50:0:b0:51b:1868:7cce with SMTP id r16-20020ac25a50000000b0051b18687ccemr8227854lfn.63.1714981962268; Mon, 06 May 2024 00:52:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMja2BM/4D0h20Ww9gvlgaUhdF3iNFEE5qWpfNn/srgH91mFwK/FlQo4o6TZr4iU8gCbGBCA== X-Received: by 2002:ac2:5a50:0:b0:51b:1868:7cce with SMTP id r16-20020ac25a50000000b0051b18687ccemr8227839lfn.63.1714981961742; Mon, 06 May 2024 00:52:41 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id wr8-20020a170907700800b00a59be52ff98sm1857060ejb.191.2024.05.06.00.52.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 30/46] build: do not build virtio-vga-gl if virgl/opengl not available Date: Mon, 6 May 2024 09:51:09 +0200 Message-ID: <20240506075125.8238-31-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If virgl and opengl are not available, the build process creates a useless libvirtio-vga-gl module that does not have any device in it. Follow the example of virtio-vga-rutabaga and do not build the module at all in that case. Signed-off-by: Paolo Bonzini --- hw/display/meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index 7893b94c8ee..7db05eace97 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -125,12 +125,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') if_false: files('acpi-vga-stub.c')) hw_display_modules += {'virtio-vga': virtio_vga_ss} - virtio_vga_gl_ss = ss.source_set() - virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl], - if_true: [files('virtio-vga-gl.c'), pixman]) - virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), - if_false: files('acpi-vga-stub.c')) - hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} + if virgl.found() and opengl.found() + virtio_vga_gl_ss = ss.source_set() + virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl], + if_true: [files('virtio-vga-gl.c'), pixman]) + virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), + if_false: files('acpi-vga-stub.c')) + hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} + endif if rutabaga.found() virtio_vga_rutabaga_ss = ss.source_set() From patchwork Mon May 6 07:51:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=F3/ZAvzr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtyb5wKkz1xnT for ; Mon, 6 May 2024 17:56:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9e-0007Nr-3D; Mon, 06 May 2024 03:52:58 -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 1s3t9V-0006x6-F9 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:49 -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 1s3t9U-0001kS-08 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981967; 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=mvZpu2Iq5b9J0WyrI5CvCUA5A69cf72SB0raiRtSeqI=; b=F3/ZAvzrzZX5StpszdTD6fKQgp1kI1Qo0OqAKGwJECYLgL00sGj4qN7Gadh3EiGT6yfNDC 5LULrBND9K6lSYcbxUAcr3btAbopK/LayEzgsAORx3xfThtnKo29NfB7nwmKfVhKP2b5J0 05MYCQq3Pw0KSaam9Ega1kwhzzITgOs= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-688-fjicvz39P46IzkCeZcMsoA-1; Mon, 06 May 2024 03:52:46 -0400 X-MC-Unique: fjicvz39P46IzkCeZcMsoA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59ad486084so71618966b.1 for ; Mon, 06 May 2024 00:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981964; x=1715586764; 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=mvZpu2Iq5b9J0WyrI5CvCUA5A69cf72SB0raiRtSeqI=; b=uO7lM0+FBI58EF5Hs/eIide2dYa7sUIA/IGpIWCZCqDeb8OMcnutOLqJ7aVBlROvwV rmy0LfFLDgN7JalZPl4aH6beREHgLZd93bAfEz8pc8NGBOJMWrEqnaJZrCSx2pe33vEO xO2nEvFZIzTtZXaq5RP/IB6wAwSHJweiQa/OyiWxftxCX2FLDGdjQMJzWa4DE5bCLNp4 bVPwoiBsrP1IuPdrQuLg3q8XCmISjODpLHI2r2vXJhORuE7+8yJIp6ECJHO5dje6Qv+C I2ekbcGOSRzuioDHXrF/y0FkncGMHVxTJ0drz/QeHf9VO/w8ftxN8W3lPEQUVvLKEk26 wXMw== X-Gm-Message-State: AOJu0YzUbF3h0lTeMMCviaEInFLY1mYlUxCRaK7HrbNA/31nSumpFawh 6ZhYhb2HwFsuVMGCtklBzEnY0lOIwf+0XH7weLBvz/kYWn/ukX+tci5Ljy8/y/o8NQoi4X/4PFE Fs8A5Q7PA4u+1F3YuwhQOqamEfm9PNAt8JwaexEr4lpfyR6UZkt/Zds/6blhOM7zh/yeub9ijDE b0xruySW8QJL8/eKLTB3eQx6d3J2A9kKehVTXN X-Received: by 2002:a17:907:6d0e:b0:a59:b590:5d71 with SMTP id sa14-20020a1709076d0e00b00a59b5905d71mr3285665ejc.0.1714981964534; Mon, 06 May 2024 00:52:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzI2M8OroqzgRnIE9vJYiWOwhftLMQYlWdONrjLZihuUipPCSrM6fV43YQpt0B3k4MEP1gbw== X-Received: by 2002:a17:907:6d0e:b0:a59:b590:5d71 with SMTP id sa14-20020a1709076d0e00b00a59b5905d71mr3285653ejc.0.1714981964262; Mon, 06 May 2024 00:52:44 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id wk16-20020a170907055000b00a59db6e54e2sm337589ejb.85.2024.05.06.00.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 31/46] fw_cfg: remove useless declarations from typedefs.h Date: Mon, 6 May 2024 09:51:10 +0200 Message-ID: <20240506075125.8238-32-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Only FWCfgState is used as part of APIs such as acpi_ghes_add_fw_cfg. Everything else need not be in typedefs.h. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/hw/nvram/fw_cfg.h | 2 ++ include/qemu/typedefs.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index c1f81a5f13a..d173998803c 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -59,6 +59,8 @@ typedef struct fw_cfg_dma_access FWCfgDmaAccess; typedef void (*FWCfgCallback)(void *opaque); typedef void (*FWCfgWriteCallback)(void *opaque, off_t start, size_t len); +typedef struct FWCfgEntry FWCfgEntry; + struct FWCfgState { /*< private >*/ SysBusDevice parent_obj; diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 50c277cf0b4..949d3e1daf9 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -56,9 +56,6 @@ typedef struct DumpState DumpState; typedef struct Error Error; typedef struct EventNotifier EventNotifier; typedef struct FlatView FlatView; -typedef struct FWCfgEntry FWCfgEntry; -typedef struct FWCfgIoState FWCfgIoState; -typedef struct FWCfgMemState FWCfgMemState; typedef struct FWCfgState FWCfgState; typedef struct GraphicHwOps GraphicHwOps; typedef struct HostMemoryBackend HostMemoryBackend; From patchwork Mon May 6 07:51:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LiBe2eUW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv5r1Hl5z1xnS for ; Mon, 6 May 2024 18:02:40 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9f-0007Sn-Tj; Mon, 06 May 2024 03:52:59 -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 1s3t9Y-00074Q-7p for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:52 -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 1s3t9W-0001km-Oy for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981970; 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=XG+/YIdax3MeleXDpFVwjxPQHTXWj33Onf7v92r1kBM=; b=LiBe2eUWFMVAq+OR8BqG/KA/lUhJwJGNrT2ssogo+LKXvJmBS1JGi7bKoV65AWn/9N/PPb vIxfPoELLVgo5kT+FBbGR0kNcuS5pHBG9lO0FM7rKVZjS3qbsKZ7uYC1SvjmOAD706nlBM jlMIX5DF3Q3jUOCSCUWZUhjtOmArdSU= 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-46-UV1pcIvVNsm_GS1DSjTVrQ-1; Mon, 06 May 2024 03:52:48 -0400 X-MC-Unique: UV1pcIvVNsm_GS1DSjTVrQ-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-572cbbdb450so577733a12.1 for ; Mon, 06 May 2024 00:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981967; x=1715586767; 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=XG+/YIdax3MeleXDpFVwjxPQHTXWj33Onf7v92r1kBM=; b=blxLuBkHx8fZ3ebuY/ohyBL2jhzWMS5z1hM5rErFSVAqCZWHMoj8tPMxtRxlhzRB7M 1LgexXNssNd58gDob8H85tnFLP4mhO90AC5bUl1ZHgCd+D/JXQVonVGGCpIJ21hRMSYe XnzETu/rTuYQxUZtOL/wem/97ZMQdDsixebiJ4R5PgjcuCxk0IfOUgWjMrOTTlahbauW mJ5IjCAhVPBYnm4ceuFX6+OAyeSms3Zb/Tk3it7+QDvtmdelbtZpf6Dykv1vff06fAAU ZIMBt5iZyr/wFKO5dceRgZDjJ0Bs8HlngAF1gRBqtLt9OM74mPjkKbRsZuzoJDo5Jidr 9KDQ== X-Gm-Message-State: AOJu0Ywn7ewx9BlJqXk6h0ZpkGSgSxYNQYI2BTggREbI+VIeytXocWua x+hDcoA7wIN8v6zi5PNNvqcZS7jDRbN0E2dXrYAR62k2s6MX8CQ6J10mWgX/r1Z5wSdAd6mNiNA lRko6zqym+yjP3wER8bqKJoL12tQrjnD5iQyIfE/T8MCNcMs6QAhnlJMhqTiZ08oYD+n5JNjxcp pJf2gecdd6WTSPqF7dvyJwUvsbbVWB1AkvBT18 X-Received: by 2002:a50:a6de:0:b0:572:a158:8a7c with SMTP id f30-20020a50a6de000000b00572a1588a7cmr4748349edc.42.1714981966940; Mon, 06 May 2024 00:52:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKf69+QdXUeyjIZW5AhSICU/Bv/WaTYiPx0PKIqGt41tDHB4450UEumV9CTwItOWnv2mgzfQ== X-Received: by 2002:a50:a6de:0:b0:572:a158:8a7c with SMTP id f30-20020a50a6de000000b00572a1588a7cmr4748338edc.42.1714981966473; Mon, 06 May 2024 00:52:46 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id n15-20020a05640206cf00b00572b029ca57sm4788976edy.25.2024.05.06.00.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 32/46] qdev-core: remove DeviceListener from typedefs.h Date: Mon, 6 May 2024 09:51:11 +0200 Message-ID: <20240506075125.8238-33-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is needed in very few places, which already depend on other parts of qdev-core.h files. The benefit of having it in typedefs.h is small. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/hw/qdev-core.h | 1 + include/qemu/typedefs.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 9228e96c87e..5336728a23f 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -294,6 +294,7 @@ struct DeviceState { MemReentrancyGuard mem_reentrancy_guard; }; +typedef struct DeviceListener DeviceListener; struct DeviceListener { void (*realize)(DeviceListener *listener, DeviceState *dev); void (*unrealize)(DeviceListener *listener, DeviceState *dev); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 949d3e1daf9..66f0b146c8c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -47,7 +47,6 @@ typedef struct CpuInfoFast CpuInfoFast; typedef struct CPUJumpCache CPUJumpCache; typedef struct CPUState CPUState; typedef struct CPUTLBEntryFull CPUTLBEntryFull; -typedef struct DeviceListener DeviceListener; typedef struct DeviceState DeviceState; typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot; typedef struct DisplayChangeListener DisplayChangeListener; From patchwork Mon May 6 07:51:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WPqP9BdJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtxp6QTrz1xnT for ; Mon, 6 May 2024 17:55:42 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9j-0007XA-6M; Mon, 06 May 2024 03:53:04 -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 1s3t9a-0007Be-UK for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:55 -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 1s3t9Z-0001kz-BN for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981972; 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=XR2g9jkVWlGLAB7DDh9+A7HqZElWfzJuBsbUVbmFt4Q=; b=WPqP9BdJW9zooPsJnvqTdXzeVDRe978y9IX2Hb0vHYSkwKbKT1Rp4xAve70sQNK5yg8qVu bu8kFps35rwEjwjrkW+RsOQ29cO1kfddwYghzFAUK6PCjaua0AZFCNSel0Wr36SfEPgNWP oTHZTOaX7lrWwL3yN9J0zQ817Exl5l8= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-128-97Htq_yPMVam8fvjEX6tqg-1; Mon, 06 May 2024 03:52:51 -0400 X-MC-Unique: 97Htq_yPMVam8fvjEX6tqg-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-51f22618c20so1189078e87.0 for ; Mon, 06 May 2024 00:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981969; x=1715586769; 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=XR2g9jkVWlGLAB7DDh9+A7HqZElWfzJuBsbUVbmFt4Q=; b=CkDDv9h1vN5xl7aOWJaNtB0aogVYkqjFa5G5/2VyMbeetPFnIeo82YMslFW7wQgpuS vGQ6vb7YyfCkuktBDU1kZv/oK/yRrqqIKaKgPHaVbiG4J0MvmzrWP5jRBk1qdtbWWQyI 0nbnIn59UOlvcQvwlGzv0mjNelPy7feP63NyHbpuUHJjv7t/eFsU5GPY2OjofL/TEutz +NUUNG9dZKJoOKZhvbTbtaXk1P0GPRgcu5fH4zP0mln+I6Ind4fXQ5JJXaUpLeRY4N4s d5kloTTt0ATJhl6HCot1pc51ez0VJjG6xj2SOYnf/psTpCnvRMPiMS67ctIESMqvesyv 2cmg== X-Gm-Message-State: AOJu0YwPkiFmP2bhybeOiO1AEIiZgnN/YFbOalGQQGZ+vB2bg4ghgNcs qbGPRtIcdtzYNg1Bl14HK3sXvm3Z2qTDeNtfSaCG+4E6Lw2xCa9pFKHkM5Ee4vafm4wLGDuxexv 95mDSCdBqcVa0Tpdh6ELyguD/LvWEOQkFUjEjly7hLfQs0rQU6xt8NXpc45v5bl5EoMZS1myJMX h/+RtpY4x/D4mlszaq2mee+0v6Sl9HDDJFZ6Q9 X-Received: by 2002:a19:f60f:0:b0:51c:cc1b:a8f6 with SMTP id x15-20020a19f60f000000b0051ccc1ba8f6mr7247946lfe.20.1714981969071; Mon, 06 May 2024 00:52:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEn2hDtxBr5nb3hK+NUCo/epXvGZhjxJ6vLtl4lMiG1153ZhvLkslYV/ZhkXKhzAhniOk71Rg== X-Received: by 2002:a19:f60f:0:b0:51c:cc1b:a8f6 with SMTP id x15-20020a19f60f000000b0051ccc1ba8f6mr7247931lfe.20.1714981968742; Mon, 06 May 2024 00:52:48 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id fw16-20020a170906c95000b00a59bde503a5sm1843363ejb.48.2024.05.06.00.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 33/46] numa: remove types from typedefs.h Date: Mon, 6 May 2024 09:51:12 +0200 Message-ID: <20240506075125.8238-34-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Exactly nobody needs them there. Place the typedef in the header that defines the struct. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/qemu/typedefs.h | 2 -- include/sysemu/numa.h | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 66f0b146c8c..e0a0bc31e7f 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -81,8 +81,6 @@ typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; typedef struct NICInfo NICInfo; -typedef struct NodeInfo NodeInfo; -typedef struct NumaNodeMem NumaNodeMem; typedef struct Object Object; typedef struct ObjectClass ObjectClass; typedef struct PCIBridge PCIBridge; diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 825cfe86bc1..04676141470 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -36,7 +36,7 @@ enum { #define UINT16_BITS 16 -struct NodeInfo { +typedef struct NodeInfo { uint64_t node_mem; struct HostMemoryBackend *node_memdev; bool present; @@ -45,12 +45,12 @@ struct NodeInfo { uint8_t lb_info_provided; uint16_t initiator; uint8_t distance[MAX_NODES]; -}; +} NodeInfo; -struct NumaNodeMem { +typedef struct NumaNodeMem { uint64_t node_mem; uint64_t node_plugged_mem; -}; +} NumaNodeMem; struct HMAT_LB_Data { uint8_t initiator; From patchwork Mon May 6 07:51:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YEf1veEC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv605khLz1xnS for ; Mon, 6 May 2024 18:02:48 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9h-0007VE-L8; Mon, 06 May 2024 03:53:01 -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 1s3t9c-0007Fu-Js for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:56 -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 1s3t9b-0001l9-48 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981974; 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=ZNUmdwMafGjlAD1dD5b/rKg5wI+EEX021CPgKZXxVh0=; b=YEf1veEC9dpLLQ6zbFbLU0AbF1ABy5Rrykz4wQdeQRZCjc3kyd/J0oDDXqvjIf091vy8xp f8c/Hk8ZJqzRaLQ/IXEo2E2l0pcAlkCq9UwVgWb/HEVMUm8DmqIQNPHfwmWi4L6aCXYjHz 2zDDLU6rEf/8OcqGYLIbNxCyZVACVSo= 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-621-8mejQz4wOkSf4i64-X8XpQ-1; Mon, 06 May 2024 03:52:53 -0400 X-MC-Unique: 8mejQz4wOkSf4i64-X8XpQ-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-572f3859ff2so125530a12.3 for ; Mon, 06 May 2024 00:52:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981971; x=1715586771; 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=ZNUmdwMafGjlAD1dD5b/rKg5wI+EEX021CPgKZXxVh0=; b=ZemzCOxWfKOSbge83LVixi2NXMhp2XgTrfwdi6CnQzS6oD5gC3F2Oa8baZgMZ7gRDV 8kdAAiOyw1jaw1nvLKE0swtZlhy8OucjNgTXouD34LsPmfV9jvwfVGq9AwVGzqRvdFV+ SBoL4c92u8wKM0PzlntsCcZhB4ii/wFqNHZc2j31foS4WWl0AjeOQaVj/eET0CH0rOFM zFE3IcrIk5dmQwHvqPwUWnoiIy+Rg2BU8TSpHG2LDV+oFcacPFPXNAS2ygiXXHPaw/3m aKX5EJf5FR5uA3ZcySSbfiAdYLN9q58OrJE66oZ0xC56KAOQK/ufMgRJMMnQAFG1qo4+ /slw== X-Gm-Message-State: AOJu0YxZART6biA7IRTmlW1QE0Te9+ToCa52Fuz/uJeuLuf6JvTjU3Qa nGaj5F/QM4e0/WC3ojxoAscqq+6MzufpwhAh1bTdE1DYflzA7KLAw+cVEQt1PtSdzNCUqzswTK4 rfZMCRdMvLZ+ARfs9RByZh9F8ENq2u7SchTvumeJkGa1J5qVNKqeCvdqK4UwvexY4RUjvtcioC+ KFFR502BYcosfOT0uDeuri4CvI/QqIGHF58PdM X-Received: by 2002:a50:bac6:0:b0:570:c8f:1a35 with SMTP id x64-20020a50bac6000000b005700c8f1a35mr5650890ede.8.1714981971501; Mon, 06 May 2024 00:52:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmpFZCGUmOATqXnnTW5AYl2cczW/lWad/hKydNCf4e8bYD9XhhY2KDBRDZwWCpTk/mPFchEA== X-Received: by 2002:a50:bac6:0:b0:570:c8f:1a35 with SMTP id x64-20020a50bac6000000b005700c8f1a35mr5650876ede.8.1714981971205; Mon, 06 May 2024 00:52:51 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id b14-20020a0564021f0e00b00572cebc5f32sm4075895edb.65.2024.05.06.00.52.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 34/46] net: remove AnnounceTimer from typedefs.h Date: Mon, 6 May 2024 09:51:13 +0200 Message-ID: <20240506075125.8238-35-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Exactly nobody needs it there. Place the typedef in the header that defines the struct. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/net/announce.h | 4 ++-- include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/net/announce.h b/include/net/announce.h index 3d90c83c237..72e7e501f7e 100644 --- a/include/net/announce.h +++ b/include/net/announce.h @@ -12,12 +12,12 @@ #include "qapi/qapi-types-net.h" #include "qemu/timer.h" -struct AnnounceTimer { +typedef struct AnnounceTimer { QEMUTimer *tm; AnnounceParameters params; QEMUClockType type; int round; -}; +} AnnounceTimer; /* Returns: update the timer to the next time point */ int64_t qemu_announce_timer_step(AnnounceTimer *timer); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index e0a0bc31e7f..520f421397b 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -27,7 +27,6 @@ typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; typedef struct Aml Aml; -typedef struct AnnounceTimer AnnounceTimer; typedef struct ArchCPU ArchCPU; typedef struct BdrvDirtyBitmap BdrvDirtyBitmap; typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter; From patchwork Mon May 6 07:51:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HOhtj4iU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXttt62fDz1ydY for ; Mon, 6 May 2024 17:53:10 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9k-0007f1-I9; Mon, 06 May 2024 03:53:04 -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 1s3t9f-0007Sl-Mi for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:59 -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 1s3t9e-0001ll-6n for qemu-devel@nongnu.org; Mon, 06 May 2024 03:52:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981977; 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=vl6UmUSnCe1v+kvRt3ccMUbyvwhB5ANCb14lhy2pm2o=; b=HOhtj4iUd/FEO6jOTUZUVAyeFe81JfAg7S49PCBCgh1agbrXOhX5NHM/Ldd67uk00GIab7 lzFa0p7WUS/mX8WF4aD+oS6A/Pe9N7KUx56G8XGBRXnBA4Y01XatGyPt9adDYxKpd/u4ZQ yxrhm0eDE8c5ovInfRhENtZMDwhETKY= 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-652-PpellDxoNs-HyR1rF8sl4Q-1; Mon, 06 May 2024 03:52:56 -0400 X-MC-Unique: PpellDxoNs-HyR1rF8sl4Q-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59aedbd9a9so109767166b.0 for ; Mon, 06 May 2024 00:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981974; x=1715586774; 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=vl6UmUSnCe1v+kvRt3ccMUbyvwhB5ANCb14lhy2pm2o=; b=RsloF3heaXIXX7tRFeL8Vt+aYw3sGKkWBt31bK2+bhwYePFLTsBc3W+PoHLHd8zh3N KMGrwbgsK9K3Nb7pH8tyMGgBI3x0j3inZI13gHD6f2xw72AAHhd0i1hNrBmzvnrvGSrq sSe5TaL0xQ3shIkQ2lDFXUBab9aPFXoik128SAnayW5KNAJGkVrUH4ASD+wzCcfvTkVQ 6nhNiXmujhdbc2wZoqUpuQne0dzHLMfac8hbvmNGrGLLYUzwRQduMJ2OPs5wkmgXmo0b u8KYiU/TrNonqPp9E/cVGsXxso2k9my2XyLj5szVH3mT0+00Slw2A38L/b95rdVY1NyW Hn1w== X-Gm-Message-State: AOJu0YwcnoqaurncC3ZhnmhC/4nuy+dXYO7uhRKj47H8/fJ6Q7VYJrX5 ZZybNxv7DX6DUZy1/fPw9owjhrmkgJ3xE6rfBknzjbdnrOxfw/81FslFnKbxq2E6pOxjCDBTK4/ I5eBiiKGw/38VEHAqZxi5sW3yV+GFHpZ32cUWakgeC7A0ynPuheQ68hYyx6uq5oB20WVUHyx0SQ KyST1UxfbacgTKegmCytMmUNMP4adU8IYt6FjX X-Received: by 2002:a17:907:7f87:b0:a59:d458:835c with SMTP id qk7-20020a1709077f8700b00a59d458835cmr767692ejc.52.1714981974074; Mon, 06 May 2024 00:52:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBdpbwVfUX3Z9jeiqpa0PRRNd795oWpQxK386urA0kWdMc82eMvZv7G5N45N+vTOlpnC4L5g== X-Received: by 2002:a17:907:7f87:b0:a59:d458:835c with SMTP id qk7-20020a1709077f8700b00a59d458835cmr767681ejc.52.1714981973736; Mon, 06 May 2024 00:52:53 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id qy29-20020a170907689d00b00a59adb12790sm2458320ejc.27.2024.05.06.00.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 35/46] qemu-option: remove QemuOpt from typedefs.h Date: Mon, 6 May 2024 09:51:14 +0200 Message-ID: <20240506075125.8238-36-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QemuOpt is basically an internal data structure. It has no business being defined except if you need functions from include/qemu/option.h. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/qemu/option.h | 2 ++ include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index b3498287823..01e673ae03f 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -54,6 +54,8 @@ enum QemuOptType { QEMU_OPT_SIZE, /* size, accepts (K)ilo, (M)ega, (G)iga, (T)era postfix */ }; +typedef struct QemuOpt QemuOpt; + typedef struct QemuOptDesc { const char *name; enum QemuOptType type; diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 520f421397b..4519f0cd613 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -108,7 +108,6 @@ typedef struct QEMUCursor QEMUCursor; typedef struct QEMUFile QEMUFile; typedef struct QemuLockable QemuLockable; typedef struct QemuMutex QemuMutex; -typedef struct QemuOpt QemuOpt; typedef struct QemuOpts QemuOpts; typedef struct QemuOptsList QemuOptsList; typedef struct QEMUSGList QEMUSGList; From patchwork Mon May 6 07:51:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AlV5FUHY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv446N4sz1xnS for ; Mon, 6 May 2024 18:01:08 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9m-0007mt-LB; Mon, 06 May 2024 03:53:06 -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 1s3t9j-0007ZW-21 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:03 -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 1s3t9h-0001m4-JB for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981980; 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=uYqiJiD3cHkBOXJK8l/nxNS2jHk461xYcqaYdRiiYtg=; b=AlV5FUHY5sJj+jKQ5Jw8aFuud+raY/DjNVDTqr2IQmZfSvzEQopwM3D23QyDMDCZmb6S7x w24vseQ5kFc0ljKWQ1Nj7vRmKM1LkM6MXIO0vxu3Jju5vzUWVjYllkihr2bF4MHpw9BDIO fxBgdDp05WYiprXB/m4izrWUp6v5q4k= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-304-4_QaOxtTN_-xiZ7Dfp3zVw-1; Mon, 06 May 2024 03:52:58 -0400 X-MC-Unique: 4_QaOxtTN_-xiZ7Dfp3zVw-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-572a0c5ece9so818425a12.2 for ; Mon, 06 May 2024 00:52:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981977; x=1715586777; 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=uYqiJiD3cHkBOXJK8l/nxNS2jHk461xYcqaYdRiiYtg=; b=fwrFwOZ1ytqsuseNWBnwLw/DSy0ciW8U3rb2rSyf9JAmCzO2T7HsC1VWMleiF0WSJO wRVUDYAzI/vRTty1z0bd6yaeDlJxMUukkwiVNSlncxN6jEMFyOfZBqIv/ZQG0t/D28pU GWwmxd2MONQB9VNJQIjYtOEjJyaK2ev7Z62pne2iK9l5uul7FBue6PpSrX4jXTQaSdO9 rcrgkjk4gt1EyIrS7WF9qCqt+DNS3KS+6ARZewt782qtxO3NlWNWJ0Yg7nZBkxFznmNL OIRbVRSnkxT30DQrNcv0Q4fXcDsEpIsM0OCTc6/UrhjwoJ2w6zWasetrNvJGFPszFtri Lkpg== X-Gm-Message-State: AOJu0YywvnzXbjxj+zJY9p+3m3elTXBY9ja0M71OOFOBy4qEES5ClphR WfFptRS40xotHnLSxUikQbu8e0ZY6yH9qWs7MZxVSstyYhso8Z+rFPwCwLie4plBZY/GL5g42nu JVpuo/varViAZOmd7iljqmiq2x213UAcWVtQF/JGgfqLjmFtljAuukdLNbtP1cxLJpzAcIut35o IlJ9s4/hgZuIjXUXWn64xmoHaCU2QoU1a7/e+S X-Received: by 2002:a50:cdde:0:b0:572:9d87:9aa3 with SMTP id h30-20020a50cdde000000b005729d879aa3mr6088127edj.36.1714981976871; Mon, 06 May 2024 00:52:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwn4ba2TUupKhjfFRVRr75PJoma4/O5fEZ5D2rhMBv8qgvaZMgJEm5/NcCzQc5jbRcU8wv+w== X-Received: by 2002:a50:cdde:0:b0:572:9d87:9aa3 with SMTP id h30-20020a50cdde000000b005729d879aa3mr6088118edj.36.1714981976528; Mon, 06 May 2024 00:52:56 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id h9-20020a0564020e0900b00572d58cffe1sm3720062edh.2.2024.05.06.00.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 36/46] intc: remove PICCommonState from typedefs.h Date: Mon, 6 May 2024 09:51:15 +0200 Message-ID: <20240506075125.8238-37-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move it to the existing "PIC related things" header, hw/intc/i8259.h. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/hw/intc/i8259.h | 2 ++ include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/intc/i8259.h b/include/hw/intc/i8259.h index c4125757753..1f2420231f1 100644 --- a/include/hw/intc/i8259.h +++ b/include/hw/intc/i8259.h @@ -3,6 +3,8 @@ /* i8259.c */ +typedef struct PICCommonState PICCommonState; + extern PICCommonState *isa_pic; /* diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 4519f0cd613..090e219248a 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -96,7 +96,6 @@ typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; -typedef struct PICCommonState PICCommonState; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; From patchwork Mon May 6 07:51:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=M7iloKjM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtw94mSfz1yZk for ; Mon, 6 May 2024 17:54:17 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAJ-0008WH-9w; Mon, 06 May 2024 03:53: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 1s3t9l-0007o9-UY for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:05 -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 1s3t9j-0001mI-6m for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981982; 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=aMFGRpwt2MBQ9BUPbkLkgJfLIroL0bh0oM+o3o5bzu8=; b=M7iloKjM5FQL6I9OEiDbREjFE6WfTl1czHvpI7bPqqJiHVovU8NyEQWAQJoVl5TaZ0wpgl by09Qlu05onVcRBwIiwZkk0xPs8Q6eRQKvIXNTconXTPRCronxuYxI0aYcJG+WbN3gjGjZ zkkN/QCu9PrKrwKlBOK/XqdfLy9EFwA= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-376-0fp_OR84NFeXSGm23n76aQ-1; Mon, 06 May 2024 03:53:01 -0400 X-MC-Unique: 0fp_OR84NFeXSGm23n76aQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a59c3cf5f83so65166266b.2 for ; Mon, 06 May 2024 00:53:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981979; x=1715586779; 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=aMFGRpwt2MBQ9BUPbkLkgJfLIroL0bh0oM+o3o5bzu8=; b=Gf65Kp4hUsIG/N+K4CwmtN/64tJv9kWzIy/r8CzLJiiqMm0d+8OHTKA6Ai5T0R9Tc3 JLWXde/eMiWJw1Zf1IbPN9FuRlEnJTXigIoN30Od/9aolzsPK3mV8sPmycYAdD42g28g SLPTtngv+VZtFfVro37wlIz9PXiBrnEv5pYwC9rzIksYGaFM9wGdozMgelh1kwOgKYvy +r2s0ZWy1n4cKFikbgB6tFr9P5OPoJPrXYn/JTMI7wSLQnX9YTpCFYj50Rc+6Ll55ptK lJ54Tb/m4LhrQc4NszjYcliz9WTtpXnmWN9B3OZeGKttpm0Mf67Byn5nLjUCoeR13wLR dDnQ== X-Gm-Message-State: AOJu0YwgPV7b4hv9ZLx5k6cD3k/E/kPxJG3QSlPaL8XLx90lGMuoKAQI VDpM5EALzotif4nS7d+JsAHhcqn68aFLWyAKZN5dM9cBDmOX4LI4bj6CQ/hgkVxdBjPQm9B8ktf JrHSi9923ciRITRoFlSmNVSXXLz1O/hRcLBjxeCG3Rg8vnkEPpkGsDbT9WxLjnNr24ldFRd3m3o iIL/LfEg/AElhj4aeIduSoustCWlEPtSf6klZj X-Received: by 2002:a17:907:28c2:b0:a59:9e01:e788 with SMTP id en2-20020a17090728c200b00a599e01e788mr4307619ejc.34.1714981979354; Mon, 06 May 2024 00:52:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5G+vZDqLJMPUBVbRk49Dvv2JGQKGMy2W4e5ngrPKvXzNpnZRwSoh2R9U0CYtm42Lth7EHVg== X-Received: by 2002:a17:907:28c2:b0:a59:9e01:e788 with SMTP id en2-20020a17090728c200b00a599e01e788mr4307610ejc.34.1714981979003; Mon, 06 May 2024 00:52:59 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id v6-20020a1709067d8600b00a599e65808asm3375943ejo.18.2024.05.06.00.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:52:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 37/46] lockable: remove QemuLockable from typedefs.h Date: Mon, 6 May 2024 09:51:16 +0200 Message-ID: <20240506075125.8238-38-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Using QemuLockable almost always requires going through QEMU_MAKE_LOCKABLE(). Therefore, there is little point in having the typedef always present. Move it to lockable.h, with only a small adjustment to coroutine.h (which has a tricky co-dependency with lockable.h due to defining CoMutex *and* using QemuLockable as a part of the CoQueue API). Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/qemu/coroutine.h | 4 ++-- include/qemu/lockable.h | 4 ++-- include/qemu/typedefs.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h index e6aff453017..ff3084538b8 100644 --- a/include/qemu/coroutine.h +++ b/include/qemu/coroutine.h @@ -84,6 +84,8 @@ static inline coroutine_fn void qemu_co_mutex_assert_locked(CoMutex *mutex) mutex->holder == qemu_coroutine_self()); } +#include "qemu/lockable.h" + /** * CoQueues are a mechanism to queue coroutines in order to continue executing * them later. They are similar to condition variables, but they need help @@ -281,8 +283,6 @@ void qemu_coroutine_inc_pool_size(unsigned int additional_pool_size); */ void qemu_coroutine_dec_pool_size(unsigned int additional_pool_size); -#include "qemu/lockable.h" - /** * Sends a (part of) iovec down a socket, yielding when the socket is full, or * Receives data into a (part of) iovec from a socket, diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h index 9823220446d..62110d2eb74 100644 --- a/include/qemu/lockable.h +++ b/include/qemu/lockable.h @@ -18,11 +18,11 @@ typedef void QemuLockUnlockFunc(void *); -struct QemuLockable { +typedef struct QemuLockable { void *object; QemuLockUnlockFunc *lock; QemuLockUnlockFunc *unlock; -}; +} QemuLockable; static inline __attribute__((__always_inline__)) QemuLockable * qemu_make_lockable(void *x, QemuLockable *lockable) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 090e219248a..ab24ca2876c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -105,7 +105,6 @@ typedef struct QEMUBH QEMUBH; typedef struct QemuConsole QemuConsole; typedef struct QEMUCursor QEMUCursor; typedef struct QEMUFile QEMUFile; -typedef struct QemuLockable QemuLockable; typedef struct QemuMutex QemuMutex; typedef struct QemuOpts QemuOpts; typedef struct QemuOptsList QemuOptsList; From patchwork Mon May 6 07:51:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WeYJQ0RP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3C6tylz1xnS for ; Mon, 6 May 2024 18:00:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9p-00083S-Tt; Mon, 06 May 2024 03:53:09 -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 1s3t9o-0007rS-4R for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:08 -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 1s3t9l-0001ma-My for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981984; 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=S79rhkI+WG9h3dJSlLxh3jusQtha4EiVXb01UkoHtUo=; b=WeYJQ0RPs4emCV3+l0DfqSOrQl+m7oNx9BbGD7AqDXoI7DkKLAxp6sQ4aQ35T6XLrFgXVk ZmQ2/mqv6HlX7Q2gV4iONsTD/pbpffMnArI4DvIKefslIheJWuMukX4H23pc0nHxMWFV/H 93MI8UWFvKbcryKjYgWi8LplHoEgLDI= 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-221-FqkpD8lQP9CFP2FBlhCxag-1; Mon, 06 May 2024 03:53:03 -0400 X-MC-Unique: FqkpD8lQP9CFP2FBlhCxag-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59cbb6f266so53765366b.3 for ; Mon, 06 May 2024 00:53:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981982; x=1715586782; 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=S79rhkI+WG9h3dJSlLxh3jusQtha4EiVXb01UkoHtUo=; b=Og81JOIlpLPeiwScfWN/eDmmfe/9YCTLj/GGWf05lFHx0RH+eJWAUkBJY4im0rL7HX 2w7kpPwSh1ZzwppFGistJxOxpL4I9UrySjpoh7UknWN1DwiAG+0wPjv5XaxmU0BBpqFy cgmU7SHNnLYwffp+gIEwk9WcXMK1yX+sNMOC+7leUXjd0NIwQJIuinndMQf99fA5UKEa oihyfXmiKIQbTTQAon7onuLRiAmcHVEcavqpIUWJQ1yBx4I0CIoptXsF0m+xXW/hsFwd Ccez3VytXKkIGbnbIkx8Vks354TRiBIxtJNCQCnFaOjgaOnUoxR2OTmoZCrJFOdZHqvU 4BBg== X-Gm-Message-State: AOJu0YwMBgJtPEFe6Z2azVnWpChvPJLpsfMjEG+5+F/JhCh1bGNZ64ig koTb5W7k+yXiqmVe2pQ+1A1UkkP3f9rF4i1Ewx88U2xyJGKTi4JwKpfe9laaf99yekAT94y7eHD L2UlejFeSLh59+QwRTFca01yiT0ASsmPssavZVg/jlG1U2o2nGtNZRMYKbUnzBa9SE+BF+FOAA0 9HtXxk8vdS7jNww37OWJ1l/HJTPdwoR17f7u7M X-Received: by 2002:a17:907:7e97:b0:a59:b1cf:fea0 with SMTP id qb23-20020a1709077e9700b00a59b1cffea0mr5169006ejc.19.1714981981884; Mon, 06 May 2024 00:53:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuo4ay43Y+SD3eAJ8jLaiHiOsgjHFvB9uAHvQnNFuMkwXxBPaUQgADOFmg1HBNB3qgp8zS9Q== X-Received: by 2002:a17:907:7e97:b0:a59:b1cf:fea0 with SMTP id qb23-20020a1709077e9700b00a59b1cffea0mr5168987ejc.19.1714981981546; Mon, 06 May 2024 00:53:01 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id my9-20020a1709065a4900b00a59ba75059asm1963522ejc.153.2024.05.06.00.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 38/46] migration: remove PostcopyDiscardState from typedefs.h Date: Mon, 6 May 2024 09:51:17 +0200 Message-ID: <20240506075125.8238-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is defined and referred to exclusively from a .c file. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/qemu/typedefs.h | 1 - migration/postcopy-ram.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index ab24ca2876c..2b1948a19ac 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -96,7 +96,6 @@ typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; -typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; typedef struct QBool QBool; diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index eccff499cb2..34197795482 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -44,7 +44,7 @@ */ #define MAX_DISCARDS_PER_COMMAND 12 -struct PostcopyDiscardState { +typedef struct PostcopyDiscardState { const char *ramblock_name; uint16_t cur_entry; /* @@ -54,7 +54,7 @@ struct PostcopyDiscardState { uint64_t length_list[MAX_DISCARDS_PER_COMMAND]; unsigned int nsentwords; unsigned int nsentcmds; -}; +} PostcopyDiscardState; static NotifierWithReturnList postcopy_notifier_list; From patchwork Mon May 6 07:51:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XC7LjFbX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtvT0GcQz1yZk for ; Mon, 6 May 2024 17:53:41 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3t9t-0008Bx-UN; Mon, 06 May 2024 03:53:13 -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 1s3t9q-00084K-19 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:10 -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 1s3t9o-0001nE-CP for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981987; 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=BZowvef2Ajk61rQN0cGeoX5jJiq28YAn+xqA2isy+TU=; b=XC7LjFbXrva0/CtKVdU663I4uZYLXzAHhyU1qdPxbiroZSystC5A5usT8Dk9sC/7mRnUYb m+3pwYIAkTSJrw5SImcraUbH1Z2607403xuVE+v/2s/NWiG7etynPCwlBiaqS74KJ5ttVS IoBqFSi35RkwaIlO3SEAIh8pisqgBHY= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-wpsv7GntNHK8PUBvyWqI9A-1; Mon, 06 May 2024 03:53:06 -0400 X-MC-Unique: wpsv7GntNHK8PUBvyWqI9A-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59a212d874so128376166b.1 for ; Mon, 06 May 2024 00:53:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981984; x=1715586784; 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=BZowvef2Ajk61rQN0cGeoX5jJiq28YAn+xqA2isy+TU=; b=j5i+zSZzXyNv8UedAYPaGEvgV5Jwhlj182eQeoRQfhiTcsUkHyyCAEuPeRpHYfjmIB HA9ZIGfkiD2D0914BoSCVQnXK8LKpfQJGLMy/BCw9Yr2JcZy8ipaib1JkZ3VvuTBxK8M UNLH8wPl6NMoZ1rOB87Qk2j/dEZASg91Xu5MIEdq2/HDdj5mMpHLoi6N8xby4Q8e1Rey TLOx3fFo6NI9yfR4/1HD8aQt616FTrshZrz4+a/LmtYRRfhUPewk6l+7IVFpfQDjfcau rncxebR8ETKCiDB5DzRAgWXiAnhj36CcMj7MijD928HF9cgn/IY6ok+OCxEk/KPTjEPb roLQ== X-Gm-Message-State: AOJu0YxAVDUIbw9rMhnJn2USho2EaMpgia3dWgroK9DJQOBE+UrXS5MJ 1x1skY0sw46bMRBBuMH6xzkk++bVw0qgxBG2IPr/nelTMhkMFi7ZXF6U9CXmacYo2Ki1JqT3LyV 2YNRrDbKcTwR5nT+X1e6DKXR0+Hq0neVzVmcGRWVPNNBjHcLUStlytQhQONosSt5y5nZymIyuIA h5cyGreMQVQ3zbQ7bjlJbWzvNEpge0hOPU94Cl X-Received: by 2002:a17:906:f8e:b0:a55:358f:783c with SMTP id q14-20020a1709060f8e00b00a55358f783cmr5028644ejj.24.1714981984383; Mon, 06 May 2024 00:53:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFz8jijY3KIwFE9AHjVKGyPY1wMHJ0IBWd5o4GEl6R4JfEFXzujyUM8Ij2/jnmIi14sjGo6GQ== X-Received: by 2002:a17:906:f8e:b0:a55:358f:783c with SMTP id q14-20020a1709060f8e00b00a55358f783cmr5028631ejj.24.1714981983983; Mon, 06 May 2024 00:53:03 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id md1-20020a170906ae8100b00a534000d525sm4916791ejb.158.2024.05.06.00.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 39/46] monitor: remove MonitorDef from typedefs.h Date: Mon, 6 May 2024 09:51:18 +0200 Message-ID: <20240506075125.8238-40-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org MonitorDef is defined by hmp-target.h, and all users except one already include it; the reason why the stubs do not include it, is because hmp-target.h currently can only be used in files that are compiled per target. However, that is easily fixed. Because the benefit of having MonitorDef in typedefs.h is very small, do it and remove the type from typedefs.h. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- include/monitor/hmp-target.h | 11 +++++++---- include/qemu/typedefs.h | 1 - stubs/target-monitor-defs.c | 3 +-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index d78e979f053..b679aaebbff 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -25,11 +25,10 @@ #ifndef MONITOR_HMP_TARGET_H #define MONITOR_HMP_TARGET_H +typedef struct MonitorDef MonitorDef; + +#ifdef COMPILING_PER_TARGET #include "cpu.h" - -#define MD_TLONG 0 -#define MD_I32 1 - struct MonitorDef { const char *name; int offset; @@ -37,6 +36,10 @@ struct MonitorDef { int val); int type; }; +#endif + +#define MD_TLONG 0 +#define MD_I32 1 const MonitorDef *target_monitor_defs(void); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 2b1948a19ac..b71a36d02b2 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -75,7 +75,6 @@ typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; -typedef struct MonitorDef MonitorDef; typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c index ac07b19064c..35a0a342772 100644 --- a/stubs/target-monitor-defs.c +++ b/stubs/target-monitor-defs.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" - -const MonitorDef *target_monitor_defs(void); +#include "monitor/hmp-target.h" const MonitorDef *target_monitor_defs(void) { From patchwork Mon May 6 07:51:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gLbRnRoe; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv7n6VGzz1xnS for ; Mon, 6 May 2024 18:04:21 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAT-0000dd-6T; Mon, 06 May 2024 03:53:49 -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 1s3t9s-00088m-2T for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:13 -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 1s3t9q-0001nR-Dy for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981989; 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=fT1y4KqRaxFcPgY6/amvw3l0h4xpM4rtBuLLxm77NYA=; b=gLbRnRoebOZoSJLeep9iF+2WoQ+u5wWRJwldHvNxLjSAPON/ybVWUnmd3p04pSYCgAovnJ 05nZxmKVTapIlg/XA2919vLkT5Rub59ZliiiMubVk5L/SU6p9MRptkXy0UHhA5GF9bC5Sh JZG/L1ZuYVcNXW8bKUPoSYMrrPzlB1o= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-351-h7n7uO4XM-W4UXOFHTYIhA-1; Mon, 06 May 2024 03:53:08 -0400 X-MC-Unique: h7n7uO4XM-W4UXOFHTYIhA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59c0ecd59cso81001766b.2 for ; Mon, 06 May 2024 00:53:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981987; x=1715586787; 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=fT1y4KqRaxFcPgY6/amvw3l0h4xpM4rtBuLLxm77NYA=; b=NDBRaICSXp3b4b9SCQ1yt3ivIlhbkEBa9lw3YJk3El3ua+ckhwja9jy3Itr4IjCI6G uNlDaSm6gvH3hUm8p7x9jkszWV20XpuDJ0ARL3+ruT1W3mosBE6j3etPRaVtfKiofP60 bchN8ieer9OTk+S1OE2AfaEBUE/NaA4KaQL+0n7/Ida+zFPF8GtM5e1AwyT+bGKdUoc4 xpfeQnj0CKXAxbBuFTzgCVqsITiblJQQf0ybchZK6l6Xj12Gx8jmM3/zyrD6vEA+zTLc /l4fU8zYuKpl/WsThG5U7aCgVbEfaN9LXeCwfBL7BHD33D71/D4ePyLOiDPqtSDi4fBG L/IQ== X-Gm-Message-State: AOJu0YyBKJ9R4DXlJ166YRdWAGkQ0Ve/7J3Ct5XYAjM7VC+EabSC/X90 TFhnbK/o+wQi/lEG1ijyRrP3rgynoPLbS+wRlS4ecU1JO577uNPu/RVH7T7hAwYIVuhuCepliwr KI39HC+OfSlFE7YlxuDWJENhvuXxcZNB370e20YmTG8paeaACIVoaKvriQV1tSXMak8otv+a8pr mzI6VPrZ3oX2ym8uOpxHoNET/Dl6ng07BsDJGn X-Received: by 2002:a17:906:aad7:b0:a59:a8a4:a5aa with SMTP id kt23-20020a170906aad700b00a59a8a4a5aamr5203490ejb.44.1714981986863; Mon, 06 May 2024 00:53:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFL8j0yafyXmQL6Vowj+aq3whBUCYhkWpYqxgexTkC0flFxyuwGNgO4Xcn0Kf73jdpEoZFSog== X-Received: by 2002:a17:906:aad7:b0:a59:a8a4:a5aa with SMTP id kt23-20020a170906aad700b00a59a8a4a5aamr5203476ejb.44.1714981986481; Mon, 06 May 2024 00:53:06 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id jl24-20020a17090775d800b00a599acaff03sm3624761ejc.19.2024.05.06.00.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 40/46] qapi/machine: remove types from typedefs.h Date: Mon, 6 May 2024 09:51:19 +0200 Message-ID: <20240506075125.8238-41-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org They are needed in very few places, which already depends on other generated QAPI files. The benefit of having these types in typedefs.h is small. Signed-off-by: Paolo Bonzini --- include/hw/core/cpu.h | 1 + include/qemu/typedefs.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 46b99a7ea55..a23d39f6a0c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -28,6 +28,7 @@ #include "exec/memattrs.h" #include "exec/mmu-access-type.h" #include "exec/tlb-common.h" +#include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-run-state.h" #include "qemu/bitmap.h" #include "qemu/rcu_queue.h" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index b71a36d02b2..78598f27f32 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -37,12 +37,10 @@ typedef struct BusClass BusClass; typedef struct BusState BusState; typedef struct Chardev Chardev; typedef struct Clock Clock; -typedef struct CompatProperty CompatProperty; typedef struct ConfidentialGuestSupport ConfidentialGuestSupport; typedef struct CPUAddressSpace CPUAddressSpace; typedef struct CPUArchState CPUArchState; typedef struct CPUPluginState CPUPluginState; -typedef struct CpuInfoFast CpuInfoFast; typedef struct CPUJumpCache CPUJumpCache; typedef struct CPUState CPUState; typedef struct CPUTLBEntryFull CPUTLBEntryFull; From patchwork Mon May 6 07:51:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FB4u42VF; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3D054Wz1yZk for ; Mon, 6 May 2024 18:00:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAk-0001lj-UZ; Mon, 06 May 2024 03:54:06 -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 1s3t9x-0008Jf-PI for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:19 -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 1s3t9t-0001nz-P7 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981992; 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=vx3cqDAGG/FUVVIhy0ip+ac1LgAXvC3VwS8/rT+0MBI=; b=FB4u42VFxOTlbkbjSJLVymUYzBmKijTpFsvo/ooi3DoTXwad4J+CXTH+2nGdl48E1ftaGo J7HzQCsaGkmd3nBkJL6YmcYzl0vjDd7/ibWWmrzWUsATl5AyVxpzR+xzsdnCdPF1L3I81V PiqobrprmmQ/WXNQ29k8m11Yk2Nduvk= 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-222-_XiwniApPouKA-YoDNLV1w-1; Mon, 06 May 2024 03:53:10 -0400 X-MC-Unique: _XiwniApPouKA-YoDNLV1w-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a59bfd32b8fso71385166b.3 for ; Mon, 06 May 2024 00:53:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981989; x=1715586789; 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=vx3cqDAGG/FUVVIhy0ip+ac1LgAXvC3VwS8/rT+0MBI=; b=CcpmVhyVkoqpdPhG4eA1GiKazHK0hYKYbxv5uX6kzp5xtfxDSHyWvyEstDKkXcjhhe 6I52dwkEiEGD8IlqVXW/Y2G10p5t1UvPwGTNkwivyfU/cgLVDXOCHiRg5q+0S32ArSus Fse32eG/T1ipyRslHuXAz9gKV41Dd4cSM65XgYLWIVxu2bLfJsY/UrsvOuxyNKBo7jQ6 YxPqYOSbHHEpITeiDyzcGCshut6vsRKMLE1PsJtvTpe08wL4j1B22tpRDHD0FBH+AIVJ 9C+jtr6XB8/Jbu7CdqGZptn+y1UBHyxAKfqFYjdSXllMlyb8Hd38V1gKOhAzF9ijrCoU 6QqA== X-Gm-Message-State: AOJu0YyKd+7UxIzLIIKgk2mzxYJ8ULTZKhnI9WzwtPa0i7l+5DNhyeGw 4CjinHLSBTVo4c3D/jQLEuzLLw0KaOPNeyImXY90L9BT0l2LyBAtFWLYB1EwMjtv0/gIVXrhbMI IfnEEfG2+uZkdsst+V5dsDx0zwmd4DmAERf1S3npi3bsZ12BHvBR2gRFYtZcOIbFa4/hXkBY3Wk PmliISoXmwYwEWY0k7/cqRETHQDJlmLHUDYH8v X-Received: by 2002:a17:906:2bc4:b0:a59:adf8:a6d5 with SMTP id n4-20020a1709062bc400b00a59adf8a6d5mr3235870ejg.72.1714981989420; Mon, 06 May 2024 00:53:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOFmjkT3cSnAj5zlggx2UCg96ZnxgEm6Q5D4mk7hv5lJ9f81m2ESqCzxSYoHP+mIZsNeAbsg== X-Received: by 2002:a17:906:2bc4:b0:a59:adf8:a6d5 with SMTP id n4-20020a1709062bc400b00a59adf8a6d5mr3235855ejg.72.1714981989000; Mon, 06 May 2024 00:53:09 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id rn9-20020a170906d92900b00a59a229564fsm3009364ejb.108.2024.05.06.00.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 41/46] display: remove GraphicHwOps from typedefs.h Date: Mon, 6 May 2024 09:51:20 +0200 Message-ID: <20240506075125.8238-42-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Basically all uses of GraphicHwOps are defining an instance of it, which requires the full definition of the struct. It is pointless to have it in typedefs.h. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- hw/display/vga_int.h | 1 + include/qemu/typedefs.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 876a1d3697b..f77c1c11457 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -25,6 +25,7 @@ #ifndef HW_VGA_INT_H #define HW_VGA_INT_H +#include "ui/console.h" #include "exec/ioport.h" #include "exec/memory.h" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 78598f27f32..7e3597e94c5 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -53,7 +53,6 @@ typedef struct Error Error; typedef struct EventNotifier EventNotifier; typedef struct FlatView FlatView; typedef struct FWCfgState FWCfgState; -typedef struct GraphicHwOps GraphicHwOps; typedef struct HostMemoryBackend HostMemoryBackend; typedef struct I2CBus I2CBus; typedef struct I2SCodec I2SCodec; From patchwork Mon May 6 07:51:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JUJXQ0oZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3w4QJFz1yZk for ; Mon, 6 May 2024 18:01:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAU-0000pX-Hm; Mon, 06 May 2024 03:53:50 -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 1s3tA1-0008PP-72 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:23 -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 1s3t9z-0001od-HZ for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981997; 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=NFofCkIX6ZCOAYjcqWsduwPTtWRGt+ZtQlacHrjsajI=; b=JUJXQ0oZ1Q4zb7IoGRJOmSMMsPbSiu8XIQlgEYYwROV6iEj58Buqmh03KdSMPj3ZmViXk8 QXgP/x9W47NftGPJ98KWH2eLVGcKJlYaMtJu8EuXsmOxtRwSaz3H96Mg2lCWZnAqQ0815R kP3jlQ3tUO+XjhC36Ve62a5VKP8h4Mw= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-296irV_8Pp6XHC8SiCZVGA-1; Mon, 06 May 2024 03:53:13 -0400 X-MC-Unique: 296irV_8Pp6XHC8SiCZVGA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59a63a1f78so89306166b.0 for ; Mon, 06 May 2024 00:53:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981992; x=1715586792; 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=NFofCkIX6ZCOAYjcqWsduwPTtWRGt+ZtQlacHrjsajI=; b=scu/mltanjjUS8+6xqC/avz2On8Bn1IoyGg5LEzCCbt4R3qhEG5JYmPNiREDl5j0nd b+g88J9u/X9+xhwsvNIpYc1QBY7ZQt5ixWulLhHLpb1C/N4m5jbLujWDVsF9YWVpisym IVV6PigXbrUff955Xezw859A31zOA5xp7wk8R3Xh9zEUwCaKS6w9Br0auJ44WvGC/sYJ j38DQ9jiLbuMH5Xlv6fsbJW0QeD0eQLKOC6Tryg8G0U3JTeFCff0hDyLbwoyxA6lXnGa XiceuTC9+HYJ/r/ycQAlvkk2NI0xAIShzLh23E/vkn3vAtrW0R4/ryyS3bg5gPbCnfAh ma/A== X-Gm-Message-State: AOJu0YzNsrHLR1VK6pm/6qK83XsDSrwBlaGYg/lLGkCZ4d/64ikWuFoe 5JlxYmN6ix78SvjKbxnRcxIM46L6nEL6aYhOVaJvSOkbiWiObn/XwqiMZEsj9ETSbrRgO1zm7ai HYThcw7zNkT4w4zc2Ie5eJkia+HEgBBNLxM2WBRlpMb+8xUdizPw/6UUnVGKgGFE7SY57jgGT+P wttxcc7HzmP0RBKhaViKLejIQeiS2VcG5YHMd8 X-Received: by 2002:a17:906:d15a:b0:a59:cfab:504 with SMTP id br26-20020a170906d15a00b00a59cfab0504mr937665ejb.48.1714981992099; Mon, 06 May 2024 00:53:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXvmfOFfED0mNATR3Ru1qdoBxEj8C+98D29YWfZPXmFB3Y4HIuf0c4DFPa3IiaRAXx9A0i1Q== X-Received: by 2002:a17:906:d15a:b0:a59:cfab:504 with SMTP id br26-20020a170906d15a00b00a59cfab0504mr937654ejb.48.1714981991704; Mon, 06 May 2024 00:53:11 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id ef7-20020a17090697c700b00a59c59b2dc8sm1515516ejb.200.2024.05.06.00.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 42/46] tcg: remove CPU* types from typedefs.h Date: Mon, 6 May 2024 09:51:21 +0200 Message-ID: <20240506075125.8238-43-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org hw/core/cpu.h is already using struct forward declarations in some cases to avoid inclusions, and otherwise CPUAddressSpace and CPUJumpCache are only used together with their definition. CPUTLBEntryFull is always used when their definition is available. Remove all three from typedefs.h. Signed-off-by: Paolo Bonzini --- accel/tcg/tb-jmp-cache.h | 4 ++-- include/hw/core/cpu.h | 10 ++++++++-- include/qemu/typedefs.h | 3 --- system/physmem.c | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/accel/tcg/tb-jmp-cache.h b/accel/tcg/tb-jmp-cache.h index 184bb3e3e2e..c3a505e394a 100644 --- a/accel/tcg/tb-jmp-cache.h +++ b/accel/tcg/tb-jmp-cache.h @@ -22,12 +22,12 @@ * non-NULL value of 'tb'. Strictly speaking pc is only needed for * CF_PCREL, but it's used always for simplicity. */ -struct CPUJumpCache { +typedef struct CPUJumpCache { struct rcu_head rcu; struct { TranslationBlock *tb; vaddr pc; } array[TB_JMP_CACHE_SIZE]; -}; +} CPUJumpCache; #endif /* ACCEL_TCG_TB_JMP_CACHE_H */ diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index a23d39f6a0c..1382a986158 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -85,6 +85,12 @@ DECLARE_CLASS_CHECKERS(CPUClass, CPU, typedef struct CPUWatchpoint CPUWatchpoint; +/* see physmem.c */ +struct CPUAddressSpace; + +/* see accel/tcg/tb-jmp-cache.h */ +struct CPUJumpCache; + /* see accel-cpu.h */ struct AccelCPUClass; @@ -473,12 +479,12 @@ struct CPUState { QemuMutex work_mutex; QSIMPLEQ_HEAD(, qemu_work_item) work_list; - CPUAddressSpace *cpu_ases; + struct CPUAddressSpace *cpu_ases; int num_ases; AddressSpace *as; MemoryRegion *memory; - CPUJumpCache *tb_jmp_cache; + struct CPUJumpCache *tb_jmp_cache; GArray *gdb_regs; int gdb_num_regs; diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 7e3597e94c5..d23020ed232 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -38,12 +38,9 @@ typedef struct BusState BusState; typedef struct Chardev Chardev; typedef struct Clock Clock; typedef struct ConfidentialGuestSupport ConfidentialGuestSupport; -typedef struct CPUAddressSpace CPUAddressSpace; typedef struct CPUArchState CPUArchState; typedef struct CPUPluginState CPUPluginState; -typedef struct CPUJumpCache CPUJumpCache; typedef struct CPUState CPUState; -typedef struct CPUTLBEntryFull CPUTLBEntryFull; typedef struct DeviceState DeviceState; typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot; typedef struct DisplayChangeListener DisplayChangeListener; diff --git a/system/physmem.c b/system/physmem.c index 1a81c226bae..6dc58b34bbb 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -158,12 +158,12 @@ static void tcg_commit(MemoryListener *listener); * @memory_dispatch: its dispatch pointer (cached, RCU protected) * @tcg_as_listener: listener for tracking changes to the AddressSpace */ -struct CPUAddressSpace { +typedef struct CPUAddressSpace { CPUState *cpu; AddressSpace *as; struct AddressSpaceDispatch *memory_dispatch; MemoryListener tcg_as_listener; -}; +} CPUAddressSpace; struct DirtyBitmapSnapshot { ram_addr_t start; From patchwork Mon May 6 07:51:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cNq2BTob; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv3w4PFWz1xnS for ; Mon, 6 May 2024 18:01:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAT-0000dm-7F; Mon, 06 May 2024 03:53:49 -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 1s3tA0-0008PL-Qj for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:23 -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 1s3t9y-0001of-UP for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714981998; 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=PBc91Al63eay/PNo3RVE1I5QeuiworYFdD0LlT+cZG4=; b=cNq2BTobDjocPm1/yTfp1O7DNVuRCluSiC1/AQnu9ckH0Ik9HsPgIHDRauM4lT5XFNTYH3 /LYyxM8R0Yy4Z+jnvLBiB3DzE0xm5PTlElATHwo0HjdujUmY2z7zQu0wchkLJX7UlBsSKk OxCUdjxojbtG0ktu3DACB/202TEgcRE= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-bmG9KkvQPpOeiBemyqq2-g-1; Mon, 06 May 2024 03:53:16 -0400 X-MC-Unique: bmG9KkvQPpOeiBemyqq2-g-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-572eea3758dso936519a12.0 for ; Mon, 06 May 2024 00:53:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981995; x=1715586795; 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=PBc91Al63eay/PNo3RVE1I5QeuiworYFdD0LlT+cZG4=; b=UesV82iQorBGvkZPfRBJhRpqLXT9vhHy7ecRWkAc8PdSe9DOM4ViBOUZEO2XAU7GYA yp1OJvo9y0ItxzQl9ausd5VP3w942ufHbKJxSBVOZ8qtrFAAVdK27TkP4HVPBv71m1UI Ggod/lOWBgtpmzSKaIVPbqFpV6QfxCK3flwOt8GzkbnVX0zXjw0HPu/2P+6AnAa5poS5 mf7Uw8N+FD+TuUNyJM5yZlMgA68p+YmEA7ZOymFP9Kw95oksnD3GJPLq0byByr+1mmAi VbVCTjxH6hy9gtDhCW0aG8uieiqDs4WC/fHU+JO8RXYYUcz2DkuxZx6+NVFusHP/wzni Ajtg== X-Gm-Message-State: AOJu0Yy+1Q7OboZZzhGLljxzjGGMPM5w0uZEPFHZDR7GjNwQzk3WTYNs uezfavEawFx8evC3JJY1mR7i9WPZRPJ3cYeqaP0ZP/GAZvqEQW7EzmsGcFqswGbjgq63E3BdSmg Gnhaww3EFY+fyHWaMUVyO8GQ3IuFm21cEf1W9ecAwv3U+Q4I450S/mucbuiBN25WCgoh7vv/84C Wwj05IlfHwLFAW1cG8kKXAMwF6kOxw0B2FAxNF X-Received: by 2002:a50:9517:0:b0:572:3b3c:754f with SMTP id u23-20020a509517000000b005723b3c754fmr7817519eda.4.1714981994733; Mon, 06 May 2024 00:53:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGppqGdAs2zybrcxN9jzvl1TwJaaSQzyrl25XUDjUHrwZtGd5YDk4Dq/WziKo44smKaXQHFMg== X-Received: by 2002:a50:9517:0:b0:572:3b3c:754f with SMTP id u23-20020a509517000000b005723b3c754fmr7817492eda.4.1714981994282; Mon, 06 May 2024 00:53:14 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id c21-20020aa7df15000000b005727bdb1eafsm4805919edy.40.2024.05.06.00.53.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 43/46] pci: remove some types from typedefs.h Date: Mon, 6 May 2024 09:51:22 +0200 Message-ID: <20240506075125.8238-44-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For types that are embedded in structs defined by pci.h, the definition is pretty much required to be available. Remove them from typedefs.h. Signed-off-by: Paolo Bonzini --- include/hw/pci/pcie.h | 3 +++ include/hw/pci/pcie_aer.h | 38 ++++++++++++++++++------------------- include/hw/pci/pcie_sriov.h | 8 ++++---- include/qemu/typedefs.h | 5 ----- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 11f5a91bbb7..5eddb909769 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -27,6 +27,9 @@ #include "hw/pci/pcie_sriov.h" #include "hw/hotplug.h" +typedef struct PCIEPort PCIEPort; +typedef struct PCIESlot PCIESlot; + typedef enum { /* these bits must match the bits in Slot Control/Status registers. * PCI_EXP_HP_EV_xxx = PCI_EXP_SLTCTL_xxxE = PCI_EXP_SLTSTA_xxx diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h index 4a9f0ea69dc..4d8c0e05077 100644 --- a/include/hw/pci/pcie_aer.h +++ b/include/hw/pci/pcie_aer.h @@ -25,8 +25,23 @@ /* definitions which PCIExpressDevice uses */ +/* error */ +typedef struct PCIEAERErr { + uint32_t status; /* error status bits */ + uint16_t source_id; /* bdf */ + +#define PCIE_AER_ERR_IS_CORRECTABLE 0x1 /* correctable/uncorrectable */ +#define PCIE_AER_ERR_MAYBE_ADVISORY 0x2 /* maybe advisory non-fatal */ +#define PCIE_AER_ERR_HEADER_VALID 0x4 /* TLP header is logged */ +#define PCIE_AER_ERR_TLP_PREFIX_PRESENT 0x8 /* TLP Prefix is logged */ + uint16_t flags; + + uint32_t header[4]; /* TLP header */ + uint32_t prefix[4]; /* TLP header prefix */ +} PCIEAERErr; + /* AER log */ -struct PCIEAERLog { +typedef struct PCIEAERLog { /* This structure is saved/loaded. So explicitly size them instead of unsigned int */ @@ -48,11 +63,11 @@ struct PCIEAERLog { /* Error log. log_max-sized array */ PCIEAERErr *log; -}; +} PCIEAERLog; /* aer error message: error signaling message has only error severity and source id. See 2.2.8.3 error signaling messages */ -struct PCIEAERMsg { +typedef struct PCIEAERMsg { /* * PCI_ERR_ROOT_CMD_{COR, NONFATAL, FATAL}_EN * = PCI_EXP_DEVCTL_{CERE, NFERE, FERE} @@ -60,7 +75,7 @@ struct PCIEAERMsg { uint32_t severity; uint16_t source_id; /* bdf */ -}; +} PCIEAERMsg; static inline bool pcie_aer_msg_is_uncor(const PCIEAERMsg *msg) @@ -69,21 +84,6 @@ pcie_aer_msg_is_uncor(const PCIEAERMsg *msg) msg->severity == PCI_ERR_ROOT_CMD_FATAL_EN; } -/* error */ -struct PCIEAERErr { - uint32_t status; /* error status bits */ - uint16_t source_id; /* bdf */ - -#define PCIE_AER_ERR_IS_CORRECTABLE 0x1 /* correctable/uncorrectable */ -#define PCIE_AER_ERR_MAYBE_ADVISORY 0x2 /* maybe advisory non-fatal */ -#define PCIE_AER_ERR_HEADER_VALID 0x4 /* TLP header is logged */ -#define PCIE_AER_ERR_TLP_PREFIX_PRESENT 0x8 /* TLP Prefix is logged */ - uint16_t flags; - - uint32_t header[4]; /* TLP header */ - uint32_t prefix[4]; /* TLP header prefix */ -}; - extern const VMStateDescription vmstate_pcie_aer_log; int pcie_aer_init(PCIDevice *dev, uint8_t cap_ver, uint16_t offset, diff --git a/include/hw/pci/pcie_sriov.h b/include/hw/pci/pcie_sriov.h index b77eb7bf58a..450cbef6c20 100644 --- a/include/hw/pci/pcie_sriov.h +++ b/include/hw/pci/pcie_sriov.h @@ -15,17 +15,17 @@ #include "hw/pci/pci.h" -struct PCIESriovPF { +typedef struct PCIESriovPF { uint16_t num_vfs; /* Number of virtual functions created */ uint8_t vf_bar_type[PCI_NUM_REGIONS]; /* Store type for each VF bar */ const char *vfname; /* Reference to the device type used for the VFs */ PCIDevice **vf; /* Pointer to an array of num_vfs VF devices */ -}; +} PCIESriovPF; -struct PCIESriovVF { +typedef struct PCIESriovVF { PCIDevice *pf; /* Pointer back to owner physical function */ uint16_t vf_number; /* Logical VF number of this function */ -}; +} PCIESriovVF; void pcie_sriov_pf_init(PCIDevice *dev, uint16_t offset, const char *vfname, uint16_t vf_dev_id, diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index d23020ed232..5d999e20d7c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -78,13 +78,8 @@ typedef struct ObjectClass ObjectClass; typedef struct PCIBridge PCIBridge; typedef struct PCIBus PCIBus; typedef struct PCIDevice PCIDevice; -typedef struct PCIEAERErr PCIEAERErr; -typedef struct PCIEAERLog PCIEAERLog; -typedef struct PCIEAERMsg PCIEAERMsg; typedef struct PCIEPort PCIEPort; typedef struct PCIESlot PCIESlot; -typedef struct PCIESriovPF PCIESriovPF; -typedef struct PCIESriovVF PCIESriovVF; typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; From patchwork Mon May 6 07:51:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ddo6VDZh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtxK1qlWz1xnT for ; Mon, 6 May 2024 17:55:17 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAk-0001kt-Ii; Mon, 06 May 2024 03:54:06 -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 1s3tA2-0008Tt-RR for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:27 -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 1s3tA0-0001or-TW for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714982000; 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=B5HjsvcOl2UMW2kd+0qfMXmm+QI4Al82cfzwR58R5Iw=; b=Ddo6VDZhV2pwUeFW8h4K5MKVsPHkTLlcepVDT640ubYqEjIyUIZqJnR/9ZHvVGqT0jWLE+ 2ZHmivjFXXtoqZXfMPsduajlT7baK/pW5OtZLqMSe0ry+vBF0moUV2O1pPnZxheXYylAds sHydh8NGeKUa58JLvqXfuVXf7cCE7l0= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-529-xVBLdwATP7KZnoUfs8KYwA-1; Mon, 06 May 2024 03:53:18 -0400 X-MC-Unique: xVBLdwATP7KZnoUfs8KYwA-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5725f45da8eso311820a12.0 for ; Mon, 06 May 2024 00:53:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981997; x=1715586797; 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=B5HjsvcOl2UMW2kd+0qfMXmm+QI4Al82cfzwR58R5Iw=; b=VFVY/O7Vdqbi6ks5PLllkQw94Rv8+QS6OSuWEa3W9c90pBAbMCfWAn6HsKpqS8jlu0 SFyGOeBGuePQ5ZuNCcYlj9+IOtDr9y8cB6nQ8OYkEoiFuepy5ISjNV4mYQ4ioBmTWE/U yuVMtPvUxCxC2XLTMmgvhVioD3wvQCb2bih/mvgP1pouosMFmU5kLoP9RVGlkbpQ58l4 1Fd7KFwGA4S8qc8hTlPVyQXurGZ770TN/2mKmRrQwVOK6MwwiMlS2ACkPw3oboUdvoPI UFaXYDkdBmmNVxToLDlxfA2XcJueYyRI+4JJZOq+zSwePwqO3O3vci+gnSI+0GJNhs8x HsWw== X-Gm-Message-State: AOJu0YxigZirI4S0/P1agYQIm8oXLsHjQ5xHjnevGt+r9jGRbnXo2qc9 m4SLIw21cSaoNnNbS1wCD55d9j3UG0Q6w+MjLq25UxbinisSjjEL6JcMCGh6WR7Cat+UVcXV903 C/8PzKjWXv36iz4tEP3DusO7W/+WXmrCK4ZCnt0Id/LfWIbgsipfYKnBSlKq7J8GcIHY6JXvRto HAYGcLxydNZ1GY16/rco0rU2Y6MZxYxRNSHM4f X-Received: by 2002:a50:aadc:0:b0:56f:e4f7:fbd9 with SMTP id r28-20020a50aadc000000b0056fe4f7fbd9mr6111765edc.20.1714981997022; Mon, 06 May 2024 00:53:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkXRb2XIWOBMaN8DgaSx3nuLesMCNot8X0Y/udzJQl6Rcrrs27An34u8lK1qCq0218TvSXiQ== X-Received: by 2002:a50:aadc:0:b0:56f:e4f7:fbd9 with SMTP id r28-20020a50aadc000000b0056fe4f7fbd9mr6111752edc.20.1714981996599; Mon, 06 May 2024 00:53:16 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id h25-20020a0564020e9900b00572cfb37bd6sm4047294eda.8.2024.05.06.00.53.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 44/46] kvm: move target-dependent interrupt routing out of kvm-all.c Date: Mon, 6 May 2024 09:51:23 +0200 Message-ID: <20240506075125.8238-45-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Let hw/hyperv/hyperv.c and hw/intc/s390_flic.c handle (respectively) SynIC and adapter routes, removing the code from target-independent files. This also removes the only occurrence of AdapterInfo outside s390 code, so remove that from typedefs.h. Signed-off-by: Paolo Bonzini --- include/hw/s390x/adapter.h | 4 +-- include/qemu/typedefs.h | 1 - include/sysemu/kvm.h | 5 +-- accel/kvm/kvm-all.c | 62 ++------------------------------------ hw/hyperv/hyperv.c | 25 +++++++++++++++ hw/intc/s390_flic_kvm.c | 28 +++++++++++++++++ 6 files changed, 61 insertions(+), 64 deletions(-) diff --git a/include/hw/s390x/adapter.h b/include/hw/s390x/adapter.h index 7f1703508c4..d4fadc4f7f8 100644 --- a/include/hw/s390x/adapter.h +++ b/include/hw/s390x/adapter.h @@ -12,12 +12,12 @@ #ifndef S390X_ADAPTER_H #define S390X_ADAPTER_H -struct AdapterInfo { +typedef struct AdapterInfo { uint64_t ind_addr; uint64_t summary_addr; uint64_t ind_offset; uint32_t summary_offset; uint32_t adapter_id; -}; +} AdapterInfo; #endif diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 5d999e20d7c..2ff50bf5970 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -23,7 +23,6 @@ */ typedef struct AccelCPUState AccelCPUState; typedef struct AccelState AccelState; -typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; typedef struct Aml Aml; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index eaf801bc934..c31d9c73566 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -470,10 +470,11 @@ static inline void kvm_irqchip_commit_route_changes(KVMRouteChange *c) } } +int kvm_irqchip_get_virq(KVMState *s); void kvm_irqchip_release_virq(KVMState *s, int virq); -int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter); -int kvm_irqchip_add_hv_sint_route(KVMState *s, uint32_t vcpu, uint32_t sint); +void kvm_add_routing_entry(KVMState *s, + struct kvm_irq_routing_entry *entry); int kvm_irqchip_add_irqfd_notifier_gsi(KVMState *s, EventNotifier *n, EventNotifier *rn, int virq); diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index d7281b93f3b..c0be9f5eedb 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1909,8 +1909,8 @@ void kvm_irqchip_commit_routes(KVMState *s) assert(ret == 0); } -static void kvm_add_routing_entry(KVMState *s, - struct kvm_irq_routing_entry *entry) +void kvm_add_routing_entry(KVMState *s, + struct kvm_irq_routing_entry *entry) { struct kvm_irq_routing_entry *new; int n, size; @@ -2007,7 +2007,7 @@ void kvm_irqchip_change_notify(void) notifier_list_notify(&kvm_irqchip_change_notifiers, NULL); } -static int kvm_irqchip_get_virq(KVMState *s) +int kvm_irqchip_get_virq(KVMState *s) { int next_virq; @@ -2165,62 +2165,6 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); } -int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) -{ - struct kvm_irq_routing_entry kroute = {}; - int virq; - - if (!kvm_gsi_routing_enabled()) { - return -ENOSYS; - } - - virq = kvm_irqchip_get_virq(s); - if (virq < 0) { - return virq; - } - - kroute.gsi = virq; - kroute.type = KVM_IRQ_ROUTING_S390_ADAPTER; - kroute.flags = 0; - kroute.u.adapter.summary_addr = adapter->summary_addr; - kroute.u.adapter.ind_addr = adapter->ind_addr; - kroute.u.adapter.summary_offset = adapter->summary_offset; - kroute.u.adapter.ind_offset = adapter->ind_offset; - kroute.u.adapter.adapter_id = adapter->adapter_id; - - kvm_add_routing_entry(s, &kroute); - - return virq; -} - -int kvm_irqchip_add_hv_sint_route(KVMState *s, uint32_t vcpu, uint32_t sint) -{ - struct kvm_irq_routing_entry kroute = {}; - int virq; - - if (!kvm_gsi_routing_enabled()) { - return -ENOSYS; - } - if (!kvm_check_extension(s, KVM_CAP_HYPERV_SYNIC)) { - return -ENOSYS; - } - virq = kvm_irqchip_get_virq(s); - if (virq < 0) { - return virq; - } - - kroute.gsi = virq; - kroute.type = KVM_IRQ_ROUTING_HV_SINT; - kroute.flags = 0; - kroute.u.hv_sint.vcpu = vcpu; - kroute.u.hv_sint.sint = sint; - - kvm_add_routing_entry(s, &kroute); - kvm_irqchip_commit_routes(s); - - return virq; -} - #else /* !KVM_CAP_IRQ_ROUTING */ void kvm_init_irq_routing(KVMState *s) diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 3ea54ba818b..483dcca3083 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -373,6 +373,31 @@ int hyperv_set_event_flag(HvSintRoute *sint_route, unsigned eventno) return ret; } +static int kvm_irqchip_add_hv_sint_route(KVMState *s, uint32_t vcpu, uint32_t sint) +{ + struct kvm_irq_routing_entry kroute = {}; + int virq; + + if (!kvm_gsi_routing_enabled()) { + return -ENOSYS; + } + virq = kvm_irqchip_get_virq(s); + if (virq < 0) { + return virq; + } + + kroute.gsi = virq; + kroute.type = KVM_IRQ_ROUTING_HV_SINT; + kroute.flags = 0; + kroute.u.hv_sint.vcpu = vcpu; + kroute.u.hv_sint.sint = sint; + + kvm_add_routing_entry(s, &kroute); + kvm_irqchip_commit_routes(s); + + return virq; +} + HvSintRoute *hyperv_sint_route_new(uint32_t vp_index, uint32_t sint, HvSintMsgCb cb, void *cb_data) { diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index baaa30dcb73..330f08dfdc2 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -324,6 +324,34 @@ static int kvm_s390_io_adapter_map(S390FLICState *fs, uint32_t id, return r ? -errno : 0; } +static int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) +{ + struct kvm_irq_routing_entry kroute = {}; + int virq; + + if (!kvm_gsi_routing_enabled()) { + return -ENOSYS; + } + + virq = kvm_irqchip_get_virq(s); + if (virq < 0) { + return virq; + } + + kroute.gsi = virq; + kroute.type = KVM_IRQ_ROUTING_S390_ADAPTER; + kroute.flags = 0; + kroute.u.adapter.summary_addr = adapter->summary_addr; + kroute.u.adapter.ind_addr = adapter->ind_addr; + kroute.u.adapter.summary_offset = adapter->summary_offset; + kroute.u.adapter.ind_offset = adapter->ind_offset; + kroute.u.adapter.adapter_id = adapter->adapter_id; + + kvm_add_routing_entry(s, &kroute); + + return virq; +} + static int kvm_s390_add_adapter_routes(S390FLICState *fs, AdapterRoutes *routes) { From patchwork Mon May 6 07:51:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931751 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aDhsmsP3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXv140kZQz1xnT for ; Mon, 6 May 2024 17:58:32 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAp-0001xB-Qd; Mon, 06 May 2024 03:54:13 -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 1s3tA9-000091-5Y for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:35 -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 1s3tA2-0001qV-SI for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714982002; 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=HoGDH+Rv7yjyMA09L6ivkS5qMJY1NeD7GH9r1OMOy2A=; b=aDhsmsP3E8GAgmn8YDzj9R3uyfZUSNdG+pdv/OskIFd2dpKrMZIgsrEw/Fpm/8Gz52/34i FFQYhtus/pyJcmdVtUJhz4X/ju1TgLtfzVMtwhniGz6YDZ2+ofg/KR8oeZLj3Po2SaDaO1 /G9T3dCsrBkZG7cnY7qht+SWjqlVyiE= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-478-RRL5lvGRNo-iRUmMz4SKqw-1; Mon, 06 May 2024 03:53:20 -0400 X-MC-Unique: RRL5lvGRNo-iRUmMz4SKqw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59cdf2141eso36414766b.2 for ; Mon, 06 May 2024 00:53:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714981999; x=1715586799; 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=HoGDH+Rv7yjyMA09L6ivkS5qMJY1NeD7GH9r1OMOy2A=; b=i/nvzzthgpgDDsNcx+OCalnHQA5Z1VAinyO4hef+2QTkxkvYAyNPL1zjr/iFuXccls DTwY9La4K0lwtg0SNxoVMYSZBnu6vOVl1okjee+R5C8gcIH0La8iklxLPFIzqtNoBvOd sFt2bk0/zKf2prVDvKuQ+IGJKrCO+sUGK3WJaLSHrdnNLhDibtJabj72d/SmN4Y5BYaz 5MnPdJ26zumfY5PsWe2ZFM2QtbMhmDVDKn17LDlmImaoikLiavYizgj8jg7ukFLkJYRe qHjHjhx3V5C6s2Xh73cEn2R/5MUYphh0rcNg+dUdJf1PZTblHBwrwGpKSU2h/18tiJIo AoIw== X-Gm-Message-State: AOJu0YwOXMOUdRbhDpA0MDPdSusaBy+KFq+UwWs0D9AhGKCaCfKlDplX Xbn7IqExaS1oUuJJXSpdIIa9sD5X+OYmMTMyR+uTqYSFyndGdYpTycFFfi3om1DW/3mOgwqgRzZ IBy6YeJAz5ID4HYpooG21ro1UY+k3KkaiTSfrp+g/gVnUkdBjNMPUrhl5KTM+ARYNr710+qQxA4 +7Zi/RHKdyuwp3ga9PQf4eqZiDA77TlANkbpvC X-Received: by 2002:a17:906:b012:b0:a59:d6d8:b24e with SMTP id v18-20020a170906b01200b00a59d6d8b24emr480232ejy.22.1714981999226; Mon, 06 May 2024 00:53:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqpZpb2xfiTNorA4wyKgRAykP6qSIhP4NTxuFfg/io7y1wA/7mTNSlVcXNPtNbJmfmTKr0fw== X-Received: by 2002:a17:906:b012:b0:a59:d6d8:b24e with SMTP id v18-20020a170906b01200b00a59d6d8b24emr480222ejy.22.1714981998937; Mon, 06 May 2024 00:53:18 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id bm26-20020a170906c05a00b00a5588a9fe66sm4868540ejb.86.2024.05.06.00.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 45/46] migration: do not include coroutine_int.h Date: Mon, 6 May 2024 09:51:24 +0200 Message-ID: <20240506075125.8238-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Migration code needs no private fields of the coroutine backend. Include the "regular" coroutine.h header. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- migration/migration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.h b/migration/migration.h index 8045e39c26f..6c612c03819 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -19,7 +19,7 @@ #include "qapi/qapi-types-migration.h" #include "qapi/qmp/json-writer.h" #include "qemu/thread.h" -#include "qemu/coroutine_int.h" +#include "qemu/coroutine.h" #include "io/channel.h" #include "io/channel-buffer.h" #include "net/announce.h" From patchwork Mon May 6 07:51:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1931749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FogXxM3b; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VXtzJ4lypz1ydY for ; Mon, 6 May 2024 17:57:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3tAp-0001yJ-Ot; Mon, 06 May 2024 03:54:13 -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 1s3tA7-00005O-P3 for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:35 -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 1s3tA6-0001qz-FF for qemu-devel@nongnu.org; Mon, 06 May 2024 03:53:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714982005; 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=ONGYpDHvGaq+Ar3j95zhW7jx60qaSUiuPIrd8f0yOgM=; b=FogXxM3bCac9B7Z30niJsJZv69n2ScmWsx31UA+Gjhuf/8GtEL2U2wEyFzsiy4dDGq4QmZ JLzT984P7EF2Q3uj+zgQpHYn8CS0VFeHj9Qc1Q1QNwzvgeoHkAclsrODuyuylv3gGT/n0v Y8SYuN7GQIuiHIaptgyA0f2sBAdlN2s= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-c5mxMUpIMu-YVfSl5zIeAA-1; Mon, 06 May 2024 03:53:23 -0400 X-MC-Unique: c5mxMUpIMu-YVfSl5zIeAA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59a5b06802so97543366b.1 for ; Mon, 06 May 2024 00:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714982001; x=1715586801; 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=ONGYpDHvGaq+Ar3j95zhW7jx60qaSUiuPIrd8f0yOgM=; b=ER+MwVOcdZHWFK+Hr1yP+VFl7mLmGUTNfMs9IguGTviaN59NSJ8lvGJGFp8Phk4N7A I9Gopaq52AwWBv03EhquGdlUME/r8opFI2bD3ceZVWvUbVQBMgN8vIJAU6p1UUMdglw+ r0DkdOgoCrlcP9ThuF67zLX3fcsjXt8aKEKBRZpF5uiZ7gpg06759XtD0XfkGmtBCfiw bmgBprWkAHcow1jTyl4Kh7oINER+ZcE2c6uwM2jbKKUjynZ6SeS3mUA8BxxcPI1N8Slq zgnKYe5CBui03QpfiuW4kExQ6pqIOnK7WGZmCmDhwh5FltspuYVhFFawma+z0ttkC80P xXYA== X-Gm-Message-State: AOJu0Yyxdnh/oDgAbmV+OON+0U+EBbXxFDgEWVekEu7kW0D4Ii6u5D88 QFUwvPYRPiKZdkvv0Nel9XQzaML9pCKsY0trF4cTSBa+KDBpGerJsFJO+SekvDAB0Xcisatvnjp LY8xceqyIh2AVXz3DvTwIaLGoMZlCrUs5ZduZMpyuM469ytn9tLerWjzCaTpuLjkQAhzUKsGcRJ qlnheosdw+3DVWwyrUlmfcB589YKQSt8wyxR9U X-Received: by 2002:a17:907:9403:b0:a59:c9b1:cb64 with SMTP id dk3-20020a170907940300b00a59c9b1cb64mr2229874ejc.62.1714982001526; Mon, 06 May 2024 00:53:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdu3x4hNriukUV28WW3HXDqb0oYNkOrr4Codvco4YouL1Xcond+9yu4MfMuiyqKXSIVAXung== X-Received: by 2002:a17:907:9403:b0:a59:c9b1:cb64 with SMTP id dk3-20020a170907940300b00a59c9b1cb64mr2229867ejc.62.1714982001204; Mon, 06 May 2024 00:53:21 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id ze16-20020a170906ef9000b00a59b9b1abdfsm1984932ejb.185.2024.05.06.00.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 00:53:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 46/46] qga/commands-posix: fix typo in qmp_guest_set_user_password Date: Mon, 6 May 2024 09:51:25 +0200 Message-ID: <20240506075125.8238-47-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com> References: <20240506075125.8238-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.431, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qga/commands-posix.c does not compile on FreeBSD due to a confusion between "chpasswdata" (wrong) and "chpasswddata" (used in the #else branch). Fixes: 0e5b75a390 ("qga/commands-posix: qmp_guest_set_user_password: use ga_run_command helper") Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- qga/commands-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 7a065c4085c..7f05996495a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2173,7 +2173,7 @@ void qmp_guest_set_user_password(const char *username, } #ifdef __FreeBSD__ - g_autofree char *chpasswdata = g_strdup(rawpasswddata); + g_autofree char *chpasswddata = g_strdup(rawpasswddata); const char *crypt_flag = crypted ? "-H" : "-h"; const char *argv[] = {"pw", "usermod", "-n", username, crypt_flag, "0", NULL};