From patchwork Tue Mar 11 18:13:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872471 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1621166wri; Tue, 11 Mar 2025 11:16:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMFxKdimWM76xnziv27g3+szjLR0mOW4wrP9/peVhnl9DTuS7ERVkRrv1h3zuSu0lfWgViOA==@linaro.org X-Google-Smtp-Source: AGHT+IGfT/2Jd3h7a/qh4Z3Th7jpEczcQMXpiT671WloaZCzBwFtqQfksXVob74Qx3rXPQ1uKl1W X-Received: by 2002:a05:6214:b69:b0:6e4:442c:2888 with SMTP id 6a1803df08f44-6e9006cb8e2mr265389916d6.39.1741716984438; Tue, 11 Mar 2025 11:16:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741716984; cv=none; d=google.com; s=arc-20240605; b=SxJEq2oeQwY29lIPYE/yMDgdaCN9Ie52BEs0rfO6PtfcTgTmpM1W2zBUYOp+dXYURW tSyG1082O4Hdl2PjLy6b08beG4RNv9xcAYMDcSBCyGbMYoeXP3fOhUrgVz4ivR06Wztp fii6G7iz+0PMFl1jLYYEa0/dtf8PevFZh0Hqn7WdcUuOwSZUAItucoG20wEJ/CXI1YT6 kvXyxhkUVHky8lRsC+BP/0a/Xvm5fpDb2N08opJluLLOPja0m94B//fU4pDwqudiss5a WTI4BP0wyYdX+0M4wNx+xwr36HdHS2KoY7PZxvDV8Tbp2bydHteDny00Z1uQFyp1MAMq 7W/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oz80cud8d/O9AxwXlwq1eflo4nCDY3v+ve3Qqy7+aDg=; fh=yi8kGIP/rvcvyacyF2Icv2aEXFV+uctiBPj16iGoon8=; b=XBOPfJKNXqymuo2qBycjnJ7Hhqu8Pm226BOCIopWD6wG7AwPYKA0WcmcdFHrcejVTe whDD4x+xFzJ/uDu/JL2bsoH5B+IrHfhpPm646YZCl7nsi3jsCmrLYKvYH5e91NUO1bq0 43OmgeZgJa8kF13ubK0tWDMKEzFHmBfu/rnY7qyMeBgs2KaGLp/u57RJ/UuX9WOeyl2x HPhZGbeaHkqI3YBiB8iEQeMB9Z45cRcFkv1DsCXuiv23wxCkAKtqlMAu4I4o2zpYKMCl 7ZJMBa8gNJ9j1pXq+J+0HHXkJiTn1NAZOIBAP7nkljMOE0JX4cPh//nHXN+wczUu7OYo EAzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A3KpYqUW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8f7173b7esi117845636d6.275.2025.03.11.11.16.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:16:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A3KpYqUW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts48D-0008Dp-Pe; Tue, 11 Mar 2025 14:15:11 -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 1ts47P-000762-MQ for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ts47L-0006je-Tk for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716846; 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=oz80cud8d/O9AxwXlwq1eflo4nCDY3v+ve3Qqy7+aDg=; b=A3KpYqUWuSodXYQQx5vtELAuG9iqFhxG0P2L1N9SMjGmGpzKE8kYFYTaiZo8jwgV+7Znfo dQXnUEnZ1QwfhGCQaL+S4WFbG9g9Ok7e7KRhN5KMc682wg2xp3N7Gt9PV4Xz+isQZG7pri AFs/wMrQwy5mM/pLGh1QuujkzDAJfkY= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-TzCahFhnMH-5SIHMyPQ3Pw-1; Tue, 11 Mar 2025 14:14:05 -0400 X-MC-Unique: TzCahFhnMH-5SIHMyPQ3Pw-1 X-Mimecast-MFC-AGG-ID: TzCahFhnMH-5SIHMyPQ3Pw_1741716844 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 62B6519560B2; Tue, 11 Mar 2025 18:14:04 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A109418001E9; Tue, 11 Mar 2025 18:14:01 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Eric Auger , David Hildenbrand , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 12/21] system: Declare qemu_[min/max]rampagesize() in 'system/hostmem.h' Date: Tue, 11 Mar 2025 19:13:19 +0100 Message-ID: <20250311181328.1200431-13-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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 Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-2-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 3d8df4edf15cd916d477250444ac6833c76f0286..e4c28fbec9b470f0f64eb07ad5fcba6b43a5fcc4 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 5c21ca55c0176af7356905e1b04358c52fc8a5f8..62642e602ca97dffa4baec29f9b73ccf56c29700 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 904bff87ce125cd0d69560f2b2ec54ed0a5e94e9..9e53d0c1fd1cccf366f7306a83f8859e22f39da3 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 a9b3db19f63d5b50a87ed751d856294f2c0c17d5..75b32182eb01991fdc63fa1d38c838d5dc95d82b 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 ad4c499eafea27906a028d0674944fbe63e3f03a..237f96dd3fa2b7e1c859471fee014d5a3d31f1f0 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 18:13:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872473 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1622351wri; Tue, 11 Mar 2025 11:19:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJsBak2rOalVgCl/ceRvhUraDBGiplH+PMTszQkm7MfCIXy52qS5espvkxq6MglvyiasHXZw==@linaro.org X-Google-Smtp-Source: AGHT+IF99d8ln3IEh29f/W2gGzjQGzzvku8oEaZ+JhoWH8jWdCwn63sG4uHe7bJ9c/aYGC9A+iNg X-Received: by 2002:a05:6102:440c:b0:4bb:db41:3b6c with SMTP id ada2fe7eead31-4c30a5ea1b3mr12095833137.12.1741717145475; Tue, 11 Mar 2025 11:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717145; cv=none; d=google.com; s=arc-20240605; b=T3n+EJ1J4CxhjmWJSFWm1IHB+WF44ioXQCZbyOqpsqpHyZ6ApSedi/L+xVa8TyQusK vIFIlDw7MkX0S+bEIWWFdHkOAvplICfRo9nSekXDQzomv55jqwmiII6rRHahUNiBDlTh mye1YJ0yINr4NbwBHx69ffLEuJvs14kSmp9ZVq3HM7NrUT5SjZLp1b9owLrxI+LTYul2 rH84AZZZgH8TGbQO2abhEAo9FtcSRM8rthgAwlsFjlDZuhlgVPPBT6ibaHaJDNlWmkLL p/j2JPr69r/pgrT5up+SMeublqtO5M9xv3RxV8otDeFmxNcTLDaqDlz5Q+5mInc6caeV 7TRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JLW/JzYT4BKAoO8+M95oEsnC/AqHVdFJLl6Uo6Wm5DA=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=Gh2k9HQnkLxx3XQtZKG//QqDwuNF5vL3kDtHDwbXrXYaijvnPihZP0BpwOK4dkUGJs 5zcp//r1mFfZT/LY/DQibrb2MKA7wVAGC+c8c1n8+YxqY6m4Sz1pWgMoqQGrm8hD+5Ob bG/RGrjICjterVEqxUhKVocrarIAQmf8bUEwTt8YcZrh8gI+zqAYZHKHIo+sH+k22VQn QyE8nM3ejDjumB3TpXXYY0VGAlLk8M4tS/rJzT441VJhrDpQAAAvMLK/pg5Ijq3q/oiK RWLfF2WNhj3HjVaCubM+Y5ywkfrBoXD5Vy2NrTEM7pN24goxsuJ61M+8qcpzcIVZ2eoH /Vdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jC8bh32A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c2fb4277a5si2945084137.136.2025.03.11.11.19.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:19:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jC8bh32A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts4BK-0002r8-G2; Tue, 11 Mar 2025 14:18: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 1ts47R-000796-4l for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14: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 1ts47M-0006lA-1H for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716853; 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=JLW/JzYT4BKAoO8+M95oEsnC/AqHVdFJLl6Uo6Wm5DA=; b=jC8bh32Ax6frU8DMCsnyRruEQqyww8EK9KSzwe8VY5RQ6l5gJHXOaaFNUwSinv+Ci7C2R5 vwgboI4i8ZlsudKhX3giobQemp8OYRR6oOnpZZ/O7klotOLXSfrT1HtzNAxvpmbNwPKrHy /PuMitF753U+oGoD3un1VOz1dfM+Dm8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-417--6rN72c0PrKZ52X5ugXT4A-1; Tue, 11 Mar 2025 14:14:08 -0400 X-MC-Unique: -6rN72c0PrKZ52X5ugXT4A-1 X-Mimecast-MFC-AGG-ID: -6rN72c0PrKZ52X5ugXT4A_1741716847 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 75E79180AF59; Tue, 11 Mar 2025 18:14:07 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD30A180AF7B; Tue, 11 Mar 2025 18:14:04 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 13/21] hw/vfio/spapr: Do not include Date: Tue, 11 Mar 2025 19:13:20 +0100 Message-ID: <20250311181328.1200431-14-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-3-philmd@linaro.org Signed-off-by: Cédric Le Goater --- hw/vfio/spapr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 237f96dd3fa2b7e1c859471fee014d5a3d31f1f0..1a5d1611f2cdc8fa6254a77b8ec3d1f56d28e3a6 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 18:13:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872475 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1622634wri; Tue, 11 Mar 2025 11:19:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6tgm+X2Pnk7JAmiN3F5RbdzeC/BTiyDPHXdgl6UgWrdaA4s5HiAH4GcQaMOiJjFbuqo1ncQ==@linaro.org X-Google-Smtp-Source: AGHT+IEhn1fZsCb+Ddqe8q0PdxG6NRVF9/4EdiyWQd7odCRh13JV/TN7hPNteb80ENqVj/F1xUo1 X-Received: by 2002:a05:6122:489c:b0:523:e4c6:dddb with SMTP id 71dfb90a1353d-52419478380mr3864556e0c.0.1741717182453; Tue, 11 Mar 2025 11:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717182; cv=none; d=google.com; s=arc-20240605; b=SEA3IENH09DhZZ5gcCH0uUd1+8SBXv2ndpd2jojqRUUeTTAl0yh4VlMUsF+mG7Opev eFR9ukajyNqrazeR50O/DE3tURBzAd2vOXvZG1iACh5Plt9EoRMes5nGhUW33qo+f93v QtZ1X5zHXCYMa/eAbqmL9ZOIHwfheMteBValhgeKXQniXvbFaTR/iWKwVK9UOTk8GcGZ iXMMv/z8Y2mdtg6K5mm00a0RLWOq+d5pyOy+p+3LobO9v5/uqUp2pKmp/1HHmI8Sl2hD aYqoYJMm1Mwaipd8PVac8zj9vcl+Y81+osEoygVnJDQ1ZqtI3/qJE62er5Y4WF/oGFZ7 UVIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H5rfZS1ab2cIdaT1TSzN/mupwEkTEP1TSyKx5VpLfAA=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=LXOlY5gk7HHNjqypDbXWNUVAltYaaO7MdJfi7JUp4Tk9qqud2ckqJGW4kzYZfur01L 3bt7s4IRgp9uVtBEQs0NjD1C3Y6hpWhHkjCeoPVI+zJQRuDVy6Qc5yvRNpwYkwCQ8pze iKExQ3CQiPPBEZkkXweNo8GqwD0b4giBbXhqgWoqysxqIMFZTCo4kTua9aqBqtvR94/m 9EZDrefkJaKQ7lRDXGsWi0YGl0EjZfYigDKWoLJKPonqIw+hjDP7mL6YrcpKVRuQtD/B 2C91EvrrV1n9aNmbIHYW5nESzO99QXWJha7xNxFpx25BkqlyXFunOjF4UQZ8qe7bn1SV rRTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NInL9ny6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-86d33bc1db2si2523645241.3.2025.03.11.11.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NInL9ny6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts49x-000245-5d; Tue, 11 Mar 2025 14:17: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 1ts47a-0007Bg-Ub for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ts47N-0006lC-PP for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716854; 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=H5rfZS1ab2cIdaT1TSzN/mupwEkTEP1TSyKx5VpLfAA=; b=NInL9ny6NuLn0xVJZSXhXkqJ3INCXCnPL3w/b9Gd01OAJ8pkvUt/K/M7YwvSw6HlbseSc0 C8yqwG0qFG6qVXWRY+nGsO5jeMKGWie4LHBJ84/43eUCGoGy/By0qKYMKKYFNWT9jODa/Y 0zCcXXfmVXZFpNN8hJCJDqxeYnLJ1N4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-HjOOvlf5Nb2KkLDRXM6i9w-1; Tue, 11 Mar 2025 14:14:11 -0400 X-MC-Unique: HjOOvlf5Nb2KkLDRXM6i9w-1 X-Mimecast-MFC-AGG-ID: HjOOvlf5Nb2KkLDRXM6i9w_1741716850 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 564A21956080; Tue, 11 Mar 2025 18:14:10 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F05A818001E9; Tue, 11 Mar 2025 18:14:07 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 14/21] hw/vfio/common: Include missing 'system/tcg.h' header Date: Tue, 11 Mar 2025 19:13:21 +0100 Message-ID: <20250311181328.1200431-15-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-4-philmd@linaro.org Signed-off-by: Cédric Le Goater --- hw/vfio/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 7a4010ef4ee6a10bc1f9f2f8e1b12c60362a575c..b1596b6bf647e9e3c5f4701e61ddd9323d49e880 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 18:13:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872478 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1623677wri; Tue, 11 Mar 2025 11:22:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUn/hI6VAST2PMcT5cHUgqjtzDr62XiL+gvZETqbNykG3IZiw8ddE4MTp7hneIvUop9WDtyZA==@linaro.org X-Google-Smtp-Source: AGHT+IH6PXRMhmMdk90ART3kI89OGbvugp3pzS1gC5QZkoA1gcQQepzvouWVM6WJ2V/53YtM6A8k X-Received: by 2002:a05:620a:2694:b0:7c5:5768:40b9 with SMTP id af79cd13be357-7c557684970mr1218686285a.43.1741717332834; Tue, 11 Mar 2025 11:22:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717332; cv=none; d=google.com; s=arc-20240605; b=I2Z5YZbh+r8nsZKTxvOwC5t0Y2UUjhfnLjwDgXYijWLJrzT8ZdwFnGyHxUfwbCz30B +JmHaJs9giuc394Zr9s6uHhJcJvBW70atQwcZTBRPSjJ+tqOmLQuPW8ZeiSSrsD8XwK5 5P5KHF3X8/Ct0fnNFfeWFHNakJpfJHZYrZYeFkik66b0d7BUSg6yBLFOS9FM2PN2wzkm rjvV0GrpIORLraIAZF3eexzFrm4on2gCLGqVdjDsnbqxaKYYwfIMsXuAQXgIfgwFzmFM h9RH4tzVS9HRo4B21eesDrXQ9DXPnOOxKcVDFGGh95NY5YD0cnD5crtty1Kp1bL6hgzG Y+/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2blT0fOIRRDERj5gAvJJ4yUQWhSw1qZvTN15oad1qL4=; fh=FibLQ5iYckXFTQr09RBzM2NoYa+3dt/pWbhc9sQimOs=; b=G3u88PIU7T/x/aRaMYqJ0flZxNovONnEGD+krV7XljMFZKaYuWOj2NF9AsoKDtiQkg bkY4g36y4Lli8nRNojfGtN7630ZbYFenXGHjqz79Avj4XqicbJLIBtd63AItHeylErFl GAvFCzGe/jBSg+EIHlrcJT40/AgEEDcoxVIzXr8qPsY6CMmGiOY+ih8efqiMKGTKdMIl QIcdvJCEYh04sso3bxImAkWFfy3vr8LwyXoaKH0bm5euCyUbukNs51IbtQFFf33xLAuG BYc59BnIHDw0mkRzHLO37Ea8XKOcOADJ/qLb02ufoH/yKkcfQWw1Y9PHn4IoDc23da+s zqMw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="gR/M1abw"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c556837581si404796785a.221.2025.03.11.11.22.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:22:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="gR/M1abw"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts48A-00081q-No; Tue, 11 Mar 2025 14:15: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 1ts47a-0007Bf-Tn for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ts47U-0006mS-7g for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716858; 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=2blT0fOIRRDERj5gAvJJ4yUQWhSw1qZvTN15oad1qL4=; b=gR/M1abwKRuS4io9tfl68yJuOyzC5STQRMujCUpjHFtCFKNrHQ7zjYVrtRF4NOi70zBKec aXQDM55T/pzWBNU6zePROAUmJHMgQNR5ZwG6qdZbTeFoxHiE8pHwal9NGUIujqxssIqQrs 0eQoxXYBVN7B/eFXv64VfYE0FA/OaAg= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-76MOSba4Pda7-zRkWwazLQ-1; Tue, 11 Mar 2025 14:14:15 -0400 X-MC-Unique: 76MOSba4Pda7-zRkWwazLQ-1 X-Mimecast-MFC-AGG-ID: 76MOSba4Pda7-zRkWwazLQ_1741716852 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B16DB1955D5E; Tue, 11 Mar 2025 18:14:12 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CF92218001F6; Tue, 11 Mar 2025 18:14:10 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= Subject: [PULL 15/21] hw/vfio/common: Get target page size using runtime helpers Date: Tue, 11 Mar 2025 19:13:22 +0100 Message-ID: <20250311181328.1200431-16-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-5-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 b1596b6bf647e9e3c5f4701e61ddd9323d49e880..1a0d9290f88c9774a98f65087a36b86922b21a73 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 18:13:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872476 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1622699wri; Tue, 11 Mar 2025 11:19:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0bqbO1qyOQ3qauz9HN2N0Nr+ay5HaDp40Ut9uKnFh7SYZYqGy6JfFTPfRqI8JjE05bYYO9A==@linaro.org X-Google-Smtp-Source: AGHT+IEyBOqSt+g30BvH6NCyVeO/jyNDJlTEehMY2HqRH1j4IEDkXD5hGS8Nfa6nXE72ATvWj8s8 X-Received: by 2002:a05:6102:f06:b0:4ba:9a20:dcf6 with SMTP id ada2fe7eead31-4c30a5aa5ecmr12275046137.9.1741717189135; Tue, 11 Mar 2025 11:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717189; cv=none; d=google.com; s=arc-20240605; b=G7Tp3xAVL3XChOfHpoW9igAdwmAxZfXkrs0MNsqYbj2Kw7KMjmKtyVZb2BfVrKprxX KPEuYbgnLsaYRKQUPmaofIvnucZ4eK1K5OTqlTs0Ny3J8WnSaMo9D4G7QhRikxoNGuIT Z0C5T8fC1taNGmgoIkKmWpHm/gU3+QZ+p14/d6jmqT7XMt1bOuKqzw63y9mLVG5azXO2 PrM1mALJ8m2fvRQr5dTZv9SpjCya2pEaMlcAHobDVNd47y1SkQjWaOABcyXIX0yKmdXb fDXLdScBmfng7y8Q9Y5qDmkwrXpswdUgAaSAI81c5mSrnX7fJubE0JXAtaVmfnw149EI l8Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZdrnVK7xqs18IWPl9FP35jT2NV1miv/V1kboEpvaOog=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=XKZpk5SGDZvg/TpF0DO5PdUSHBwClCXRAXdMMp+Sb3AmU687JeV6svWOSjzb5kNOM3 oNDJpLAANDmba4PXqCXyuBp6Cy5CqVOsE9qw1c1r0Gwyty0lZKNWCfGcx2bZx7TC5fv6 eUHcnrShyKH/63eVRU/J2ITnM/JWUyoJemjcW/lus7ehrpByT4KgrD90r6KiO5eB67ZP X5KuzLkpZF49pMsh3EBRy4Me1uMZMNmPs2ByoECkcttNJY9wAwnpEoYDIIUsrybfEIfU /fnYhqW/vFnFPwoNmBzpMs8Z93aKuqXGQelokKDanTPYxvvwAVCyq0/Do1qKPOdZmqtj T8wQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="SWRa//Bm"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c2fb459f4esi2670154137.202.2025.03.11.11.19.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="SWRa//Bm"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts487-0007ra-7q; Tue, 11 Mar 2025 14:15: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 1ts47e-0007DL-Ex for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:34 -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 1ts47V-0006nU-Sx for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716862; 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=ZdrnVK7xqs18IWPl9FP35jT2NV1miv/V1kboEpvaOog=; b=SWRa//BmhTnnM4/hosLS+i9+ePTD2O0Sgu1DxdYcMtemyoIU6BLNV4dvMjUgnJ+4db5Kpl pfqZprki1SloX87qnRmzVSBiFHRRMpKMiugXCnjRJuHU0MUHvi5xuzfbnI0ydvROrlnNx9 b5wg7r0sgQ6TZphZVtrGGWjancoNSrk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-435-bXd5zKdJMNyF0J6Y_vJdZQ-1; Tue, 11 Mar 2025 14:14:17 -0400 X-MC-Unique: bXd5zKdJMNyF0J6Y_vJdZQ-1 X-Mimecast-MFC-AGG-ID: bXd5zKdJMNyF0J6Y_vJdZQ_1741716855 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 984591800263; Tue, 11 Mar 2025 18:14:15 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3706B18001EF; Tue, 11 Mar 2025 18:14:12 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 16/21] hw/vfio: Compile some common objects once Date: Tue, 11 Mar 2025 19:13:23 +0100 Message-ID: <20250311181328.1200431-17-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-6-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 416643ddd69ab64c252eadd07702a9d5dad0db47..fbff46cfc35e0ee69e9599c9f8efc7437bbe3370 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 260d65febd6bcd1935cfa9f59cc08aae21fc97fd..8e376cfcbf89a822961a1a76c3030eb670dd0513 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 18:13:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872474 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1622394wri; Tue, 11 Mar 2025 11:19:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIn9BU07jVrFk60s/Dph4W7YEhLcWr8IJc1kiVI1QobXMsfYkCIp2x8w81rx1mUPKOtNx5TQ==@linaro.org X-Google-Smtp-Source: AGHT+IH/zz5EDP6zUAbAiJaOnjrJBKj+NePIMDp+yQxa71/aCP2/A7eAKg0pDodgnqmdsr7zjbBi X-Received: by 2002:a05:6102:5109:b0:4bb:9b46:3f6f with SMTP id ada2fe7eead31-4c34d1f760amr4131872137.1.1741717150986; Tue, 11 Mar 2025 11:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717150; cv=none; d=google.com; s=arc-20240605; b=UhekeETt+wa6EwKkJb/Eh7WCqR045LwzZ5Z0MNk7kWBI4af6LbvEEft/2bJyhFA5D+ pkxhdbrrxvRl5xXJ7d5GczPJ8Hhynq4t/uUz2i25nKvpBe8epwxD6dXwHRliOyCsY1cz rFyZN0S3JdII7GZCJPs9Udt2lzQWFa9yYYObzXl2TXIVNt8e+vuAlxt9XVfWuggDjomH mscCE6QdPuWXrKA70gFUP1eNty2wsU9QbKV52r+EyZ1+xkqrwQbZoKap9/SCf/63abI/ QFTBOqrJoXF+SgiSUl9chVDUYzvz38JC/Mp3T2UY+PQ60UbfAF8vhg7MnV6xBZWbZ5TI qFFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=brBCd8+T+v9ewF2ihf49GHymhQ/INPlAx+TddkShsw8=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=IH5sDzz0Pjo4rqsw585ojW4GYkTAeSAeUn712xkq6IbVz0n3bk07sxpbFu2/DoK5m7 zpmq0TllrXNi+/czixpCWb0llfTnAKWNw7ELBsRyVZTs+3Y9BgaU0e1TNxtAnkVMWNeA qmGOQG5U61eIWelpbHxSNO+/Gr1dJ/sHWvNTvyHNUHsSwCYpDtNq9OknA27jZxcZPatu MAJ5VfZrNc0JRwntqprbxkAP6rFDNW2tNSdlysJBLTi7xpUUuXTS684EX84rF9+HsxCN 54lgSHp9FTZhUfQtwhVY8aD1Whuk+NqyKAezYW78QEyjwHFTDjLa8qOSpbRpFAr+GKVK ItVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=egKO+kYZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c2fbc71750si2942084137.225.2025.03.11.11.19.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:19:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=egKO+kYZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts492-0000bU-Ik; Tue, 11 Mar 2025 14:16:00 -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 1ts47c-0007C2-7u for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:34 -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 1ts47V-0006nZ-AS for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716862; 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=brBCd8+T+v9ewF2ihf49GHymhQ/INPlAx+TddkShsw8=; b=egKO+kYZEK/l7XqLZw9av400ihxM3kqABhU2L5Cj300qwLV8EWvlJGI1j09XdRUdduuYt8 wwXU4cjRLB/POd8kIloC79PNrwJCc+YaoQhNryqoFywh7UpTr+UmjI5l9PQdmvWYb61aN2 tWJotXlqWGAYU1FpkzW5dotKPk5+sQE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-266-gHFSx5vyPsKYAqWKXRc62g-1; Tue, 11 Mar 2025 14:14:19 -0400 X-MC-Unique: gHFSx5vyPsKYAqWKXRc62g-1 X-Mimecast-MFC-AGG-ID: gHFSx5vyPsKYAqWKXRc62g_1741716858 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A8B019560BC; Tue, 11 Mar 2025 18:14:18 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FB7318001EF; Tue, 11 Mar 2025 18:14:15 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 17/21] hw/vfio: Compile more objects once Date: Tue, 11 Mar 2025 19:13:24 +0100 Message-ID: <20250311181328.1200431-18-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-7-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 8e376cfcbf89a822961a1a76c3030eb670dd0513..784eae4b55994a53d16b5af600b06b0f77f2b36f 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 18:13:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872477 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1623253wri; Tue, 11 Mar 2025 11:21:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV59VzfLnZzT7NIUMOpr8RgKybMvmr72RxTxDEaG4SWF0pGrvvHn46jP/oT4FBqzfHAFVx5Ow==@linaro.org X-Google-Smtp-Source: AGHT+IGjs5v0zoSVRFkkeoJiU9Z1sclQ/2JfnCtwr2aSQ9G9LmetgKV15tYkix8m9fHFb4VUEki4 X-Received: by 2002:a05:6102:41a6:b0:4b6:20a5:8a11 with SMTP id ada2fe7eead31-4c30a501a02mr11956167137.1.1741717268977; Tue, 11 Mar 2025 11:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717268; cv=none; d=google.com; s=arc-20240605; b=FY77DlUIKcHFHe5LW2T1g1Kx8hNlDuZUiFVKtHUBX9DDOZ0Pt1g4Q793RyS9JWLQbp Q3GBESER9fE74YFmlrXlnGQhp3rbEQg099cN1X1NNXSyEqTXAjw0UHTavTOx3vZQFOzR n8Wr45ylAyo291yD1RC0fa8Sj2KNKIj5NIoxMCrOdO15BOmhOhFu7Ox38F/1pGEW+K+W uCDFDuuJePx29mhP53CnFrIspYXPNCAg5eNdXnC/Oiq4Gx8Y3G0WQZFW/b3ycdwpWMPX J+KvyNKbxSkjJ6LhQ5sg8hga7JHKkVzIgMSAonK0RKnW1us6o+XnwI/6DljIHjge4n7p 9TCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hwpKaV3fmKDMNdUS7RuFW4EDDxAFHDX7wsnRUNq1Lpc=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=kLVjqXJQTYP6vskXJY13DeAuSjJr7KqFDf8F0Bp1iwzO/QBVai6YdGvKPBogiNzskE UOQdkk1EItJuCm3D6KyBuLkqyEagID/Z7cxQQuhUPCOabfcgTd2659B4jVWSPY6GkBOG CABwkAZfM2biBWwzYWcQ739UmFs070a1vlMYQoiwZ11NUGTYS0RlWTIL6yoRX65c8k1m 134yAUU9FAipdw1WHWUN48/vX+KCBWvSSNQyude+NDyxjDFtNHjjeBsBtaXBJ1HJ49Yf 428/gnFWtkcl+kOOZvB9Uus+PSPk8eQ5aUxaqdi8a2wBp7PGqjrQv4RHPS4HBYOxiw7v Es6w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LdofrOUD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-86d33cb99cbsi2504219241.152.2025.03.11.11.21.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:21:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LdofrOUD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts49I-0001GX-H5; Tue, 11 Mar 2025 14:16:16 -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 1ts47p-0007MZ-Or for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:47 -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 1ts47a-0006pc-MX for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716868; 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=hwpKaV3fmKDMNdUS7RuFW4EDDxAFHDX7wsnRUNq1Lpc=; b=LdofrOUDy24lMp03BfNX/5EcC3qykPjCNIs/Rwv2g5olCLYdiO1VaBYfjhPcW1Jjag271y aYu1SECJFCAZ84kV4Xc9lgO1Z2Sf9Eu+kv+4nBXTxg+cJvyjQOCgFoVt59C+MZtJr7sk2G jqqe0ahVm37csLVLxcWws+SANgJ0kRQ= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468--cqSlLaKPxOrw3Ntj4fh1A-1; Tue, 11 Mar 2025 14:14:22 -0400 X-MC-Unique: -cqSlLaKPxOrw3Ntj4fh1A-1 X-Mimecast-MFC-AGG-ID: -cqSlLaKPxOrw3Ntj4fh1A_1741716861 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A1DC819560B3; Tue, 11 Mar 2025 18:14:21 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1269418001EF; Tue, 11 Mar 2025 18:14:18 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 18/21] hw/vfio: Compile iommufd.c once Date: Tue, 11 Mar 2025 19:13:25 +0100 Message-ID: <20250311181328.1200431-19-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-8-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 df61edffc084360d9f332ae1d122518c0ecbb955..42c8412bbf50724dddb43f9b19a3aa40c8bc311d 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 784eae4b55994a53d16b5af600b06b0f77f2b36f..5c9ec7e8971bc6e8146d173b6b957e5ed88f73b6 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 18:13:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 872472 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1621713wri; Tue, 11 Mar 2025 11:17:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVOrcGQM8N2qlcE3YhSQxr8xOuXPfiJhfM+J6Ak0TlHbftddjziyvmJexcz+UOWVFkpf/UcA==@linaro.org X-Google-Smtp-Source: AGHT+IGTqsjTbtosJFp5KcONGlDALnDlleocel2AjFWf9GkbyPz3RIaRlgW+mKgUKEyq/8Kq2HOe X-Received: by 2002:a05:6102:2922:b0:4c1:9e13:827c with SMTP id ada2fe7eead31-4c30a537a0dmr11590308137.5.1741717058047; Tue, 11 Mar 2025 11:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741717058; cv=none; d=google.com; s=arc-20240605; b=c1V6bCZWl9PJwfFuXd6KLmD0BYpJJ9W4Vw8cf+YbIXsDpcsF2NGBRabddVHhUgK4i0 c5wvwxiiQXqeE0ysiz7jzmAdOE12IYXEFIs5CU/TSoVSKlo9JDsmCGAjdOrdDt39u5sk mBr/mZ7TOqROdqJTDSdXUZxyy9APZGFU1LCL/y64lC+8sDpCe1ajZhahPCgpRKpMF7xZ 6Q1A9NuPCYWtA4d30l+B2qhGu/iImIab+vf4hmvXiDVpQAt6RQ7QAXdLzYBkZj6UfDqT cAxKRtrOfGdFg4Sa3b6Xk/THNgjfE10uk4Y4ovc13+ON0QgOVHpY8rMmkwXHlabMN2xH ogaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iU/CauJb67o8IFzGnFoS19HmeoDAr+jjdjFQvlLQtxM=; fh=skPag3eb/PHum7UM2+Nk02fn39KWwqZx8YsEy/fWPkc=; b=YdA4q3VsHlQIC/ObgiNoN5cvfegJC5v7tPsFxJKXSsK+jbx4PrCFDKiEO2uOCiwET4 +nxq4R20yI9fhdaQOVtz0Ro/BJ5yxvBnoWPdW+KAhJIf1eDeYjf6plPMaeTpPrjEGIPc YwJbdOuH93ROw5GAR7fLKJ2nNfisOthtGTHswNAktJnIb3WhlNRnN29RlyYC5OEHkuVa APci7ftv8If1PIuVAhOfX4g8xegczOgzfAg3NTqHZVR6gi+cKZanhIk79y8O8dl6eeoa kezqpD5LYQDicWZNVXdyxiIVx1TOSzWM8lcBEqHPV4JvDpNNtYHFAfSpdr3ZUcS0mGqq MyQw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bO+38t9D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c32af9b77dsi1671148137.483.2025.03.11.11.17.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Mar 2025 11:17:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bO+38t9D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts48o-0000Bz-FR; Tue, 11 Mar 2025 14:15:54 -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 1ts47p-0007Mb-Oj for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:47 -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 1ts47b-0006pn-8c for qemu-devel@nongnu.org; Tue, 11 Mar 2025 14:14:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741716868; 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=iU/CauJb67o8IFzGnFoS19HmeoDAr+jjdjFQvlLQtxM=; b=bO+38t9D/+h569/vgbvJaCfe5Ite0Lf4Kkk0wtenOrCDw+wH2fC36PY+GvT+YHOU2YgIRE BSbohrY53Hg2ymJyXn/0Yi7PHgCfACNUlqcRTW36tO4YD+RpuEKGpIFBr+0mGHrECzXEg0 noTHvPHOf47zWx9uJPFeLXqDpT549LU= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-DiukoYLLPeqldJWxY2Q2KQ-1; Tue, 11 Mar 2025 14:14:25 -0400 X-MC-Unique: DiukoYLLPeqldJWxY2Q2KQ-1 X-Mimecast-MFC-AGG-ID: DiukoYLLPeqldJWxY2Q2KQ_1741716864 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A2E6E19560A3; Tue, 11 Mar 2025 18:14:24 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 276E718001E9; Tue, 11 Mar 2025 18:14:21 +0000 (UTC) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Eric Auger Subject: [PULL 19/21] hw/vfio: Compile display.c once Date: Tue, 11 Mar 2025 19:13:26 +0100 Message-ID: <20250311181328.1200431-20-clg@redhat.com> In-Reply-To: <20250311181328.1200431-1-clg@redhat.com> References: <20250311181328.1200431-1-clg@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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> Link: https://lore.kernel.org/qemu-devel/20250311085743.21724-9-philmd@linaro.org Signed-off-by: Cédric Le Goater --- 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 5c9ec7e8971bc6e8146d173b6b957e5ed88f73b6..a8939c838657b09c38f93ad69d541df5aea30a6f 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', +))