From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D265C83F12 for ; Tue, 29 Aug 2023 14:19:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qazYY-0000FP-Qb; Tue, 29 Aug 2023 10:18: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 1qazYX-0000Eu-5P for qemu-devel@nongnu.org; Tue, 29 Aug 2023 10:18:57 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qazYU-0001zA-TM for qemu-devel@nongnu.org; Tue, 29 Aug 2023 10:18:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-31c3df710bdso3536834f8f.1 for ; Tue, 29 Aug 2023 07:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693318733; x=1693923533; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Avwm6g3wqpU0rrbhmDuEJQYPbNE2E3ULIXXoLDVzdlQ=; b=k9DO7cD4UxRh/ytg0NXx7d/O+B8AwXaneYrLuHp5DGtsWABHNF7BhQmbDiEuQI2OW6 YOdX3qAWpOqmhcqj9/hoCtGCAWZGkiw9lFZOEWjtBy8o37vYvWYwETXPrDiQd3Etr8r3 hfDAR84oPUbN4hUdvznAphbfRJqHt0kjckGH7obOzxQjh0oTilM00mtR24TRwrzIDOXr QvUIJpY1ynn+Fbsj8BPF6WaMMHax04RZjaA97mRQIsNhcODwIOckol12zh6SO+1aMFW7 jPG29/BfYAbAYAsqD2TEK0ieJJ4YxNgDi0qAdI1vSNXZBNyBUO7qHpnXPgsbwUnE4nsL 6m8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693318733; x=1693923533; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Avwm6g3wqpU0rrbhmDuEJQYPbNE2E3ULIXXoLDVzdlQ=; b=QMYeQpyRUM23IAOsnnoZgMw3uzXdTDAv9I7PpTx6xtUat3JryEO/4uKK9h0XM8Up0O 1XB4pjKF+Fpd0tik5BgKGryCb4vFuRn6y0m2jXU3A2rU+2C15kmZPJqLY+bSdo/lr3Z7 SWxnwMq4DXb+cDVzNYxkzpGdQRSvh0p/n6ugJFO1kfg1Hvc9lCYV+uGBj5TdX8iE7Zx9 pwZvHWQeEqkvgbSNLbIJn920s6wdV1HAUr8GQU53GEHrJ2sP4aY2cpNVReemO7WVS6Oj dTRQjPMykCpGeNevg75sOne4j34WfC360LMxMUzCajpziUhHJn/FJbLhNgtP2+TQaptx LadA== X-Gm-Message-State: AOJu0YxC8UQHBiIxRGTHr4hpdt7O52eAWB2vIDLk8hsSeBg8mHq0Ry/c kO2mttKaIjOsSshuSli9NQl8PQ== X-Google-Smtp-Source: AGHT+IFwc5PwvF5zXWdsoq13yanWn21+qp9AGRZH5BhqoRysFt26bH3LetbLVcX0xolKXZY4Swof2Q== X-Received: by 2002:adf:f8c4:0:b0:314:d31:f7 with SMTP id f4-20020adff8c4000000b003140d3100f7mr23019808wrq.63.1693318733269; Tue, 29 Aug 2023 07:18:53 -0700 (PDT) Received: from [192.168.69.115] (sml13-h01-176-184-15-56.dsl.sta.abo.bbox.fr. [176.184.15.56]) by smtp.gmail.com with ESMTPSA id z16-20020a1c4c10000000b003fa96fe2bd9sm17202535wmf.22.2023.08.29.07.18.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Aug 2023 07:18:50 -0700 (PDT) Message-ID: Date: Tue, 29 Aug 2023 16:18:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH 2/2] hw/riscv/virt.c: fix non-KVM --enable-debug build Content-Language: en-US To: Daniel Henrique Barboza , qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com References: <20230829122144.464489-1-dbarboza@ventanamicro.com> <20230829122144.464489-3-dbarboza@ventanamicro.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: <20230829122144.464489-3-dbarboza@ventanamicro.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-1.242, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 29/8/23 14:21, Daniel Henrique Barboza wrote: > A build with --enable-debug and without KVM will fail as follows: > > /usr/bin/ld: libqemu-riscv64-softmmu.fa.p/hw_riscv_virt.c.o: in function `virt_machine_init': > ./qemu/build/../hw/riscv/virt.c:1465: undefined reference to `kvm_riscv_aia_create' > > This happens because the code block with "if virt_use_kvm_aia(s)" isn't > being ignored by the debug build, resulting in an undefined reference to > a KVM only function. > > Add a stub for kvm_riscv_aia_create() in kvm_riscv.h when CONFIG_KVM is > false. Adding it as an inline instead of using kvm-stubs.c will make it > easier in the future to remember to add stubs for kvm functions that are > used in multiple accelerator code. > > Fixes: dbdb99948e ("target/riscv: select KVM AIA in riscv virt machine") > Signed-off-by: Daniel Henrique Barboza > --- > target/riscv/kvm_riscv.h | 10 ++++++++++ > 1 file changed, 10 insertions(+) Similarly: -- >8 -- diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c @@ -79,7 +79,9 @@ /* KVM AIA only supports APLIC MSI. APLIC Wired is always emulated by QEMU. */ static bool virt_use_kvm_aia(RISCVVirtState *s) { - return kvm_irqchip_in_kernel() && s->aia_type == VIRT_AIA_TYPE_APLIC_IMSIC; + return kvm_enabled() + && kvm_irqchip_in_kernel() + && s->aia_type == VIRT_AIA_TYPE_APLIC_IMSIC; } --- ?