From patchwork Tue Mar 11 08:57:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011293 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 6DE00C282EC for ; Tue, 11 Mar 2025 08:58:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvR3-0005y1-8I; Tue, 11 Mar 2025 04:58: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 1trvR0-0005wT-2B for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:57:58 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvQv-0001GZ-Od for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:57:57 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso979353f8f.2 for ; Tue, 11 Mar 2025 01:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683472; x=1742288272; darn=nongnu.org; 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=kJAFD94zi/oNPjCaDJ/18IN628XDVYDLV93YoL8+1yI=; b=rweaF6Mw/qYS5RJTjfy2/IOnw7t76o1hveBhXliGgeEbEuB0yyvXCTPLYwNe7fXMK3 jATpDvZzNnfeiWGJ3G02RC2j0e3YwKKXCpgO0BjdpZJLtp/BErpyfIhl+iVg1sMPDT6/ W9Bf0s3XE3b0GJT+TfPOhwx+Lj5mylYo4h4hZT8c2zTAEa5YaaBclGHp6Kg2blTId0yA pg53QlyO2EBVkZ2hLvIdLyi1c9R5Rpd29W4UW9kmHuNsLbtOuNH+1bfFk1FybvGuAQBp Ay3CW50snyUHsv+hb2nAjNWRsbLsR6DqFxWflKmbjBpB3VC6TLc7yGYka2BIP0fvZbYG kkVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683472; x=1742288272; 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=kJAFD94zi/oNPjCaDJ/18IN628XDVYDLV93YoL8+1yI=; b=ehiO7M7ovyHcLoHtAZ7rfbQmsIaztzDNzKHA1YcGTtIzRcxyJNLK1kycxE7FfjqExE 2QV4WUmgSy4zPXCKhP6JgherD91xdsTx/rsI+75HZ0YVVDaJ6hd/rXx1vldqpssae0Sm iBIAzu//v1lDki5HBYbWVZnqaVyAPpj86W0ZjlCBFSP+zogxASRj/T57hTCOAfOY84bo Lb1JJtHDDAg9CBgAr2DEA7Tc0rJlwCQ+JNl9Cf0tmdALc03XhwwyG1otE3g8+rU0HS+o l+NWvNre13frY2XX3jQX3hu+galQtoHthblEIGG8xR//Iizv+ezSK3K2JR8zUIBc+e/i /ogA== X-Gm-Message-State: AOJu0Yyg9P3xxqDTtCS5UMQUcA3sTKr5fKrSNaV5EvjLEDhYM98Y7WG/ GGPAkzfVV46eb+FRNCXLFXH9H67rrH7YbwB5l4YE0w+AQRQ3Nv6ny3kh4qiOyorQ+LC72aInefR 3mAc= X-Gm-Gg: ASbGncv67sUhgUBiHgzoojJ2B49+kGPudQCIE9O8I60TRPigjSN9ermdSn2bfNBsv6Z 0xox3DNGr5VcnXW/sjGDZ7QQY8GrZbFy4bxVj09x5FTsNRBwqMJobQN/R/g+Veech8dELwlqJUQ HdAW3+WJq0I/A3lYOUgxQwg4Gq0BhDNhToTEqLp6AIQlnwuG0oWNH4TFl4uHZi1k8HP8CO78rB6 uZbyYqJma0rhV0Uxr9rz24WrvW2LRQnQqMjT4YC8LxWqVFCrrBFESt5BNTnbb2E/hB+CfTIlo9l 8mT3g/zsoLlketi9a4Umx2JzmV+JEaBnJst7uUZPFC4pujmsa/PJDT3saA58O33rBcimhMzl2xj 0D1DjbBL8NtPxozuUnTM= X-Google-Smtp-Source: AGHT+IENGtdXpnHVaHE/pFqc7DQh359bAprD58qLtJIQITmL+4MLh1DrTmbMekHs2AKPpnClyzhKUQ== X-Received: by 2002:a05:6000:1fa1:b0:390:d6b0:b89 with SMTP id ffacd0b85a97d-39132da91b9mr12448260f8f.50.1741683471678; Tue, 11 Mar 2025 01:57:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cf3ca4f5asm75774715e9.12.2025.03.11.01.57.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:57:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 1/8] system: Declare qemu_[min/max]rampagesize() in 'system/hostmem.h' Date: Tue, 11 Mar 2025 09:57:36 +0100 Message-ID: <20250311085743.21724-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Both qemu_minrampagesize() and qemu_maxrampagesize() are related to host memory backends, having the following call stack: qemu_minrampagesize() -> find_min_backend_pagesize() -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND) qemu_maxrampagesize() -> find_max_backend_pagesize() -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND) Having TYPE_MEMORY_BACKEND defined in "system/hostmem.h": include/system/hostmem.h:23:#define TYPE_MEMORY_BACKEND "memory-backend" Move their prototype declaration to "system/hostmem.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Eric Auger Message-Id: <20250308230917.18907-7-philmd@linaro.org> Acked-by: David Hildenbrand --- include/exec/ram_addr.h | 3 --- include/system/hostmem.h | 3 +++ hw/ppc/spapr_caps.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/vfio/spapr.c | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..e4c28fbec9b 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -102,9 +102,6 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr, bool ramblock_is_pmem(RAMBlock *rb); -long qemu_minrampagesize(void); -long qemu_maxrampagesize(void); - /** * qemu_ram_alloc_from_file, * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing diff --git a/include/system/hostmem.h b/include/system/hostmem.h index 5c21ca55c01..62642e602ca 100644 --- a/include/system/hostmem.h +++ b/include/system/hostmem.h @@ -93,4 +93,7 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend); size_t host_memory_backend_pagesize(HostMemoryBackend *memdev); char *host_memory_backend_get_name(HostMemoryBackend *backend); +long qemu_minrampagesize(void); +long qemu_maxrampagesize(void); + #endif diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 904bff87ce1..9e53d0c1fd1 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -34,6 +34,7 @@ #include "kvm_ppc.h" #include "migration/vmstate.h" #include "system/tcg.h" +#include "system/hostmem.h" #include "hw/ppc/spapr.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a9b3db19f63..75b32182eb0 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -41,6 +41,7 @@ #include "hw/s390x/tod.h" #include "system/system.h" #include "system/cpus.h" +#include "system/hostmem.h" #include "target/s390x/kvm/pv.h" #include "migration/blocker.h" #include "qapi/visitor.h" diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index ad4c499eafe..237f96dd3fa 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -15,6 +15,7 @@ #include #endif #include "system/kvm.h" +#include "system/hostmem.h" #include "exec/address-spaces.h" #include "hw/vfio/vfio-common.h" From patchwork Tue Mar 11 08:57:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011295 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 911CAC282EC for ; Tue, 11 Mar 2025 08:59:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvR7-0005zL-Lx; Tue, 11 Mar 2025 04:58:05 -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 1trvR5-0005ya-GQ for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:03 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvR2-0001Ho-3b for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:02 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43d0782d787so522385e9.0 for ; Tue, 11 Mar 2025 01:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683477; x=1742288277; darn=nongnu.org; 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=sFPI1v+4fToZ6wKriqV/HJMz8kpUPqvU5UnLhoYJpgc=; b=jaxtfWZixfyl+vO6L4vNUQNHllSCqJmAxKN6i7nUQRZ7AF3pymbRdfe6YKxdG4TeQ1 4Mh1xSxavJcAhvVgtP0H4rbHsJm+Ze1UMLDw6Y40BPNZE6Zssx4wXRKNDvfAFLE0dU4G jyHhTR5rfhCZrq84y15xBbDUNWUuVUCCLHWaMU4Ev/tHvP8ZlTKBOwQ0n07s5ubHBuMQ L71mADs4eW4MM5L9labgIiluLA01iVrmGtbVU2lGxp7iAtmGXUAuRO7gIB0EJn4FAy/q p0dXb0WFn2tIZDZhKRu6B7YO9q7efpYueDalErVajmEV10itiG5q1+Zn7QB8HZhmilZO zu4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683477; x=1742288277; 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=sFPI1v+4fToZ6wKriqV/HJMz8kpUPqvU5UnLhoYJpgc=; b=S3UUxpOUgKLdYjYZ3zAAQgykB1FIf5e4cO07Dx+mggHta1tLErH93Fz+mg69/il6IF TNL3ViT86i+8+baboLtQ8RQThKAPWGcEhnm+3RgNOMnMJGYjBBvwPeBsB5izCukhz1fx gInnNFl0KreFHIgiHe+01EseAWMRqyVsNfqqpErTRCtj8oXfTr6Sg2Aqn5PV5iK4IXuq hNTbA1LS3XEX68lJRDMUKNbBeHV052KbTYNBeT8caKaRw+/FViIRGeZ/LkSh/aiXQHy/ OWq0Ihp2dfxJJ/uafMFQ8pXHFt2lPsU1j0+/gwlEKjbdoWkuJcsT5bFrtHiH67UmZOZo g9zA== X-Gm-Message-State: AOJu0YzuO11xNROWHlquymMtQjDYT0x2+YHMin7O+fn3ssPWRRp/3ukd K4BULanrDSRW0WYXRYkZ9OvTndarwexzlfXdltauxDfJLkg3AaGCpm+4pSLJC9klSg90JeFJ42b AU+o= X-Gm-Gg: ASbGncu7DCgfGYfCyR1hvDO2OSMGueCjM3uHK9gJb+7HRqpBBtNtJQ0Hiz8lgyDxySJ R2XbOcSXFpvZ2o3xzzfsJaXW1QsMveq1gtKd+DdthsWgH0NEfzMozMnctfXDZIw8ew3PA2DuA3M gbcWDtzcscVt7ZTBM88XUnUdAwUAmrGmLrQlxc0jjHYkF/dgzySBhq8fFXGFxkDKXkkIHM+VQII 2gtsS1JDKer29+ilUKeiJMtWCys0OYwp/mjQDrke2shk8FdNOjU4IDN8ENuGVBi17KmyeSd/Bcq QlvSUKlAtst3ss+urswnPm00IFF+J5sC9f+3oujBnOTlmtOrskjrlKh12n2xlEGGvYoi1ZCEtH4 ryRXoIkPXn8/YLRWGS/c= X-Google-Smtp-Source: AGHT+IEjYTa2lj1pCEeGQtjX2D/3h3v7NMoL9ZSg7hb8pZcZ1SMqtLbTZYJjvkY1KwoLs20F9eF/kQ== X-Received: by 2002:a05:600c:45d1:b0:439:6118:c188 with SMTP id 5b1f17b1804b1-43c5a62a276mr107910565e9.19.1741683477588; Tue, 11 Mar 2025 01:57:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d03e2448bsm9721505e9.1.2025.03.11.01.57.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:57:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 2/8] hw/vfio/spapr: Do not include Date: Tue, 11 Mar 2025 09:57:37 +0100 Message-ID: <20250311085743.21724-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org is already included by "system/kvm.h" in the next line. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250307180337.14811-3-philmd@linaro.org> --- hw/vfio/spapr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 237f96dd3fa..1a5d1611f2c 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -11,9 +11,6 @@ #include "qemu/osdep.h" #include #include -#ifdef CONFIG_KVM -#include -#endif #include "system/kvm.h" #include "system/hostmem.h" #include "exec/address-spaces.h" From patchwork Tue Mar 11 08:57:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011294 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 73B84C28B30 for ; Tue, 11 Mar 2025 08:58:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRB-00060a-2L; Tue, 11 Mar 2025 04:58: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 1trvR8-0005zp-O3 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:06 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvR7-0001Ic-1b for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:06 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso24581635e9.2 for ; Tue, 11 Mar 2025 01:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683483; x=1742288283; darn=nongnu.org; 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=0vxZRHayu1xEJ1WB6kICe41Fz92U83djkt7AFBjTU44=; b=pYvX8vVeTzh7oDUXuE9lFzYwBagCcrvKmMM/gbapeP3F06xUcOdkeoKDckbIWsiFgx 5UySapbPXOD3UmCzklohRGr77mMPdobL+ctzYAxmhrGhgz3Pbk4r3zceQ+qNTDtpTWso c6dk0Lv1W2EBBrbQ6m5moD+jSLVjAEvex7tODdYJh0Qd6CyQJJ4UfrTDVFedwQl4eaxM xAF3PWusueBXDFFjaKo4fUgKNd2ZQ23QEuGRB+wvvAIHmTJ/fjXj9yUe/1Q0QfVXXWgX /WHxw7Mv7v8j3Q1rhNqvkUNJGk+xeNJT5Ts9s2xSZY7+5UTUGWCNUHzsOZQydJDfmw2A Cx0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683483; x=1742288283; 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=0vxZRHayu1xEJ1WB6kICe41Fz92U83djkt7AFBjTU44=; b=agzTe08bUcrbHtj7jcXI9Xc6xlVaQg7vXcnTC7sIf6c0jYJTQ47nxyNoXwM65+9iBG WoVKaekPE2NVGDLRvF9Er5pwhxXcPfGNpTd3ltNhEAyBLPDSSeWcgUnqxRvvTTMPqyae wqbnVZDkGtMQyznwcujeEtGoYW1EUUr8X1sU5ukJX8aTJNftQC6wVA6GwMSFyMlhFVGX aO2vVJA0T/lBqjVSLzmx6D6nZgNVkkrkayJL4FV5QUULwgLF9NoKhP11jJawNjS8p6No VqzMF+jlRgqIFgsHRj/7KLWxotGGlmv45cmlH+Uvb/1SeFlnTvodYtvp9yrLRawNea4W A1DQ== X-Gm-Message-State: AOJu0YyQ+l4rCAVWFpAmvGL+2HbVqYWURbOwO70Z0u61CAh9jZAK7nQD wTH1AaUQlPMoT8ItVfO+rTlwx3701cPsJXTUCl6uq93XVZW4+V9cjOA41InyNDhHI2cJuUUqKsg mWZA= X-Gm-Gg: ASbGncvu6vi9OsPehwfEQLhsmbmoQFUiiaeG9rXCQq0L5dvbLRDAmxH5cYDaP26m3gm mcdAW2APQEBqPjkL0464K4J1TxXss4pswYg25BisFBnvM4Fqhe5xCwQjULgNmN7Q/iIUCc99sz9 tinwS0e8xaP6UYhT+liJqCsiq8OgDfuJB0dKlDlcTbO60fVMmi3BYDUu99GgrxORe0rh2D6ySqU C2R1gkSkIkB7UMuE+3SlPnShiSYPo62gTDYMmWhvsakmiCSQj7mtFTHOJqeNtZbne8uo+Txv27j 4UBVvFW/sQjbUVT3OiXlGHLbDFiAqpPnaTYMUZuelCrOL/Yzvx3zeOFN0KoN+91ayJCJLxliaIB 68maQRNu127yQpBLYeZMZYiSkEX8vVQ== X-Google-Smtp-Source: AGHT+IHV2MgBhJ6/1RulXXBlp13Jn3jYWbOwrtuXF6UMbt91IIB9XmCaKcfMow4BiFesWdhVWXWeYw== X-Received: by 2002:a05:600c:548f:b0:43c:f87c:24ce with SMTP id 5b1f17b1804b1-43cf87c265bmr69463795e9.21.1741683482741; Tue, 11 Mar 2025 01:58:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cf85f2359sm63439755e9.27.2025.03.11.01.58.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 3/8] hw/vfio/common: Include missing 'system/tcg.h' header Date: Tue, 11 Mar 2025 09:57:38 +0100 Message-ID: <20250311085743.21724-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Always include necessary headers explicitly, to avoid when refactoring unrelated ones: hw/vfio/common.c:1176:45: error: implicit declaration of function ‘tcg_enabled’; 1176 | tcg_enabled() ? DIRTY_CLIENTS_ALL : | ^~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250307180337.14811-2-philmd@linaro.org> --- hw/vfio/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 7a4010ef4ee..b1596b6bf64 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -42,6 +42,7 @@ #include "migration/misc.h" #include "migration/blocker.h" #include "migration/qemu-file.h" +#include "system/tcg.h" #include "system/tpm.h" VFIODeviceList vfio_device_list = From patchwork Tue Mar 11 08:57:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011299 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 286DCC282EC for ; Tue, 11 Mar 2025 09:00:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRL-00063C-1h; Tue, 11 Mar 2025 04:58:19 -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 1trvRJ-00062j-5b for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:17 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvRD-0001JO-55 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:16 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43d0782d787so523775e9.0 for ; Tue, 11 Mar 2025 01:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683488; x=1742288288; darn=nongnu.org; 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=RO6o24MdYTf0l9VfM6m/i5E+H6tG45gEAmSPdGl9VsM=; b=DvqPVPgCwTJ13qtCOJZDoGycaWGgV2im3HUbYCfOaeDg4PtsO6q0rKAbPxevrvH10I lMQdYDY/zpWLXHxlxCvCkZ+GnkJtDfcuOQAcT2IE4A+mHuaLrNQ5OpUUOTFjP8mO4RMO hMxls/Vh5pLu08W8rxZYMOFVOfL7J7PcQ2YZL+fc4MbTElvnaHnt0y8SlgoOAHX63/WO row77ykGG+IUMNYjsQeNMvsmYnwah7nmZeI0ZeunaGtM/ic2USBX2WJF+Ao8+zvx8b7r AkuuzAJvLkfnDQmUq7jl37PmT0A+2D/bD0zJ1oxMvdVoBn2FCZBAfoVWuxsQTofcpAcx juHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683488; x=1742288288; 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=RO6o24MdYTf0l9VfM6m/i5E+H6tG45gEAmSPdGl9VsM=; b=hBQ0BXakJ7DGcUOT74DXlWJT8StEKUamGQuNsj16FaUE56WvQEqPUWPz4CxbMD2LSl EhZdKx6Uk+stZNTs8cf2aT9ptC6Jz/4lSbQDkjnSJzWnMrSTunu1UC0zYDKqVASxvCi8 mMKR6ptv9W2yatzW+vqUJyAXEC9vMq0DUekgpB92Y9my+4xd0+0bZs/NReypKmCrIMe4 XoyYL/JVhuQ5xejUAClhpB6xI1nIapiPWq0BOiGbfd4oFyo/7jxuOjWep+KgWqQUkY62 2BkAJ1+OGmBgclJYOQHu0GhH8Py/EWXEWh+C27L+msnn0VElLpaQH8PrIptt92yeNBbj Goyg== X-Gm-Message-State: AOJu0YyEJGFOtEEgJXjfgAnp0C4ClOPXXcTC3Y0d+v2oqcGWEMDPddw4 UbrQ8MauwPGr8yY7kCkkOfYNRZiMUd4KNLhU42Q30zPxCI56ILRFHiNVxpcxbqW6i345EMH1iJ9 hQ3M= X-Gm-Gg: ASbGnctL2B00KFEOKIXIxrWTOTofkur7LIHqawMeJW6mCQLx2tbqNEZD81xKUw+gLfJ 1/SJEfFnBelWAX48T5IkViy6Ok3e1WEJgXfrTc/Zw5E8eHCaKtyQYTaWkQEJ3ZsD4yRJR+r2Otw +9c0AsLWJdT+7A4Duql2dBTct5MOrEy2y26aVoiwoCjf/KGD0biwcCbqkiePYIAFWMtDmjSreR+ IaC1cfBtQV1A01VbzbvnyfZB8um95prvDzmyR20Mi+kapmDDiPkjd9/G4ffDFaL+wp0Sf6tJ4D5 dKvz+y6069yf1c1CYKwKXzDOCpb7tph6jXd8Z9JTWhPlObTcrXLxKh8Md3DSeJ81fRXiA2FHkun WGTrn6UHxUECBVnWHSeg= X-Google-Smtp-Source: AGHT+IHpZNtoo8t9N/bmVEmZsIKA82WhMWzx7hQxhBpoE0NJV+NOQTRIK11Mq+x/kiLk2lAUozBPuQ== X-Received: by 2002:a05:6000:144d:b0:391:139f:61af with SMTP id ffacd0b85a97d-39132d8c768mr11324550f8f.32.1741683488031; Tue, 11 Mar 2025 01:58:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e2f44sm17278164f8f.76.2025.03.11.01.58.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu Subject: [PATCH-for-10.0 v3 4/8] hw/vfio/common: Get target page size using runtime helpers Date: Tue, 11 Mar 2025 09:57:39 +0100 Message-ID: <20250311085743.21724-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Prefer runtime helpers to get target page size. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20250305153929.43687-3-philmd@linaro.org> --- hw/vfio/common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index b1596b6bf64..1a0d9290f88 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -30,6 +30,7 @@ #include "exec/address-spaces.h" #include "exec/memory.h" #include "exec/ram_addr.h" +#include "exec/target_page.h" #include "hw/hw.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" @@ -393,13 +394,14 @@ static void vfio_register_ram_discard_listener(VFIOContainerBase *bcontainer, MemoryRegionSection *section) { RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr); + int target_page_size = qemu_target_page_size(); VFIORamDiscardListener *vrdl; /* Ignore some corner cases not relevant in practice. */ - g_assert(QEMU_IS_ALIGNED(section->offset_within_region, TARGET_PAGE_SIZE)); + g_assert(QEMU_IS_ALIGNED(section->offset_within_region, target_page_size)); g_assert(QEMU_IS_ALIGNED(section->offset_within_address_space, - TARGET_PAGE_SIZE)); - g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), TARGET_PAGE_SIZE)); + target_page_size)); + g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), target_page_size)); vrdl = g_new0(VFIORamDiscardListener, 1); vrdl->bcontainer = bcontainer; From patchwork Tue Mar 11 08:57:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011300 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 31EA6C28B30 for ; Tue, 11 Mar 2025 09:00:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRP-00064W-86; Tue, 11 Mar 2025 04:58: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 1trvRN-000646-4z for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvRH-0001KO-Cn for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso55879265e9.1 for ; Tue, 11 Mar 2025 01:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683493; x=1742288293; darn=nongnu.org; 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=W2kPh6kRYOMM0IF4sCb63AP8GV3ulvLKBS+FKR63ZmY=; b=UnR0vt+rIS4hhNj0YtlF5L0F7PH2HM1hJF9l+5rjXa0x5tSxphZFWOnLNPiLZF0LpD Gde9e8JqSGC/VMkYkSB4UiLEJTbtHZJAjQmi9PxncFOU61BCxxnB/panCrIKlDjV6E5U 7AVhAofeliIqSXnnPeEZS2+5OH/DAx4BrgeyLF4Tyr5zX+WjBz62W/x/+Y3JCDZDQZRf IvF6tJg0q/d5DMcq8B8pur6dD1jUkI354SdNn4JEn27Ywjf6BdSBljl8/D8orYSAOxEj d/UAjJS0nhksgrgK7J4u1ESlaxTQZRmt3/uywZVaYQ3dyq94/iVLUajfWX7qggBJ2ZGY DtnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683493; x=1742288293; 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=W2kPh6kRYOMM0IF4sCb63AP8GV3ulvLKBS+FKR63ZmY=; b=eI0ukZLlKBAnpir3MqkJNCSHBDN/mjiet63/MFTnvkUUELMqsoSqdrLlEcTFVr97Bf xVv/Q7b+uv4k4u5EIe7gT97CtFEg4uHVjEkZkIiVfb0UAevLiurO5n3fxtSbC+GTQXav xNgRZ++zB9/ePnVRtnjPFNiKQsJ4SDCbnDLS5mtQgn+wEhxqWFCXNa7l+iutu4YEDnkM 5qdTh65QDyFuuOuowzLmSvfm5N46gLalPBAGij1FBIpHirGRTjFs/jYDeHsPj7g7BKHs 9eQR0stBYo5I2+vmr13YzswYDpLp8I+qP6kO/70QwASubVZZNuZkCofnFCS+U56zixuv osnw== X-Gm-Message-State: AOJu0YwJJnvKEOEhBJ45djbmOvhULFBEtoXoskzm8jndAN2IrkRRYHEL MSS9WYmilV2qm8Zusl+8E8CNqtjis2wA9BDsVB6G5Uj7Js9kW+w3dWdpKGaznPNRHOMjD6ZVKOw nQGo= X-Gm-Gg: ASbGnctKZUgxKuDOzPNtfQJWYpOHvgYCOYsrJXx6V9UYoWk3rQFi0MkRqBRQL/HjL/H bLe3O5oyRk6dryBW67YW4Sqj4gcVnKMCOGUl6BOEduX9Xx4smuxoEvu3Lgdj/KqmNOlAoUpGbHI 7cUeW4kiteV35PNcbqnAlbaX0pnGLjaEVSryEeKKet7ZWrGDOt8aPwE96B9/lERpQ7FaaIsxAK4 p/uKp0uLf2xLV2BV+5fnrYdA8ZNxAdDXdgGkuDNALNZsGNbakFu45xqy19bGzP1idYIKKF8Ayr+ PRbS4UdI0BFQDAXx7OA9EP/xNVW0xY/7RWdaVLyhOWLXip0vLf3rhfEdeKOIe8Qw8Mw5+tyYLEf nwz+XwcikFGyPcIktdaM= X-Google-Smtp-Source: AGHT+IGc/RVMvYXiBKViCoX/7zU7bIYN8JsUf+dtEpfbhQlY+2IRsvf2+MB/6cVrndyBfysS6+bztQ== X-Received: by 2002:a05:600c:548f:b0:43c:f87c:24ce with SMTP id 5b1f17b1804b1-43cf87c265bmr69469515e9.21.1741683493187; Tue, 11 Mar 2025 01:58:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cf7b88494sm65959105e9.0.2025.03.11.01.58.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 5/8] hw/vfio: Compile some common objects once Date: Tue, 11 Mar 2025 09:57:40 +0100 Message-ID: <20250311085743.21724-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Some files don't rely on any target-specific knowledge and can be compiled once: - helpers.c - container-base.c - migration.c (removing unnecessary "exec/ram_addr.h") - migration-multifd.c - cpr.c Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250308230917.18907-4-philmd@linaro.org> --- hw/vfio/migration.c | 1 - hw/vfio/meson.build | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 416643ddd69..fbff46cfc35 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-vfio.h" #include "exec/ramlist.h" -#include "exec/ram_addr.h" #include "pci.h" #include "trace.h" #include "hw/hw.h" diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 260d65febd6..8e376cfcbf8 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -1,12 +1,7 @@ vfio_ss = ss.source_set() vfio_ss.add(files( - 'helpers.c', 'common.c', - 'container-base.c', 'container.c', - 'migration.c', - 'migration-multifd.c', - 'cpr.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( @@ -25,3 +20,11 @@ vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) + +system_ss.add(when: 'CONFIG_VFIO', if_true: files( + 'helpers.c', + 'container-base.c', + 'migration.c', + 'migration-multifd.c', + 'cpr.c', +)) From patchwork Tue Mar 11 08:57:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011298 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 3AF7CC28B2E for ; Tue, 11 Mar 2025 09:00:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRT-00069y-Ky; Tue, 11 Mar 2025 04:58: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 1trvRR-00065p-Dt for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:25 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvRN-0001LS-6N for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:25 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3914aba1ce4so1341032f8f.2 for ; Tue, 11 Mar 2025 01:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683498; x=1742288298; darn=nongnu.org; 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=kZ8adRosDdix3VcOBPGB20W/hMkmp68cBdi+zCji6U4=; b=dKgPqLCwwga/7Ov0+A6X6dXcDR17wEKK0DGDadXKQt+f9Awc7ZSauVjCJxA//ORWfn Y4LyFXb6DY3s/mRN7CZjHjFB5Pe5KcOpmSXQ2Sdpc+0sU8Qn3ylyu0mr1AlkAmGI256i 0C0diAyen8D4bzCv83K2j5uMLVUmfOQ2izu4XCUYQfO1Jh7xedCYxKGR8I7O6rkF+1It /GlRAw1zLpnYv1RzrajoT7vGbIbaJJdZnDp2SngLtBjXvU9XdMUhgQM2oADM1O7SR49w MB4mHqtNMqXdCzUwinggN5plmpZJQRaY3DcRIsu1nQu1i+jg4aarx+jIwIDKb79ygpYZ eB9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683499; x=1742288299; 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=kZ8adRosDdix3VcOBPGB20W/hMkmp68cBdi+zCji6U4=; b=OABFu4awHCagNgCtSIHa1lzV/LCq8h+4cOWr8GPsCSrYyErbrwIfYRgdkdZ3DTGEEc 0ISM44NxLj4Tsk3x4Pn7FqotikyN9UYUdx3oHHAoxwDxvoPB5B0yY8d8GBytNySIJZ7a Bd3MnsWbXrZ1Jl0PmEfIQS3S6t+75QYIsoM0qEJx5ASmUd6S59xvInvR5UCykz4B0D4b IPlDvNbnA9M+FrkUxuwyFegSgkjHcD8WO9aiCcqTvpQICUsI1b/I6ggieTE5MSxqdoLn K+M5c+v4GhGWpLHAbTPS5vKVfN+SN0tCp1wtEHc+W6WUg80jnmsNdg8BPZlHb/v5tF5H QCLg== X-Gm-Message-State: AOJu0YyhX6ObmuP1yZfWiZP91E/j9bQuzKfosHq8jnlbxTCCsCYMh/Ax eIldWxejg80diKyPApcMXcbMn57PZS7xHKlz7D5WOLw4oru/39+vADWYGo+PQbIYgb8VsjA4E+M gVhQ= X-Gm-Gg: ASbGnctUQpwByGhW6Bg7pDRh4BSbxWdLSNMLKWkavgVLsSd0jyBN3QHkr/QB6VNstDu jG0JDwtLNRq3IjRkJ+oIknkdcsMsiwi78Q8lBnQbAk3dmlBtTNVEIQQgLGPJ9wLOhHT2uibpTAy Hetnq6pOHOnU6YRgPU77i1FQbsltr8WTqXUfb8sDnuFcSJ8p7CNkQ7P650RChjRRnjf7sdIsVp6 JVp0c8iQ/2TBt82NfrHvdg7hMHIJgrl9Eis4FAxvfTax37bE7hmhvnNxRcPkAcxg7i3aR3QS04O oXmZ+fs9qaLjtGl7sjKm6++dlNaICbeAtCyRkVRCD8ocSzbihrq70zVm2PAMvDixCmjNFDUfkfU BCOODkiWn2q8lfnaO1MQ= X-Google-Smtp-Source: AGHT+IEJ1eivaeWrcmtxK0p+xX1SCCCFUJhl1MmKRak+t4kFuxpghmb+PGetm1V6SK2rBa/vnU+uzQ== X-Received: by 2002:a05:6000:1867:b0:390:f987:26a1 with SMTP id ffacd0b85a97d-39132d885bcmr10640726f8f.29.1741683498453; Tue, 11 Mar 2025 01:58:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e2b6asm17720469f8f.66.2025.03.11.01.58.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 6/8] hw/vfio: Compile more objects once Date: Tue, 11 Mar 2025 09:57:41 +0100 Message-ID: <20250311085743.21724-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org These files depend on the VFIO symbol in their Kconfig definition. They don't rely on target specific definitions, move them to system_ss[] to build them once. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250308230917.18907-5-philmd@linaro.org> --- hw/vfio/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 8e376cfcbf8..784eae4b559 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -14,13 +14,13 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( )) vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) -vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) -vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) +system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) +system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'helpers.c', 'container-base.c', From patchwork Tue Mar 11 08:57:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011296 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 B3A5AC28B2E for ; Tue, 11 Mar 2025 08:59:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRa-0006O1-1q; Tue, 11 Mar 2025 04:58:34 -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 1trvRX-0006HG-71 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:31 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvRT-0001MY-KH for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:30 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf848528aso16262535e9.2 for ; Tue, 11 Mar 2025 01:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683505; x=1742288305; darn=nongnu.org; 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=3wzRgEsGaXRZwRoJYmbO3pLRuFrdPRdwQX8ON5xd3gU=; b=fp9oY7GjGVoKymyCtJUeK/geZIrq2SgOq1F1jY/QTX6TYm8ICdw1bnCJS186mw8dVc VGu5y0tQJGtxEIDRfERN7PnUSUY2KefZbEpKEj8g/MsCRRWtn5hpK7qveHiNvmLBcbZ9 g+tOlVjzDDhM3T+qhp1th6jI7XvcfcABdXN8ZeUzRZ8lOGEwPaz+4xCmg8njbP79CniM DkrOY5stEOi/cQwAQU5iFY8I7gLTZZP8pdMJ9zTkOIrPacdyOHpjWVCYhoZQX7DDID1P hOe8Fu3OPlp2IUEMkMDVPmXEgg12qYArkWuXcYSbNQy4CqtobNNpr1QhYuctdoOPht65 RYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683505; x=1742288305; 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=3wzRgEsGaXRZwRoJYmbO3pLRuFrdPRdwQX8ON5xd3gU=; b=EDYH0LPto44J1ifHBd+mQKizUaQqtoF14R+zYow3YO0s0QLhBmXqsf5DQIdBroQZIO qBs+l3Jt4s4tftbZPOzPlmRrq6ja3ogSe9T00HNmKk7StHWwutdIfeJGuA2R5C0q/OJM wnip0CUz9rosJ9bgzUigkqdVFifWjjR7MxTERCcskCRcwlzkyRO/cc4IYRT4ceccG8PQ LTuN7YqGZqhy9Qjc/T8epcm1lwC0Sw9L8AtYe019AF3Es8kfXvA1bJJNmIU6anEPhQDy aoPHQUI20iU34CZY4F2loWYPUdras3GAx8BUEohVDUQPdQzqPUUOiI8GzzpI33EEgPW3 yOpQ== X-Gm-Message-State: AOJu0YyHNhHT+BiBG0hg7OM4O69Fm+FTG3wzZ5WuRF07rAe2Wm6whwrc O0x2Xm4IzmNLV8P6Xngm0VnfNysNfnMjBDVC0aAyPtehwvP7uYDamB1Of1qStasM7YOFe+Kh+p2 t91A= X-Gm-Gg: ASbGncvU/Eaq618vnHPnGTsKgl9jsMRK4N1lksokABou2yaL1v2XF6RwaX/AFFM91bz PhsXIHMBpPLjxct9GBncij+bunQq1fNetuuAr+Hb6HNViorjQzoI0yiWborFAYmMtiW680zuWnk Dp+hdMltRs7ra0ws4XV2E9zGHdqnvlhYUu+xVZxmqUdfQ/ygTUDig7JO+NPqqmLcyD8Kw54bwGU JjS4ySNdcFZ1g6odRm6XSkNx3i7/xqvKwVKes2RtpaYsLeDjotwpGTnEDImSr4NcdZJ0KeKYEd4 ebM+NxHw+K8YIV9XsNaVq0Ww9sOd5w1FwKA0OwWel1Xcz8brRY9UpAoXYbai7Ypkf73zhIBKQ6X toq/k9zCyxJWLin0DEUs= X-Google-Smtp-Source: AGHT+IEEEnVJarcGGjUK/21VA5TSdLNOgqq7tbfGncK0sjNzc+6qaDn022tJvzSrCZfe2Fv7eBB66Q== X-Received: by 2002:a05:6000:1885:b0:390:fbdd:994d with SMTP id ffacd0b85a97d-39264694d6bmr3391332f8f.27.1741683505006; Tue, 11 Mar 2025 01:58:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d03dfeef6sm16463615e9.8.2025.03.11.01.58.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 7/8] hw/vfio: Compile iommufd.c once Date: Tue, 11 Mar 2025 09:57:42 +0100 Message-ID: <20250311085743.21724-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Removing unused "exec/ram_addr.h" header allow to compile iommufd.c once for all targets. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250308230917.18907-6-philmd@linaro.org> --- hw/vfio/iommufd.c | 1 - hw/vfio/meson.build | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index df61edffc08..42c8412bbf5 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -25,7 +25,6 @@ #include "qemu/cutils.h" #include "qemu/chardev_open.h" #include "pci.h" -#include "exec/ram_addr.h" static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 784eae4b559..5c9ec7e8971 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,9 +4,6 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( - 'iommufd.c', -)) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', 'pci-quirks.c', @@ -28,3 +25,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'migration-multifd.c', 'cpr.c', )) +system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( + 'iommufd.c', +)) From patchwork Tue Mar 11 08:57:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 14011301 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 B4D81C282EC for ; Tue, 11 Mar 2025 09:01:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trvRc-0006QE-SQ; Tue, 11 Mar 2025 04:58:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trvRb-0006P9-Mg for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:35 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trvRZ-0001Op-R7 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 04:58:35 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-390cf7458f5so4957369f8f.2 for ; Tue, 11 Mar 2025 01:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741683510; x=1742288310; darn=nongnu.org; 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=B+0tgWwdAwpz0uxyNFPOcrNzWIVmRxeEfT3p7qnmkcg=; b=zRWeWS3lWjBanQE2IsedAoljfOQOZ+3rxDQGGxgEnXjEEzYanTW2iv8My8HJ5CAVOs LW8tTaLnnDbgcsooAfLMZhn1Cu9t05usEQn51IpwUzslzGOli47unujWNvF0oGRf2H89 44aaM7gqKJuXbaxvDg7q0KZavkGbVnkeYhGoOPx7uiNr8WvtdMXaCioNDHvanqhKraoP 24tcOXELNoV/oJUg4mj1pA7gAvUin+CRSN27k6jQuPLaNzRxK0evg1B+bPn3yRBooH3f NtkG8lpZD7QmqcBn0YS99I04Lyl6kRKGEqwRFtan8hS+Aaspv9rrJISW/LkuhfAsMpuj 8Wrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741683510; x=1742288310; 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=B+0tgWwdAwpz0uxyNFPOcrNzWIVmRxeEfT3p7qnmkcg=; b=EyVDKcldGQwwyvbEdq5e4P8ql3M0fKVx7nkYkIv0+soydfFep4Zj16j0V3/NuMkxi+ s4knyXzESHbARtSv0QgDwZIAtocVHUnyxar2Tu7HzNI+LC5CjsI4+bhoY/LOJ4/QsXY5 sCXP9JgEpkfvFkCG047VV4kPOZfT3Dsj7FEGrbuRSoQ5cg0SU8LqnYCnDYvV+n3VOq1R 95YfKg8+ops0nntltlswf6QE80Pd2nXhWXYjttCSQUKPKqscmOY0en8MKzQGZ+QTyGBL g075GkveksKNZKvhoYW/yTKnFzMjbEY8AuQzkbhxUkgdzgLG50aZyGVccUBbB2ckczjD yr6A== X-Gm-Message-State: AOJu0YzkJTG3NCwlFLwnMnon056RIDSLyQ6t+r6Kasm8cSYqWXiWvedf HFgtrDt0qmzxkcTpKgR41x8lsGenyZa4MN8IVCQO6eWanhuzSalqR3oE1qO88m4I2lDcYRHdP7r DbCs= X-Gm-Gg: ASbGncvCX4XbmWSFuFH+QX4TWAYzH0Hhm85cSZ3oWf5J6AYL66Q964Npeoc/JURuqz8 AynV32tYseqQAUo+riwp9p3FeXrgvB9On5BAhEaN3tIzPDJ0RMOcCrxFgNvNueELbXbP6JXecSR PeYyqnJlcwu187Kfs67e3couU6CtdSpOMLazwV8b7Rtgo8L9WWqOSLEDajuUZuuazwBcYuKCAta CynHhCRTr/mSRDah+7MOKt3CQg9N80KpHrMgPCS29hQSaFsmlOyobe0WS4ZV30Zv3koQUgOa66k pRyHWyoXO81RhMmUcUFLNFXy6b8pZU6joC6ZB/Syw1PPQFvI06iRxO1pPeMuKh1kik3PaDN3qVJ oT9B9QvOsgUWQYI/05to= X-Google-Smtp-Source: AGHT+IHuSDEaxcBmf9TO7/C/9aB2uMVBGBgLIqy9boTJ+UKFbP0qpjTO4XzkR0qV4QuL9bqX0iTqkg== X-Received: by 2002:a05:6000:1849:b0:391:158f:3d59 with SMTP id ffacd0b85a97d-39132d21141mr16525066f8f.15.1741683510140; Tue, 11 Mar 2025 01:58:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d025869e7sm21985815e9.7.2025.03.11.01.58.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Mar 2025 01:58:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-ppc@nongnu.org, Paolo Bonzini , Harsh Prateek Bora , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org, Ilya Leoshkevich , Igor Mammedov , Richard Henderson , Nicholas Piggin , Alex Williamson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman , Peter Xu , Pierrick Bouvier , Eric Auger Subject: [PATCH-for-10.0 v3 8/8] hw/vfio: Compile display.c once Date: Tue, 11 Mar 2025 09:57:43 +0100 Message-ID: <20250311085743.21724-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311085743.21724-1-philmd@linaro.org> References: <20250311085743.21724-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org display.c doesn't rely on target specific definitions, move it to system_ss[] to build it once. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Reviewed-by: Eric Auger Message-Id: <20250308230917.18907-8-philmd@linaro.org> --- hw/vfio/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 5c9ec7e8971..a8939c83865 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -5,7 +5,6 @@ vfio_ss.add(files( )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( - 'display.c', 'pci-quirks.c', 'pci.c', )) @@ -28,3 +27,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( 'iommufd.c', )) +system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( + 'display.c', +))