From patchwork Tue Feb 18 16:26:11 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: 13980241 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 9E925C021AA for ; Tue, 18 Feb 2025 16:28:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQc-0004pu-EA; Tue, 18 Feb 2025 11:26:34 -0500 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 1tkQQY-0004p8-9Y for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:30 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQW-0000iN-4M for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:29 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-38f3913569fso1792712f8f.1 for ; Tue, 18 Feb 2025 08:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895986; x=1740500786; 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=4LIM0sFFVBkCbyArsjA9gzE/mDTxyAKavFGTWagdWog=; b=oywqo1D5kyfnsY0B7eXVSyTYlqiYPUKIDy4C7O79hAR6ToCJ8Z8ScCLwIFTZ2o3ALY qNcbGKOmLToiOGZYfX01aKhimFZ/s6xtA/wJXo1QMpyKcDw/iUYMMdwiaWYQkuCWsxzs BGkJl943rNUTO4MQR2YiPQi6c4IFL3yPF+u+esJyG88fg/mbj5ohkTpU/vXBPJqmX5Qn 4Rng//gqqN6E+JwmgtwHQGzwMxSRG7TGWPlOOSO4LcRKdIdxNMgZ8lw3L1wy6bEPxSWv a/d01ly9tCpM14zbFGBLcgLcEqCPLx9j8Zx6Viok+EPZW0kbvkeegw/Iw1KmGHtpL3Tq WoRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739895986; x=1740500786; 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=4LIM0sFFVBkCbyArsjA9gzE/mDTxyAKavFGTWagdWog=; b=gEeNa+Pv+5312nEmMdSWca2F4S6Ua++kK3Q+o2svC8cEf87TKEtfl8Au8OElzA31GO QAhLGMC7umsZkYz1+dm7mUX8XOwVfSu761t2oNMXBnQZDBOJqmJT2dCXmNhZNkQ6AxTy VJPb154NmQOc7LeQb4LzZLCGIQks2554YM7ba4cJlc+jteCMwqXcONOt2lcOcFWwZkRn L75rFtaYu9ClSDjmm1ML1SR7m2jYJk1VQHrgLbfCa/gG5uLRYFuL5NTylwH8fJRxQE6B Cthwox7JW/+JKsjBzTOZgczjbsGFr1y4M6hBcJnlpxxKPgSR2Zy+ZPjKPVKG/ZUWQYQS uzAg== X-Gm-Message-State: AOJu0YwtU+5nKskisEiPuEGe14JCd13sX/yeeE2J20v2MzaWzjVS/Skd QW4m9uOSni8ezom3R2Tj4ugkknKFEI0YTNeTx4QnLoLSREIErjpGNloJM2lWRRd4f2NxFF0WBkY aLlo= X-Gm-Gg: ASbGncuR6Bh5Szg2hNNOg2pRqBxMLGJYD32Rh08tHJkwqmyHtFOUnMnEeywl4PveQZ7 cH6RxeTyJqzLmwDsZ650JPz2gPdraMuCyW4V+cjnBtKSpXpyUjNm/CGL/UIrVlZjHa1x29jyakO ocwDzw9Ea/L1B3oy+7D+tb7TTE2GyxtJrHAcSDrDX0v9CPRTpBoCeuvHRCuoD8CZbTALvWqweSK I29MvJNM2r0hRiR/IU6+VQyS2yOPWC+WQDpUyQaaMW57SxYyeI5s8cMLZcs2vWcChgcl+Qye0j+ eCyRozd0jodesXHpTU6mQZpWLUy4lAifFhCGCtfCtAAxDuCg5fBkdwKgHKoNQFCqxQ== X-Google-Smtp-Source: AGHT+IGaFoLwpAXJM1RKXJyqOqbFhBQZJoShD8QgSKhjB3EukdihrG9J+ztpEYBn+Bs+2lZBx3sx+g== X-Received: by 2002:a05:6000:1fa1:b0:38d:c6b8:9fe1 with SMTP id ffacd0b85a97d-38f57ea1cfcmr360586f8f.24.1739895986072; Tue, 18 Feb 2025 08:26:26 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f7df2sm15426607f8f.84.2025.02.18.08.26.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 1/8] accel/Kconfig: Link XenPVH with GPEX PCIe bridge Date: Tue, 18 Feb 2025 17:26:11 +0100 Message-ID: <20250218162618.46167-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 XenPVH requires the PCIe/GPEX device. Add it to Kconfig to avoid when configuring using --without-default-devices: /usr/bin/ld: libqemu-aarch64-softmmu.a.p/hw_xen_xen-pvh-common.c.o: in function `xenpvh_gpex_init': hw/xen/xen-pvh-common.c:174: undefined reference to `gpex_set_irq_num' /usr/bin/ld: libqemu-aarch64-softmmu.a.p/hw_xen_xen-hvm-common.c.o: in function `pci_dev_bus_num': include/hw/pci/pci.h:337: undefined reference to `pci_bus_num' /usr/bin/ld: include/hw/pci/pci.h:337: undefined reference to `pci_bus_num' /usr/bin/ld: include/hw/pci/pci.h:337: undefined reference to `pci_bus_num' /usr/bin/ld: include/hw/pci/pci.h:337: undefined reference to `pci_bus_num' /usr/bin/ld: include/hw/pci/pci.h:337: undefined reference to `pci_bus_num' /usr/bin/ld: libqemu-aarch64-softmmu.a.p/hw_xen_xen-hvm-common.c.o: in function `cpu_ioreq_config': hw/xen/xen-hvm-common.c:412: undefined reference to `pci_host_config_read_common' /usr/bin/ld: hw/xen/xen-hvm-common.c:428: undefined reference to `pci_host_config_read_common' /usr/bin/ld: hw/xen/xen-hvm-common.c:438: undefined reference to `pci_host_config_write_common' Fixes: f22e598a72c ("hw/xen: pvh-common: Add support for creating PCIe/GPEX") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias --- accel/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/Kconfig b/accel/Kconfig index 794e0d18d21..4263cab7227 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -16,4 +16,5 @@ config KVM config XEN bool select FSDEV_9P if VIRTFS + select PCI_EXPRESS_GENERIC_BRIDGE select XEN_BUS From patchwork Tue Feb 18 16:26:12 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: 13980245 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 81539C021AA for ; Tue, 18 Feb 2025 16:28:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQg-0004rb-CI; Tue, 18 Feb 2025 11:26:38 -0500 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 1tkQQd-0004qZ-V7 for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:35 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQc-0000j4-BU for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:35 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43948021a45so58913235e9.1 for ; Tue, 18 Feb 2025 08:26:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895991; x=1740500791; 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=WMi6HKMJEZy6PJobbwMTCNEj8KX/6SAXVrdJz11g72k=; b=fOuqrudqQXvNXVgeU76ukVXM9qJm69cRz4785ACoMO6ChMuPAJo2xyvLOIrP5xG6OT 752YOEStUEoda/HxfqCs+LKC0sSKoe2mYTfTBdA0L9F7H/EHnky5cx7RNwOnO4SOo7uk uf3x3m6VS91WqP8/kNETRnb4n/tpglsTnedHEHYNoXe7AbstpwrBjGLyEQIGNKaUPw9c cwaqeRz3tMqUDEHRznyunYikMSEzDA9NxjnnS3GuBPAuEuKVpfxAzJKXeNvY8UycQpbe PMHMERDjFiAcYjyaORN9U//kMTRqzMuTi6m5x4uq45Gt4GKWGWbMGRzzQBeGpV4cNfBY XAZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739895991; x=1740500791; 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=WMi6HKMJEZy6PJobbwMTCNEj8KX/6SAXVrdJz11g72k=; b=RnL3Sl8vVXikPzPBucOM54ZkqhUg9rdzcfj4oy75Q3r0seFkrEWuNNoV4BQ8mK0hJd dJQtVyto10jsPYSBD4qosutg+QMfUppe/Pzfv1kaCLNG4wewfhR0VepoVMYEVqSL4PGx RswbmU7i2gQZXsvdmd4Lt+f+E6/yegQhXAHvhFIJFQVtHBsf0mB0F8SvTKMaeMHAMvhR KmK7ahksUQd7SL0CAy0nMvjkCtboec+AHpE3l4P8lHJ5RWKRhF372zsqFM8mbmsZPLmY fvtuN/Ff/5di5Vl3Fk+lrXfWCb72rHcPIstK2R+6/2pu2yjkYt25z6ZhtMoOKXrlOJuY HHGg== X-Gm-Message-State: AOJu0YyHwnIKsTvhNvuKpDCuK0tdtsbZTpfQA8iqhQ1CMtTyLi7llnt7 sJx1YmCZmgKJA2RFpHI+fRjaD+3+PJ/Z3KHk2S/ocrGQwjhZS3DfYFmXLZDU38a8pjQjpjpUt8s wJtU= X-Gm-Gg: ASbGncsgP9yyGZIfIbb4aNp+e9nzyNA5gkgU+l/7zdNv5US/rwnCaI2/l0moCuCI5LY aneZQyhfORKz6J91ZFSAax4bDNtbgI/p721qVJclwkhahE562UUphLcmpgr50CckpH/SDpHsr+n c+Sweon1gyQwFBCWMNpRIJ6oKjPr09TWPzyLrBihO1jK/JE+tL8Yg1HPehRYLSVUTOpJYd6KRAM TE/2lHccrIwSkrCAmmdYVbj5gympqMlVJFXeyrfW3YR0BsgtqxJarVx5PfKEZCiNFATy5Uuolix oiNmNrlDXh/hBdDGpxaob3xx26mIHRvoFFo/K+IfVcNm/26oeCIXHaPMX3fsTsq/xg== X-Google-Smtp-Source: AGHT+IGDR/hUW2+zIj2HthGePLoD6GAPRVrHbOwKJDDnZXahEAaGlBqwa3h93T0HklL55mOUPzcfKw== X-Received: by 2002:a05:600c:5124:b0:439:5da7:8e0 with SMTP id 5b1f17b1804b1-43999da82bbmr3503685e9.16.1739895991236; Tue, 18 Feb 2025 08:26:31 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439941bd54bsm23641345e9.11.2025.02.18.08.26.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 2/8] hw/arm: Do not expose the virt machine on Xen-only binary Date: Tue, 18 Feb 2025 17:26:12 +0100 Message-ID: <20250218162618.46167-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 Since the Virt machine is useless under Xen, do not even try to build it there. A Xen-only binary now only offers the XenPVH machine: $ qemu-system-aarch64 -M help Supported machines are: none empty machine xenpvh Xen PVH ARM machine Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias --- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 256013ca808..e5f4b1d84d3 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,7 @@ config ARM_VIRT bool default y depends on ARM + depends on TCG || KVM || HVF imply PCI_DEVICES imply TEST_DEVICES imply VFIO_AMD_XGBE From patchwork Tue Feb 18 16:26:13 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: 13980242 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 9FAB9C021AF for ; Tue, 18 Feb 2025 16:28:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQj-0004sU-Sj; Tue, 18 Feb 2025 11:26:41 -0500 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 1tkQQh-0004rl-Ox for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:39 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQg-0000jk-B0 for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:39 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so15158635e9.1 for ; Tue, 18 Feb 2025 08:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895996; x=1740500796; 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=BmvUlbgMu5QXQdotks4SMqmfKLjL3YMxTV+8+DmV1vQ=; b=l041j9rZnukLLA8bx5sI9wAd9uyoCDYFskGl2igA1SGn5qZ8iDDz831AtHQ313je1Q TURNWigDFWhLZQbTf97QiNig/vYxA+rqGzrQ72h27zssGVE3eOpYYKD+BNBvJy7szQfA 86RTVRap7pg6FaEI3zh8l8V7oKcoqKiLNqDamkba8u39BGMAs6Wvb9pZ1vE7J71VrVJc uT/i9GsM74DTViu26hP9rHZXMHkBNNx6Y+Z0x3Ura67QEX52i9SOuoQzF7kAA2pd0Ekd Nb6niXnTFowMw36BgE4fwkfsnl2OfgBqteOdSlOwPvk5AlqTO3atoSLoLvaNFmvWi0pa a5ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739895996; x=1740500796; 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=BmvUlbgMu5QXQdotks4SMqmfKLjL3YMxTV+8+DmV1vQ=; b=bOFHgX/xMlxh2RVXdmYxz7J3VJWwGXxgYHqS5+KY0UGxwzICOr74C7u8fhVXzTSgug mWTo0KDOVDh+yEP948tBZqecLdvHXNnMgDSjzlTbCely4KQ3uTubPmXdzpEVKjyZo9cW waExUO+MJXFf+efQmbgUAd8MZo0OC+773rcqcgl01dCDXeOcVOjW2Xhrrr08vzgtMnZW PIYNh4piYJ4fRoy7uiKYNBsZ0wAZm7Bdi0BIIkMfi3HAbvEgSMEiMzWezu0r2OeBXrW3 9p3Tyc0f5HMSkDFZNcIO1337SPi03fTPEmHDuco8JXqaHEwUSa1LblN3Xof6cO/uHKRM 96EQ== X-Gm-Message-State: AOJu0Yz1nFyM1t7teyl8HBTcuQInhc3j9SsIi6fbifGMXT4rrBKVcUnW 84bZm9VEKbzQ+D5ueC2S7hymFTg7SOWg8zqbxbLCieMBH98Yjhg7JUQRffgo80+dCiM30Qz413e KiLU= X-Gm-Gg: ASbGnctZC4yF609MbHyavsUm1EERL+hWVYVhul94LVuGTRHUvakSyOzkPLZPSPeewNv OWEF9aB+PeguT9+wAfkDJckMUwO1a0f5FqPCiqKsesbp5YQH/d5z1c3h8MhaLZSGcXhl3C7+Dhs 3Vw23KkMs8cgHGuRp0MOZL22JQ6kGwC6zl/8p6aMMccnFhIAZrc69+Hhb0rxczHVT+PLljjc8S+ lzKLOknhpf6jfAmpTiCOg+bY3aza3ZZD6uENsA6jKJte0VCaYjMmnNgtfsfuSgNMko9SCvQ/goN G2mh1Q1sxxqE71yajXlLPgDMt1L+3fPGUcXIysKcaDYX7Alj0Iz0Vs+97lnATofSTw== X-Google-Smtp-Source: AGHT+IGDpjA1jMRndJ8zzyh/WqT4n0dcOTmIjm+pFjuPp+1wE2F6F3aH9+wQEgZeB7C8Blu7KKErWQ== X-Received: by 2002:a05:600c:35c2:b0:439:5a37:814b with SMTP id 5b1f17b1804b1-43999dd216fmr2597845e9.20.1739895996546; Tue, 18 Feb 2025 08:26:36 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4398a44264csm48836645e9.25.2025.02.18.08.26.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 3/8] hw/arm/xen-pvh: Do not allow specifying any CPU type Date: Tue, 18 Feb 2025 17:26:13 +0100 Message-ID: <20250218162618.46167-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 No CPU can be selected by the PHV machine. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/xen-pvh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c index d1509bd235d..2557d520307 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -53,6 +53,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data) { XenPVHMachineClass *xpc = XEN_PVH_MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc); + static const char * const valid_cpu_types[] = { NULL }; mc->desc = "Xen PVH ARM machine"; @@ -75,6 +76,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data) * mc->max_cpus, QEMU will bail out with an error message. */ mc->max_cpus = GUEST_MAX_VCPUS; + mc->valid_cpu_types = valid_cpu_types; /* Xen/ARM does not use buffered IOREQs. */ xpc->handle_bufioreq = HVM_IOREQSRV_BUFIOREQ_OFF; From patchwork Tue Feb 18 16:26:14 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: 13980244 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 5C913C021AD for ; Tue, 18 Feb 2025 16:28:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQo-0004uk-64; Tue, 18 Feb 2025 11:26:46 -0500 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 1tkQQn-0004uR-2B for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:45 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQl-0000kS-El for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:44 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-38f2b7ce2e5so2338602f8f.2 for ; Tue, 18 Feb 2025 08:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896002; x=1740500802; 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=0a66yVnUC0E5xDdPgIBrEynWgyX5dbe4KJOQ4kO7y1I=; b=FhVWBU41o3GwLXVax8qu1QmIjYesRP4jpuI9uItTdndzaINl5cTneDF/7LxTnX1TJS 7N+YrlOceEAaA6CqzU/3lX1Deg88m1SPd3eDR55jYYJscsHdn2qzfhqyWsv7aKXGSUJd wcLmvVRYQ0KAfxmhGI/tVRSNZdu0jQBcKA4+RA7btg+1hEm21nNgFNitFVI8/il8ZvIN 95VbNHy8dmeFPaylBS4dIHnDzvhzHM/mAlKK3+dUXatFAUH/4QM+idQMygtS/h6gW1+6 gd1ktvmVjulBC5i5eYNjjTFi3/ikYur6vAJRB9S0xeD48wPoGWjMex31DyhcuCB1Xpef welA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896002; x=1740500802; 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=0a66yVnUC0E5xDdPgIBrEynWgyX5dbe4KJOQ4kO7y1I=; b=NX6wxVtvgS2fAeHX/Bm1IQzcKOxguVDETNSvPaswEqchCgixDPL8vWEtORy8dw3E0W VOvXdVJ9UPyPgA5z4yONMYLGFP7QqYehlXXF4r/rbB/3I9vfCn4iezMcH2MW7PnGQAqh nkJZw5Yh4kZhz8BIUkn9blbN+0RaHZmhfn+qVg73fT7n6l5uNuJw15i42nkZ2g4aVe9W rMJm8XJ5tPOby4Vq9JMDAKQpKQsKMxb9XQtV9R1hwR7Q7o/Fkouy131TohovcV+NKbnt Ft5XffGdfploozYQEpiHzsnysopJ5Z/DdaW3L/qZnXQM8mNDCjyCMEUdq2QE/4XShBTb scTg== X-Gm-Message-State: AOJu0Ywl0YYc1PPn6YUYcATqI02EI71bfg21avGNIOmWhX89F0SBpK63 Z523drns2lNsSNRryd8+3FV6vPcDqZsq+5nsek8t0/fw18PNUI8dAMmUCDWkCvANXujT8a//Das zTCQ= X-Gm-Gg: ASbGncsH4UQTBHcyhZxNu9sLn23u4574x9sMIm824ie2jErieBePqW8MkCgVzKeMQfJ U7bUKDAjpyG46owtzbf991PjgYG6Hjn8WqOQfifW7XGJXvwvMbULlumeq08BmOzgT9H3xOXf2Bu XAluETStNAxN3u0n4Wd9L4IrnMlVFTSaRoZag9XEPzBeahgQCxCavCCu1BGPf9J/qBEsMjPnC0s Lfp4b2fdmr5sAUGH1cEWDq9QFLyz3BKlynL+Ga54SoAMs+MXqkV3XWApJV1WA+tHfkT/3X6r6pq 1VEkVo2CtYv3OwujZZr9aaTGqM70flP9FxJPl5gfq+luJp+utWzRRybIWe4lgQCcTw== X-Google-Smtp-Source: AGHT+IGVAlgtubLuls4ng2ytjxZmkvsTq+0bRKUdjbgCyy9ok8Tw4Re7Q3OdU7d9IrlO5cAU3E/jjg== X-Received: by 2002:a05:6000:1865:b0:38f:4d91:c123 with SMTP id ffacd0b85a97d-38f4d91c4abmr6004250f8f.32.1739896001712; Tue, 18 Feb 2025 08:26:41 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43990f53847sm35276835e9.1.2025.02.18.08.26.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 4/8] hw/xen/xen-pvh: Reduce included headers Date: Tue, 18 Feb 2025 17:26:14 +0100 Message-ID: <20250218162618.46167-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 Have "hw/xen/xen-pvh-common.h" include the bare minimal set of headers. Adapt sources to avoid errors when refactoring unrelated headers such: hw/i386/xen/xen-pvh.c: In function ‘xen_pvh_machine_class_init’: hw/i386/xen/xen-pvh.c:84:28: error: ‘TARGET_DEFAULT_CPU_TYPE’ undeclared (first use in this function) 84 | mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; | ^~~~~~~~~~~~~~~~~~~~~~~ hw/xen/xen-pvh-common.c: In function ‘xen_pvh_init’: hw/xen/xen-pvh-common.c:217:43: error: ‘MiB’ undeclared (first use in this function) 217 | if (s->cfg.pci_ecam.size != 256 * MiB) { | ^~~ hw/xen/xen-hvm-common.c:18:6: error: no previous prototype for ‘xen_mr_is_memory’ [-Werror=missing-prototypes] 18 | bool xen_mr_is_memory(MemoryRegion *mr) | ^~~~~~~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias --- include/hw/xen/xen-pvh-common.h | 8 ++++---- hw/i386/xen/xen-pvh.c | 1 + hw/xen/xen-pvh-common.c | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h index 5cdd23c2f4d..17c5a58a5a4 100644 --- a/include/hw/xen/xen-pvh-common.h +++ b/include/hw/xen/xen-pvh-common.h @@ -9,11 +9,11 @@ #ifndef XEN_PVH_COMMON_H__ #define XEN_PVH_COMMON_H__ -#include -#include "hw/sysbus.h" -#include "hw/hw.h" -#include "hw/xen/xen-hvm-common.h" +#include "exec/memory.h" +#include "qom/object.h" +#include "hw/boards.h" #include "hw/pci-host/gpex.h" +#include "hw/xen/xen-hvm-common.h" #define TYPE_XEN_PVH_MACHINE MACHINE_TYPE_NAME("xen-pvh-base") OBJECT_DECLARE_TYPE(XenPVHMachineState, XenPVHMachineClass, diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c index 33c10279763..f6356f2a7ed 100644 --- a/hw/i386/xen/xen-pvh.c +++ b/hw/i386/xen/xen-pvh.c @@ -14,6 +14,7 @@ #include "hw/xen/arch_hvm.h" #include #include "hw/xen/xen-pvh-common.h" +#include "target/i386/cpu.h" #define TYPE_XEN_PVH_X86 MACHINE_TYPE_NAME("xenpvh") OBJECT_DECLARE_SIMPLE_TYPE(XenPVHx86State, XEN_PVH_X86) diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index 9c21fa858d3..19876ad7e8d 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -7,15 +7,13 @@ */ #include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qapi/error.h" +#include "qemu/units.h" #include "qapi/visitor.h" #include "hw/boards.h" #include "hw/irq.h" -#include "hw/sysbus.h" -#include "system/system.h" #include "system/tpm.h" #include "system/tpm_backend.h" +#include "system/runstate.h" #include "hw/xen/xen-pvh-common.h" #include "trace.h" From patchwork Tue Feb 18 16:26:15 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: 13980240 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 B0E46C021AD for ; Tue, 18 Feb 2025 16:28:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQu-0004xT-1m; Tue, 18 Feb 2025 11:26:52 -0500 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 1tkQQs-0004vX-ID for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:50 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQq-0000l4-Rz for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:50 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4394036c0efso35566825e9.2 for ; Tue, 18 Feb 2025 08:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896007; x=1740500807; 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=ZEWDgBTGZHQh8hQjrfZA2thbBnd3w2okAGpaFOGJy1M=; b=rCvvQdLV3S030l6Z1oSsog4abNdjiFuANzCIySt0DHb909m6qcgdUGAEtjnwsy4RBL eWCpL9mVM3mzP7MGzCV/YT4z2i4P/gvBEatD4vjUOKCS98PoWFZSml0qTBodmd358C25 /UN6vIV3Q1z3ew7E27Qta18rJNlQv/FIR12uXWtDkqDmMxcwNLSMtRAYZvVI+sKCslXo T8ANcAOUKpM6j3bTQQBq0R5+LWjLJCatd7H85kS0j+t9ERskvK63A+I68zxBrO5NLWCi VHfkMi5UCzKveZKnpmi+LrzWDBKdSQ1In+ohRn8gwvvnUhJr4OMfn7gfidaTvfpOAZGY U/0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896007; x=1740500807; 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=ZEWDgBTGZHQh8hQjrfZA2thbBnd3w2okAGpaFOGJy1M=; b=cOyEf/DIlYWL04R9TKpl5ZGgoS4fH2nI18Sa/4IbDhsyRIkZsweVCEr+kEuxMPWdqE 5PHG/xeRkf8i3/IfjHSzo9t04/8yFj+PI0wgGlqrqe0w1VYiVLHJkplOvxoniR03IT60 VCvglAsioA+TfSYKAJofrVIPSnglPYYSgueXWdX48hsFGnFdJ/LiCgS0V2uZ2S3ogLbt Ax02S4daG6jKoSNU5Qwivj45zkT8hWk34qIRbqwHNXwnyQ2YvhDJzkeufcfIlZ+ec5Sw NXLuVrETwvLHgM/steBjvQL3lIvK8BB3i45BT0yQ7IWPj78eRIoyt5lf7tZ4KQZy5v21 aiCg== X-Gm-Message-State: AOJu0Yyyqm74eARZWiHn45sN7tcU6dl/6kccUw+ycpQZlSfqM6GJowvb KGjL3ju0uyksuqQXJ1FY8QxpPs4IpgHTSP9vjX9MEsP5lqss6glrQN9mph3fnEjQBqTQN6jXNkv GwHg= X-Gm-Gg: ASbGncuwXBnNGFxBWAWFsJLHtn0eSAnBSTlZVL2PUkEEPmNjcLTRy26VtTpu6mypTdW dSjd5s5MVQMlViWhhAtdff9WHVpPsNvas+pQKxCF4eZcoyKgeDC1zWfLgThT8ydPlxJHn2WD0VN xoMZ9IIXh5CCwN+An3DMLrBPDFXGTHFtU/Y5gFv/l+5OcYrrGQlhydnxWLz5hXjkvtfqke02NYl VxvoiMYZNKlK69oXizPWE8pLXKgocpXOFcFf5pwWpQcsBmegGmGtODq0HIL80K6DQgGfJk3jsuz X42e6jeH12l5QxlRvS+o4NUMZRfHTxw35YYbA/4tWojGbWTNoxootPETTeP1dGSdFA== X-Google-Smtp-Source: AGHT+IHww/aPDqevZulOoXCapDkghHuR45jCHHx4aaEIx+GvA7aWlGWPRHehkaEbIQa+py8L6fjQlQ== X-Received: by 2002:a05:600c:4e8c:b0:439:9274:81db with SMTP id 5b1f17b1804b1-43999d76ddcmr3474325e9.5.1739896006891; Tue, 18 Feb 2025 08:26:46 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f25a0fa2dsm15228567f8f.101.2025.02.18.08.26.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 5/8] hw/xen/xen-hvm: Reduce included headers Date: Tue, 18 Feb 2025 17:26:15 +0100 Message-ID: <20250218162618.46167-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 Have "hw/xen/xen-hvm-common.h" include the bare minimal set of headers. Adapt sources to avoid errors when refactoring unrelated headers such: include/hw/xen/xen-hvm-common.h:71:5: error: unknown type name ‘xenevtchn_handle’ 71 | xenevtchn_handle *xce_handle; | ^~~~~~~~~~~~~~~~ hw/xen/xen-hvm-common.c: In function ‘cpu_get_ioreq’: hw/xen/xen-hvm-common.c:227:13: error: implicit declaration of function ‘hw_error’ 227 | hw_error("Fatal error while trying to get io event!\n"); | ^~~~~~~~ | herror hw/xen/xen-hvm-common.c: In function ‘handle_ioreq’: hw/xen/xen-hvm-common.c:446:34: error: ‘target_ulong’ undeclared (first use in this function) 446 | (req->size < sizeof (target_ulong))) { | ^~~~~~~~~~~~ hw/i386/xen/xen-hvm.c: In function ‘xen_add_to_physmap’: hw/i386/xen/xen-hvm.c:298:22: error: implicit declaration of function ‘xen_replace_cache_entry’ 298 | uint8_t *p = xen_replace_cache_entry(phys_offset, start_addr, size); | ^~~~~~~~~~~~~~~~~~~~~~~ hw/i386/xen/xen-hvm.c: In function ‘xen_log_global_start’: hw/i386/xen/xen-hvm.c:465:9: error: implicit declaration of function ‘xen_enabled’ 465 | if (xen_enabled()) { | ^~~~~~~~~~~ hw/i386/xen/xen-hvm.c: In function ‘regs_to_cpu’: hw/i386/xen/xen-hvm.c:487:5: error: unknown type name ‘X86CPU’ 487 | X86CPU *cpu; | ^~~~~~ hw/i386/xen/xen-hvm.c:492:15: error: ‘R_EAX’ undeclared (first use in this function) 492 | env->regs[R_EAX] = req->data; | ^~~~~ | REG_RAX Signed-off-by: Philippe Mathieu-Daudé --- include/hw/xen/xen-hvm-common.h | 14 +++----------- hw/arm/xen-stubs.c | 5 ++--- hw/i386/xen/xen-hvm.c | 5 +++++ hw/xen/xen-hvm-common.c | 6 ++++++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h index c1ea2c0d787..19df5600a39 100644 --- a/include/hw/xen/xen-hvm-common.h +++ b/include/hw/xen/xen-hvm-common.h @@ -1,18 +1,10 @@ #ifndef HW_XEN_HVM_COMMON_H #define HW_XEN_HVM_COMMON_H -#include "qemu/units.h" - -#include "cpu.h" -#include "hw/pci/pci.h" -#include "hw/hw.h" +#include "qemu/queue.h" +#include "exec/hwaddr.h" #include "hw/xen/xen_native.h" -#include "hw/xen/xen-legacy-backend.h" -#include "system/runstate.h" -#include "system/system.h" -#include "system/xen.h" -#include "system/xen-mapcache.h" -#include "qemu/error-report.h" +#include "hw/xen/xen_backend_ops.h" #include extern MemoryRegion xen_memory; diff --git a/hw/arm/xen-stubs.c b/hw/arm/xen-stubs.c index 34beb8b08cb..5551584dc20 100644 --- a/hw/arm/xen-stubs.c +++ b/hw/arm/xen-stubs.c @@ -5,10 +5,9 @@ */ #include "qemu/osdep.h" -#include "qemu/error-report.h" #include "qapi/qapi-commands-migration.h" -#include "hw/boards.h" -#include "system/system.h" +#include "system/xen.h" +#include "hw/hw.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/arch_hvm.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index d3df488c483..67b7c223aee 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -14,6 +14,7 @@ #include "qapi/qapi-commands-migration.h" #include "trace.h" +#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/i386/apic-msidef.h" @@ -24,6 +25,10 @@ #include "hw/xen/arch_hvm.h" #include #include "exec/target_page.h" +#include "target/i386/cpu.h" +#include "system/runstate.h" +#include "system/xen-mapcache.h" +#include "system/xen.h" static MemoryRegion ram_640k, ram_lo, ram_hi; static MemoryRegion *framebuffer; diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 7ffbbfea23b..3828105c95e 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -1,14 +1,20 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" +#include "exec/target_long.h" #include "exec/target_page.h" #include "trace.h" +#include "hw/hw.h" #include "hw/pci/pci_host.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/xen-bus.h" #include "hw/boards.h" #include "hw/xen/arch_hvm.h" +#include "system/runstate.h" +#include "system/system.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" MemoryRegion xen_memory, xen_grants; From patchwork Tue Feb 18 16:26:16 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: 13980238 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 E5BEDC021AF for ; Tue, 18 Feb 2025 16:27:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQQz-00053U-W3; Tue, 18 Feb 2025 11:26:58 -0500 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 1tkQQx-0004zJ-F2 for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:55 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkQQv-0000lw-Vh for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:26:55 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4398c8c8b2cso21247915e9.2 for ; Tue, 18 Feb 2025 08:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896012; x=1740500812; 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=mperaQfcVOBqRRYRjHccBT2TwBZt0VUagowA4iRkLpA=; b=xd+xG20vd2eayFJ+youg2RjBW6E435A0yO4Owqzf7dLSkrGYVUPltNWIwTMp8zOyX7 Mx2h2PfhS1G310h+tzwBOv0cA6+qZxyZBhg4IugyW8RxZ3hxlda6WRYoummZsj7H4x9j 0lhKlhSPFiLIwrgcYmnIV94Z6MT59DpMTxc7DYTW9UgeSrHCXdAC/BymPvtPEO4UAhyi oeKiumEdFq7Q1sOaTzfSD0hw/lMR4QbhmNwAYvOO+GHt6RjbUmVZMcPu3mPjRSfJPx2M ERW1C9qBbWdX/bdST8JzYKPp+WBr2xRkzgp37KTxImntJq80DqeyiteOcdZlj8u6gE2f uhLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896012; x=1740500812; 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=mperaQfcVOBqRRYRjHccBT2TwBZt0VUagowA4iRkLpA=; b=daKdy1BPbxRbGJFct0lddVcY2M/fTUSLYxs27ih17A6TU8/zpz7/KcXsff+mmyRBGN A28C8mJigwWKbzpmh2a2OLntzfb7ubetDUgy1bQNuZNe4vAHzcIGG5o3ExAWptgUNa4H yhXgaCuPb2ZInHiw6dz/u69XoFx0hDK50Ye2EJc+eVM9jcOB/uEnuXB57D8O+az9TpiI cRODlPDQxndnPKNy/UKn2S/bPkGZGfSPpqnBpikk6ZAX2oTtICpP0j6EY/GfX4dGxrcs J1kR1eyTwyUxLLPWWxqi01tOXa5DUp/n/GtBbE6WbfpWveRenMJK6qPEtH6Jf1FGjiPC SIig== X-Gm-Message-State: AOJu0YyBRBRZoIP4OaCy3Ac8TMh6f6v1u9CWov5Ev3JEqhrxhMfof9Vk npLXENDGsC3hlKeIskuuiQpInBBa+JJUBosMwLfrxsjI14MBUOr7+9FD6ZolAWeYXGirvSV+KUa Xmms= X-Gm-Gg: ASbGncvodcdfdozjzV/v1vRIzq0YMx8jBm+JSHqsVYB4Q8n/WAwkWBcUHP9F3o9Amad tdqv3/VDXZyDa6DZFb/Zs+6y4wfBp/84renHw649QBfnDwX004/4ed9GRszyYlsDr4Flv1Bdtbs +VYIWdVmZ5KnytVRuJVI3GcqsoB1BQt9Pj3czKkNmdan87UFSqPZRKHwu0RnoLFWzDBfZHy3KHE kf6uWFUxuKlDvuN8GIoVIN6r5EiWAOa3yRAd2z32GjZZ6nAAfyKcMVVQUxfOM5Bjco6dpLlz6TI qO+f1JSep7+WkxXaCN6O4rWTzXuMc3uc3iAmxeYjy5C/pU4o/SqEpJp+Gf/Ffyh0Tw== X-Google-Smtp-Source: AGHT+IF7J9TVuOyN/e8Zf762aLNRW9ueMObB9uugOr+4mEzA/SYgnf7ANAVSmsXQfhVb+gVyh0mcig== X-Received: by 2002:a05:600c:511f:b0:439:43b1:e60 with SMTP id 5b1f17b1804b1-4396e6df40amr143667775e9.17.1739896011980; Tue, 18 Feb 2025 08:26:51 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43990f53847sm35280935e9.1.2025.02.18.08.26.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 6/8] hw/xen/xen-bus: Reduce included headers Date: Tue, 18 Feb 2025 17:26:16 +0100 Message-ID: <20250218162618.46167-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 Have "hw/xen/xen-bus" include the bare minimal set of headers. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/xen/xen-bus.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h index 2adb2af8391..bdbf1ed6fd0 100644 --- a/include/hw/xen/xen-bus.h +++ b/include/hw/xen/xen-bus.h @@ -8,9 +8,10 @@ #ifndef HW_XEN_BUS_H #define HW_XEN_BUS_H +#include "hw/qdev-core.h" #include "hw/xen/xen_backend_ops.h" -#include "hw/sysbus.h" #include "qemu/notify.h" +#include "qemu/queue.h" #include "qom/object.h" typedef struct XenEventChannel XenEventChannel; From patchwork Tue Feb 18 16:26:17 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: 13980239 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 58B43C021AA for ; Tue, 18 Feb 2025 16:27:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQR4-0005Qo-Sb; Tue, 18 Feb 2025 11:27:02 -0500 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 1tkQR3-0005MX-Jp for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:27:01 -0500 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 1tkQR2-0000nJ-2R for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:27:01 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4398e839cd4so9820575e9.0 for ; Tue, 18 Feb 2025 08:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896018; x=1740500818; 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=LY1yJOtl399lZ4AXgftr3zMqyDj58QmxjVcxn7qswe0=; b=EHCy7m6pch6CkBUMGrjAwOgyGfAVcuwyUmLPoHjryGaKFJclsfXYlee87uVWMbqp91 YF/x5jedISIVR5i4fCMp9RKiPbYUrkwtdCPqWpdG0vaRo+KjtGlgMWB6zlvE+enOu7xj L6SA0O5uqx5fjbllD/ZS8XYZO2lzFTn7/D60Txj3B9Jlvxe1IsEOvO7TC42eZiD5Xts8 w6yRqKC2Gj5LGu+cQNLluNLTzyUEgXqncg2g20DcMYoD+4bL5DSqkx5RqKXuax2516py oEpOJr5F1wgohKGxovUgVtMBTfcU0P1PWEVeneDhym6pVWR221eiAzUSF2uvcAFXkBtr wfZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896018; x=1740500818; 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=LY1yJOtl399lZ4AXgftr3zMqyDj58QmxjVcxn7qswe0=; b=LNd0gNGp8NFfDUokKSAE/yP9Xi6S/7PA+vFWwdwUXvkrzZKasPSkvGisdoh4wvSljS N9zxvGSbAFCoh+0hY8l3fal97EOql95rSNvzFRVPvM4weWlNPuWy/zAqLZtQJX8ttNcD 5kbQ/7G7MRZsp5ceNrujVzdZUMWTSqpxGkPYeVYDcBLWoA80UPdW3gjt0ogW0wwDTly0 Nc/xYw/i5WEIpyBZce/aqwZvGKIB1mmhkXoOpJd/hVEvSDiWWtdMc/VC6sIizR4FvYdY KAuTtR5LLV1GDFSbkRdTKplNMvDFlFiKOMJpXgZi8pboxFxWvRKpHpffqmsEj2C6NzUK shCA== X-Gm-Message-State: AOJu0Yzs2p304ZDE8LQE7Za4WrGF84zyyRYEwAqsGR0vWEWbCnWop8s1 ada327SbDA6GY4qjtAhDcgPObPbJ0uKmIEVamRAMhyT4cLz2ICiU4fdqK3cMbZLt1x5kabR3e52 cMxo= X-Gm-Gg: ASbGnctYc0UvKVsP0Ct70nrPkNzsDlltkWcwabQPeqaez3w9vu6TYAyPu0MZW2U8m3/ j8pj1jHprxZH3WajeCE10vFcWqU5dIkBtbDH1ZFHEzdDwVsgztKnM1r8cSCO8AJqiUQM70d1R5b PKIeBuTikvpEbdVP0eeIqmm9Hjfv0I6qehR15fDMpluT9IBiGWsLBfdnu414al5qNM0UrBN+xPX 5kWXZD0R/F4UMbuFuJjm49benOS9ws2em1ln3f9hxGY5WOqLDEgbaLwDBsXTjLUNpD6icH26dMV NeaF4gii5zGT0IzHsjPed7q8mfZzT/+l1ilfJkjlI9KZsilg88yA/lUAva1BHqTynw== X-Google-Smtp-Source: AGHT+IGvcnFycQQ+MA4T/mqzvg5WJga+EiuJJvKuRerbPrC+Ynhn7kdBWW+6S7LFCffDmzCAKYbQwg== X-Received: by 2002:a05:600c:4f15:b0:439:4c1e:d810 with SMTP id 5b1f17b1804b1-43999b0283amr4460925e9.9.1739896017978; Tue, 18 Feb 2025 08:26:57 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439941bd54bsm23652215e9.11.2025.02.18.08.26.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:26:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 7/8] hw/xen/xen-legacy-backend: Remove unused 'net/net.h' header Date: Tue, 18 Feb 2025 17:26:17 +0100 Message-ID: <20250218162618.46167-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-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=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 Signed-off-by: Philippe Mathieu-Daudé --- include/hw/xen/xen-legacy-backend.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h index e198b120c5d..2d0cbfecade 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -3,7 +3,6 @@ #include "hw/xen/xen_backend_ops.h" #include "hw/xen/xen_pvdev.h" -#include "net/net.h" #include "qom/object.h" #define TYPE_XENSYSDEV "xen-sysdev" From patchwork Tue Feb 18 16:26:18 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: 13980243 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 68C94C021AA for ; Tue, 18 Feb 2025 16:28:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkQRA-0005bo-0S; Tue, 18 Feb 2025 11:27:08 -0500 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 1tkQR8-0005Yu-IP for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:27:06 -0500 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 1tkQR6-0000oT-Pn for qemu-devel@nongnu.org; Tue, 18 Feb 2025 11:27:06 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4398e3dfc66so16163555e9.0 for ; Tue, 18 Feb 2025 08:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896023; x=1740500823; 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=C8Njo+qOXhV4Sx/ta7KiauuSaoi71X4Ex5TI1JyVyyI=; b=JJlkYZjDHy1SyWYNS0ofTXuL3jnbHk9TyGp+zaNdP+RZnPMhUf9uF9vncrgpTt8293 jrNPP78tE9nFy66qTC6ONF8xRcNDNQuv0azituwdkofRsH1QR0ENwxD0t2ud1eA8/ox5 P0hYjnKwlxfMPMWT6j/0JEgxcmkfUAQHhoOJ1CftW3FhqwhcpjIFKFB22p8SDRyX0K6o MXAdmT2PYpCdwWlyJqFpgwLxaCPetRfUk06OgfxE4ErFC6oj/f+aE4lyZsSmP+6GUlHE PHOACDuDDZPSuyALXI9/fKzuQ3y+W/uj36+NTVTk1aM3imZX9rntSY38g4WUezERfzL7 DeZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896023; x=1740500823; 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=C8Njo+qOXhV4Sx/ta7KiauuSaoi71X4Ex5TI1JyVyyI=; b=uxJlYv7mO46OkVTBVMVA9soUKCP1bHtaP7pjDzfkAJtdvRy08A0lg47TQ0YNdr4x1L r25aRSXyscjb4VwSdLZ4FSkIsaDmvmaeX0cqE0bmhzAYW2YwJRArSh0k12+jFohoWxaW vudkatD92Aq4KrayDX5jX+xk9upVuEtlh8Tttah91zjiIqqcoMFW5slGfExtbbid/SOJ IV6F3RHXqcy7+qaFPMCGlPA1OkwhNRyGVjSkmHy7BAZZQP767fB/CNiZQeVR361GFHRG SyD/TIVpsj6PF+3LnRmm35VDzuYx0wdjp/buomvuGbG8YOv/hFHWARExwAb7CTyoYbgL tV3g== X-Gm-Message-State: AOJu0YxxZKFzHbec582wo2NkPNhK1IA/ytI2Opi1ksmPY6u2u+wKvYX7 gvuPpp4Z7l/ZaQ0WTmGIeKweUsNEE8IPiuXrKXoOmbaQh5TtmDuKOSukTip0QaLDG4pyS2F5etb PN3g= X-Gm-Gg: ASbGnctWUbX9FA9eZ8sRKS1dUYseiVtYVmaz3Tblww1mQxKMds2aKXmBsi7zNcWFUBm snPtbqqE4oKwZn9AvkoMNgTfOmDwzgAaj7w4rewcrqgW2bRFNlpC8WFzwQK6kn23gFSWvgIchp6 eFYsbKLsxQ58jn8AVASHmK/E3XCSrN1vo9BeV1wI07EYRyfbr6eI/5eshPU2t+ItYSvk3JBvhro Igbp3Hu1f2nrDS7Am4XDzA5Z2U7aGcI4spexexBmNPJoiaC9d7c5eBL64hQwV8kS4yR9r7aAKSI VROnE2GPUSPh7wOnpvyCvWRxrm5GVBh7m8k8HwTvCZ8wwWDf3RWsueHM3LCDof1Jeg== X-Google-Smtp-Source: AGHT+IHNicWVQy20xmctK+WaMFhMn6/Qp3O5JrlTfAC9l8cTOsGhr1pxbbnLyADgvxXG36sDv5n1uQ== X-Received: by 2002:a05:600c:4f55:b0:439:95b9:91fc with SMTP id 5b1f17b1804b1-43999d8b49dmr3064455e9.12.1739896023034; Tue, 18 Feb 2025 08:27:03 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4398a44264csm48848305e9.25.2025.02.18.08.27.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 08:27:02 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Anthony PERARD , Stefano Stabellini , Paul Durrant , Andrew Cooper , Juergen Gross , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , David Woodhouse , Vikram Garhwal , Thomas Huth , Jan Beulich , Marcel Apfelbaum Subject: [PATCH 8/8] meson: Remove support for Xen on 32-bit ARM hosts Date: Tue, 18 Feb 2025 17:26:18 +0100 Message-ID: <20250218162618.46167-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250218162618.46167-1-philmd@linaro.org> References: <20250218162618.46167-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=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 Per Stefano: For ARM 32-bit, I do not think we ever had many deployments, as most are 64-bit. Even when there are deployments, they do not typically use QEMU, as QEMU is less important for Xen on ARM compared to x86. The QEMU project only test to cross-build Xen on Aarch64 hosts (see 84eda110792 ("gitlab-ci: Add Xen cross-build jobs"). Since 32-bit host aren't tested, simply remove the support there. [*] https://lore.kernel.org/qemu-devel/alpine.DEB.2.22.394.2502031438170.11632@ubuntu-linux-20-04-desktop/ Signed-off-by: Philippe Mathieu-Daudé --- While apparently running Xen on 32-bit hosts isn't straighforward anymore (see [x]), we don't need to remove it ASAP, it is already in the deprecation queue since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"). [x] https://lore.kernel.org/qemu-devel/173d18bf-f68c-4bd5-b822-abb1c1f0c51b@suse.com/ --- docs/about/removed-features.rst | 5 +++++ meson.build | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index c6616ce05e5..f6ea53acc8b 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -969,6 +969,11 @@ MIPS "Trap-and-Emulate" KVM support (removed in 8.0) The MIPS "Trap-and-Emulate" KVM host and guest support was removed from Linux in 2021, and is not supported anymore by QEMU either. +Xen on 32-bit ARM hosts (removed in 10.0) +''''''''''''''''''''''''''''''''''''''''' + +Untested for more than 4 years. + System emulator machines ------------------------ diff --git a/meson.build b/meson.build index 8ed10b6624e..7b80d8dff09 100644 --- a/meson.build +++ b/meson.build @@ -308,9 +308,6 @@ if cpu == 'x86' xen_targets = ['i386-softmmu'] elif cpu == 'x86_64' xen_targets = ['i386-softmmu', 'x86_64-softmmu'] -elif cpu == 'arm' - # i386 emulator provides xenpv machine type for multiple architectures - xen_targets = ['i386-softmmu'] elif cpu == 'aarch64' # i386 emulator provides xenpv machine type for multiple architectures xen_targets = ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu']