From nobody Tue May 14 05:09:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1693311789; cv=none; d=zohomail.com; s=zohoarc; b=FC3g6e0L+NurOtm5VIFTAZwdA/hiD/Yuy6PEmBIvsJPcZd8q8TenexNDG+ykG7/lc+7rrkXDUOols6kTUmD/Dm0/JPd8AYdkCsN4JmZGP6g3wa8yyhOeFiNyJaLVmbXOieM4LSc6+eycl2tphDaoYoaE9JP35AiPiXkDp1SCkY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693311789; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0Vxlb2B+ITtVd9TDdOjjXHyYKGUxZtS9Vvd0RcKz1Eo=; b=kC4m9nRIaX+C/fYOk/nqMX1wJph9CB9vqMzA6LT+WVdG7ANakpnIe0Zxcop7Y8TeTI5S9o/bN1BqZhKlcBgAarHuOz9DIk5jetzqNmhvmQp8mk1Zy9Ebtj2WYs9fZGVswp2swCXJvM2lY0XHKCDu2vYA1ESrCQn9dLAHG9lBh6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693311789589748.4907772452277; Tue, 29 Aug 2023 05:23:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaxjT-000896-Tc; Tue, 29 Aug 2023 08:22:07 -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 1qaxjO-00087k-DN for qemu-devel@nongnu.org; Tue, 29 Aug 2023 08:22:03 -0400 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qaxjH-0001MH-Vb for qemu-devel@nongnu.org; Tue, 29 Aug 2023 08:22:01 -0400 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1cca0a1b3c7so2935927fac.2 for ; Tue, 29 Aug 2023 05:21:55 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.94.15.194]) by smtp.gmail.com with ESMTPSA id x7-20020a4a97c7000000b00573320e1241sm5079327ooi.14.2023.08.29.05.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 05:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1693311714; x=1693916514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Vxlb2B+ITtVd9TDdOjjXHyYKGUxZtS9Vvd0RcKz1Eo=; b=OCFmhYz19IT1pxyHYKGBt5/Cm8fI3Zf5ccK9jcK2JxenQ5DszOL2G+J9hzxzNlGUVu QCMupoqqv4hXUQLbOvUBHD8rWqnbx+Gs48YSGlBLe+R2l6+htohHe6fDr0q0/ctJIDWe FXiUzeZf7gYnUp9UzgQ+tyPevlqmfYqLxjtH9rA08Uuxjbv+pAaKYdRPeCBgg75dL17N UNEvDGAAARgvVrO4ywS1XIUjbMNHHnRO5SgoK0lpRNjoQkuQTW0Q7VjfK1KlaZ+2qCc8 61E4ubmGYsaGi6qkf6hNU4G+b3j9iSMs0BTFZT+4PD9ish60qfLlfWQdnplATj/iRgTo /rbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693311714; x=1693916514; 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=0Vxlb2B+ITtVd9TDdOjjXHyYKGUxZtS9Vvd0RcKz1Eo=; b=ezLF8Hgvr528/ZBl7wo3dGKPnaGht9mWjQ7dxmvzaFqZiFf7Ft1gsLTAWFJkvmPhFL ad7omQDzrMAs583ji9b/AIKkFGPfEBlR7U2mEGM5hVWCMdALQ3oPVo8wFBdB3e2YYslo Sj9w0PYgJtq4dCmDZ3KIvQ+ED1eCYDlHqVBGNDfAQG8xwh4wPJEZSICSeEmyoqeVbz4/ eosnA4Dh8V0kxmWOcRAOquVlgI6wNN4GE8vcjf5PLxKobkQjA/BrsZijSSDJ1gDHs3lI 02Qv7VRIgh2HpBj7IOU+OTDM3sHCjxXKbw7mXFBWA994LVXZYa9DOfBN7HhInbPpzdDR 7/Yw== X-Gm-Message-State: AOJu0YyLpoFxh1gIgfjB/XWbyI+JZniFU3xDSV29Gi24kw6jcUFbbS/Q NoHZzTpJ8mz0dFY1xxL31c+StFqrtf4lxxZZrho= X-Google-Smtp-Source: AGHT+IF+PV0EXDvel6CKhiMmEYj/WBSJL8cvlPsY3fdojHaMke4J5QyflL/LudqxkJ8j4AYhj+L+jw== X-Received: by 2002:a05:6870:210:b0:1c8:cf1b:feee with SMTP id j16-20020a056870021000b001c8cf1bfeeemr15960231oad.13.1693311714396; Tue, 29 Aug 2023 05:21:54 -0700 (PDT) From: Daniel Henrique Barboza To: 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, Daniel Henrique Barboza Subject: [PATCH 1/2] hw/intc/riscv_aplic.c fix non-KVM --enable-debug build Date: Tue, 29 Aug 2023 09:21:43 -0300 Message-ID: <20230829122144.464489-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829122144.464489-1-dbarboza@ventanamicro.com> References: <20230829122144.464489-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::33; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1693311793083100007 Content-Type: text/plain; charset="utf-8" Commit 6df0b37e2ab breaks a --enable-debug build in a non-KVM environment with the following error: /usr/bin/ld: libqemu-riscv64-softmmu.fa.p/hw_intc_riscv_aplic.c.o: in funct= ion `riscv_kvm_aplic_request': ./qemu/build/../hw/intc/riscv_aplic.c:486: undefined reference to `kvm_set_= irq' collect2: error: ld returned 1 exit status This happens because the debug build will poke into the 'if (is_kvm_aia(aplic->msimode))' block and fail to find a reference to the KVM only function riscv_kvm_aplic_request(). Make riscv_kvm_aplic_request() a no-op if we're not building KVM. Fixes: 6df0b37e2ab ("target/riscv: update APLIC and IMSIC to support KVM AI= A") Signed-off-by: Daniel Henrique Barboza --- hw/intc/riscv_aplic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index 592c3ce768..b634738bda 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -483,7 +483,9 @@ static uint32_t riscv_aplic_idc_claimi(RISCVAPLICState = *aplic, uint32_t idc) =20 static void riscv_kvm_aplic_request(void *opaque, int irq, int level) { +#ifdef CONFIG_KVM kvm_set_irq(kvm_state, irq, !!level); +#endif } =20 static void riscv_aplic_request(void *opaque, int irq, int level) --=20 2.41.0 From nobody Tue May 14 05:09:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1693311790; cv=none; d=zohomail.com; s=zohoarc; b=iqEmbKrhaRsvT/IcTUXUj78+e+uJ7f6CfpQcOuvNQ8WLgHu8PcGZN8EXMtsW7GD8c8v9KRvqlFZYiaBeTw8YT36Sy3NbNVgeZNA0l8Uuadpzr/blxV6b+X37p1Rcd2KKU2Wdt7vPl/xsCZLnYrwqrZWqL739CA7oEt1Yu0I3fuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693311790; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9cL0Fun4ilnv0euhMcCCgO4wnOC+ky4KYEKADy08jIg=; b=McX+olzK+7PYRRkdeJ0t4ihVfKaCN63Iv1l+nClBdi0Qbq2hrHHUVkHnnicJc/j30TuZ/1P+4ALz69bRemrKQkwjwzlnqC5LQw3D++22bVHdd1cyQ+flZoA8UcrJWmruycjS3blfIM3+/kf/oKSz2mhBJoXROHk8Z+qFHVYyT40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693311790012461.54021619593584; Tue, 29 Aug 2023 05:23:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaxjX-0008AV-Lp; Tue, 29 Aug 2023 08:22: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 1qaxjQ-00088R-9G for qemu-devel@nongnu.org; Tue, 29 Aug 2023 08:22:04 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qaxjK-0001NF-Ta for qemu-devel@nongnu.org; Tue, 29 Aug 2023 08:22:03 -0400 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-5733d431209so2686499eaf.0 for ; Tue, 29 Aug 2023 05:21:58 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.94.15.194]) by smtp.gmail.com with ESMTPSA id x7-20020a4a97c7000000b00573320e1241sm5079327ooi.14.2023.08.29.05.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 05:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1693311717; x=1693916517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9cL0Fun4ilnv0euhMcCCgO4wnOC+ky4KYEKADy08jIg=; b=lY9vc/9d0lRIMoLhsvz9XCrjqBobkK9DCuvMd1vRWKuKbVJFn2Ec8fXuupQ66RXJr0 htPA+nqwoN9/7sjiqoZmQEz5WquiRvHhntAD8dkJBlhFKlhxa93XeEQN87WBadvgVUEH uroKVPYqkvMYR4ggQkKeZ+oIFb/hdvcSbdq0U8M5p4L7xyqVp6pYZ0esNlJJZJ8/Dr5l Sd8aBxyhKDfkJA7W+EaFQeXJMOriZ3alFxGcuXvlcCqM+n+zzEKpi0ieR56OM6EjzjhL I/FNqMOMGDx9P48/7oVe02Xwmkw8jXDhB4uQbnT3YdnXCEZ8G4n9kj/r/LDQZPYMlnDz 4UTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693311717; x=1693916517; 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=9cL0Fun4ilnv0euhMcCCgO4wnOC+ky4KYEKADy08jIg=; b=Jk80973AtAfqhIB9hCDhALWf6/OuvrMnKzS7dU1CDeVfH8c0v6d/J+LvyWlG8kqjoU sYhtDCyLEJg9L4PSOUW8/wPfopnCO2m2d5JOkQkPPGIyi9F8e4L7HygIN8+G6QqOuNXz spc8BeXb1uWCEwClgrDwx15k0yIAxsjhkP2gwSoedKNcU4YAaBHyfEq2ZHm6PBnK8EOL DFTilGhIxRFUA/2QHbUPCoDo+9vfUQKQc/Te5ErNGHjfK/xcnRAtSPJKyyWCxlsl9JNh FuKk5j/MkqX0JKjPsBmeG5vXLHmHrhxdXNHATPUZAR1sa/4qT8i7znd31sKdq8Bjqgn4 EDpg== X-Gm-Message-State: AOJu0YxRK7+wqTpBj4mEgkVyfHI3MPt/9V/Zg/8IyEt4ZfX+R2vEWHQG hu4TIbMdojw3xVswUVCW02iPonXGKI0cpX71F/4= X-Google-Smtp-Source: AGHT+IH3s8xvMLbnhqPDlOGGLf0ATYLpvAzR/3GjtXkuicLLMqPX53/SbYf+W+h3olCpqyZZ2/WAtQ== X-Received: by 2002:a4a:3457:0:b0:56c:7428:4a35 with SMTP id n23-20020a4a3457000000b0056c74284a35mr16001727oof.7.1693311717441; Tue, 29 Aug 2023 05:21:57 -0700 (PDT) From: Daniel Henrique Barboza To: 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, Daniel Henrique Barboza Subject: [PATCH 2/2] hw/riscv/virt.c: fix non-KVM --enable-debug build Date: Tue, 29 Aug 2023 09:21:44 -0300 Message-ID: <20230829122144.464489-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829122144.464489-1-dbarboza@ventanamicro.com> References: <20230829122144.464489-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c31; envelope-from=dbarboza@ventanamicro.com; helo=mail-oo1-xc31.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1693311793044100003 Content-Type: text/plain; charset="utf-8" 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 `v= irt_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(+) diff --git a/target/riscv/kvm_riscv.h b/target/riscv/kvm_riscv.h index 7d4b7c60e2..01be45cc69 100644 --- a/target/riscv/kvm_riscv.h +++ b/target/riscv/kvm_riscv.h @@ -22,9 +22,19 @@ void kvm_riscv_init_user_properties(Object *cpu_obj); void kvm_riscv_reset_vcpu(RISCVCPU *cpu); void kvm_riscv_set_irq(RISCVCPU *cpu, int irq, int level); + +#ifdef CONFIG_KVM void kvm_riscv_aia_create(MachineState *machine, uint64_t group_shift, uint64_t aia_irq_num, uint64_t aia_msi_num, uint64_t aplic_base, uint64_t imsic_base, uint64_t guest_num); +#else +static inline void kvm_riscv_aia_create(MachineState *machine, + uint64_t group_shift, uint64_t aia_irq_num, + uint64_t aia_msi_num, uint64_t aplic_base, + uint64_t imsic_base, uint64_t guest_num) { + g_assert_not_reached(); +} +#endif =20 #endif --=20 2.41.0