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: 13980230 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 326A6C021AA for ; Tue, 18 Feb 2025 16:26:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.891995.1301006 (Exim 4.92) (envelope-from ) id 1tkQQa-0004Gt-0B; Tue, 18 Feb 2025 16:26:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 891995.1301006; Tue, 18 Feb 2025 16:26:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQZ-0004Gk-Sx; Tue, 18 Feb 2025 16:26:31 +0000 Received: by outflank-mailman (input) for mailman id 891995; Tue, 18 Feb 2025 16:26:31 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQZ-0004Eu-4w for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:31 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 19b4f6dc-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:26 +0100 (CET) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-38f3913569fso1792704f8f.1 for ; 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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 19b4f6dc-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895986; x=1740500786; darn=lists.xenproject.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=MNM3C2mRRQlgmw7IeNslgbCmnw++T1QbAKgssmDKig/oOaKEJVToEYVXYA07d82DR0 OHU2QNKti/s0uCJjkRLJXYZIhankfhF4ukEK7+y3QCqI38j/IQ4TK6lBFf8sPZpD8zvx aVSYXDy9xGHzkzNGVxzt2n7zSr1PpuAqsalr9lrzuBWDPwYhSzw7HXWQq9GaE9j30ZiI qiQ8Eq/9lXU9MThcRtD4SibZ3ukW5LdUDWRMWJjG0RX9hVErG6DONylD/myF/CdEel+y zfQgbMDVfBvC21EqKb63LlsR5WxxA5Xxz3ttsxYwHaMnNUC63hDJSPmNPcn7fmjJucmK 2Npg== 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=B2SftUxvKT3uNfdx3cRdTcQLM2duY554uG0qzmVIGF/WVTj+gN4WDoHtb2VNu+nzIg rPqE+dw33NJESOq20YUReZ/WtfjeSMC24UzK8mPQ/QPnLKfbsPlPKqGQ3DTAoHKjZOF1 Oscvm22UDgSCQfVbXYv0TTNsJFkcxkrAncBh4FRY4ipQMHlF8a7E80ewnIihVy9qBhbt kDWP8rW6EiyJ9FGS8RA8a5dpvyZIDERFS0BlFmYxSOPPGV6gHqFbxme/xvhAnTuQapu7 M6xV4W31hgRlTIImpobSYlHNlMwn3L+HLMgwixVqTldzyig7maQ26xslZBbZHfjDdFza nRLw== X-Forwarded-Encrypted: i=1; AJvYcCWl7VYIm3Clb//2cG5qRktwgVwBLWuA38T2sXLTWkhIOeTc6bhhcl1jJDtPYujOcYU25/GsPY2TMko=@lists.xenproject.org X-Gm-Message-State: AOJu0Ywx0fY7VK8ayF7B0OQaR+6mNSWZRu9u/i4lkmhy6Cp7aa6jZ4In 3mads/HjHglTM3oWKCFE/HcGy1jyXHI2KSTfPZDxhx0+dVFYrMgCTRVLr1I1p8M= X-Gm-Gg: ASbGnctfy4PKJuA+HtiE9KIMXGPLNgCAUr20wJdJcHChhFrE+vmFqZp356zhI5gKeP1 Xw+ysJmKNueCzL3uLKel2Hf08cVCehb1nis4CFKhG49nOM4wpOY3MeKXdHX0Uj8PNdeTHhQOyVx LKb2HWfh6hhPzuzfg8oaUofu+Yr0kp5VCJjW6lAGLd0Y5fg5TqUOxwRlmfKjEs5IFHFa3BbxdvO 3zH2sUxpmsP6WH/VaFYhUhUTBgMduxIc9EERBavWz7NlvG8Sp3qUQg+Oi00OBTXKjLBBdvCdK5S 590vRbz/hAHzsX7jBuv9s0qPpQvWceX6hV8erq2pCoHkqVWWv2vMVAkveewQTELETQ== 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) 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 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: 13980231 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 3644DC021AD for ; Tue, 18 Feb 2025 16:26:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.891996.1301016 (Exim 4.92) (envelope-from ) id 1tkQQd-0004Wk-6w; Tue, 18 Feb 2025 16:26:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 891996.1301016; Tue, 18 Feb 2025 16:26:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQd-0004Wd-43; Tue, 18 Feb 2025 16:26:35 +0000 Received: by outflank-mailman (input) for mailman id 891996; Tue, 18 Feb 2025 16:26:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQb-0004Eu-Bi for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:33 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1ccbd521-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:31 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4396a24118dso42201885e9.0 for ; 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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1ccbd521-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895991; x=1740500791; darn=lists.xenproject.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=ypBtCKv9yB9Y5HmWlMr3pV9Z5eXTwJBseftpHpcn+1Z/daw/PfB2P80H8Ksnk90ZvJ V837iOoRF20BRkJRQL5cGbphlXDe92NIPfRnBvs5UHnbamoCbF62rXvn+E/hwtbD7ro/ sF7TLi8fvlRfWGwp2LMWC0+Zmwp4D505wGnodCtNsJVAq9N9O6Cry9vyKEa9PNDYoF7j WNMfEmxqvcts5BdoWYOTEshO539TU7dqm9zywv8Bgqr99VjsuQZUxT0S8wOZh4AaANmp a2xSZL0OPA1tg1ZCSJN+eP6Z7tDmlJ6UvBwouVIeo8PE3cppXh6YLb1zgapicqYBzmwo JakA== 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=L/J+AZNKsWmXNusHRv+LyPvbJBnEvqe/gmahmlIrrm161BkIJ2CwhlMik0pk7fUzZq RymsoQoKCpNzbmrg+QWZv/DbbqojnobeUh5YDFwl1mo5mET+YLU/dSHzdBuYf7CUUQ24 LlNd2eiC49y63DhQiHojFVRMnnMJNGL9SjQJEbiUyg0wrMToNI0IniZo9p+4tKrMjFdb VWFtoAAYLpK7lRPCRx0UOycl9SIbD/N+DNS5jAoiIn1nsmRJ831hiU9HiJm96qOyfZpZ DJlfkWOUNCI7069wJ+Qv+ctZHrhYZIG/8jaTWVxVCIy/2dpTXuSYKJKvx3pDp7IZxhi7 FpBw== X-Forwarded-Encrypted: i=1; AJvYcCUDEZilh6hqw1ROmNZxFLdT6KeFJQkyLLRWdamcfMHH3ndIp8pxYdvAL5BycpNsUbckzelYozUh7Z8=@lists.xenproject.org X-Gm-Message-State: AOJu0YxYk33CUVnbcfaoRYTR4+8/hwfgKrpj+UIKE7p/YIPVW0FDGWY7 hhVbSIUxnFLlvTRefJln7Dl4C57O9qkvOHGESptky0+eoYJH1ApLrukn5ltXfj8= X-Gm-Gg: ASbGncv6psxev2a/Dl3fj1EX6rjzeA+hDCnD7/m3qqZ4v9AMTLvYoLNLR2mfixd2/Uv cYfYCRh6Pl99tF+prBQbqoVGnxx4f+Hrh7UHh8pMmcOmBTCYU5cDqUWRH20aRAfZ8sTg0SvUKQR Y7rn1pIQxDqN5FUnmz4dNoCybzWrZv5LrfrccCS76tth4irqwor/hlPuNESpsAA4nh2X4KfHZtY rECXwU+8XAL0DB79hJEdiu8qN5e06EHi++K7n4hrYHPnJ3OqXEZfbAgp18gbc1VG+0BAuZCh2U4 lX6yYpd0lx/W7Img8w+p31sjnoZREK2wa2RQyPb0kBIl0XrHUczGVcysF2EvGj7xKw== 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) 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 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: 13980233 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 12A49C021AF for ; Tue, 18 Feb 2025 16:26:50 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892000.1301026 (Exim 4.92) (envelope-from ) id 1tkQQi-0004tH-Ea; Tue, 18 Feb 2025 16:26:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892000.1301026; Tue, 18 Feb 2025 16:26:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQi-0004t6-AI; Tue, 18 Feb 2025 16:26:40 +0000 Received: by outflank-mailman (input) for mailman id 892000; Tue, 18 Feb 2025 16:26:39 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQh-0004Eu-1q for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:39 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1ff44b29-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:37 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so15158555e9.1 for ; Tue, 18 Feb 2025 08:26:37 -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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1ff44b29-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739895996; x=1740500796; darn=lists.xenproject.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=jTGDLGt2dd80lsvN+Mw5Xl/dFh2qz1sg5AwXP8en6ce5NSCm458C3cPi4Qkepx7KCB B+10QLjM7rOYeFsJBTa2WhRHwhJ+4RWW83XOomrYRIom//piUS7I8Z8rtVLN+Zd+OOur lG5bzFOp/hq1ZRIWnaJAfZE9qvouSAxJkNnvCRt8KgFK7Ck48ukozTXv4cQ33rW4T4bU NaEQ52uMuYJNRQc+zuuPAK4+vFxzhAKNE1C4Hc3V6ufA6BLNOh88hVcydC0MFX0hYBC4 ZbJGxHLXHBGy28GvdFChqRb1TjYsos+IonNgdKriYhQMbZp9Jqyl2J3utDIkXq9P/ewW dnEA== 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=pqTMfVFN9ZRAB1pP3/gQaj3GC3JjFV1V0VNgF6kUyB2VaT5SBIC713m4riJnyuct5L /S69pnyAiXF07diPZQk/OlQ5qBMqs67WlbNDBgLInGgwGG0F8oau/woZxy4oNzlJgRv7 p6EQ0prOpYCvr8uzmALGLSXOQwx7rpbdMJaliXOEkmCS4DyFKaPQjayOcTYq+WwqXjBq NqMnbV3WfIjNwxQfZje9aE05Pf2qPTyz5Ynnow2mrM/V6R7+YY3vWCCVsluutJUKkwE/ QCnkgnG5eB1gyzFe9tfbaAK9y/7JUbJsnI6lHjT93AW5YQ4lRhDclGr++xRK2PR4X2+F U9yQ== X-Forwarded-Encrypted: i=1; AJvYcCWNb4OcHLjhaaVxF5JgtBdqAfJSuguVueH0U8i6GK4H2hAwsD6UznYZnwaAMUsuawBPB6Nmbu2DBd0=@lists.xenproject.org X-Gm-Message-State: AOJu0YxjOdPe6QSNAnQBcllIXz6XIEi0KOhcMkGTGVELzKHCow52cQsp yoeL9iU/YOe20X0tX5rvXBPaxXhdtvkyTz0sTYAYeQOxF+OtBADDf+G4g1kcit4= X-Gm-Gg: ASbGnctvyu/hoFi1AQOyHIlB4VOenPwm7GR5LVjvsWo6/C7DPQt40jArLL7m3VdRW7r nf/wwpjJmGUQzqNMFq7G4zlB+5FO1g/PdzdlJV8yjOarNaML6grCefDhs9Wj7++valYW3TJTxfK kQ8utWTT1vjwm89QeF4wzSaM5+yIzFV9OoX4im8maKqv59mUZs9iisD9HschL3Bbx1xM7jIEDQG ZOLrObLZYa7mr54DE2FoJFXZzYxswkZ35h20xlE7blAxWquQV31tRbD+BvrXo6M7xWZel4VHZ2H YkpjUs3TeJaX4Wsjv18XIhwcXF0LaEqF4EPoIErfImTeYYuLz/4x5FxmEd5TFELtRg== 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) 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 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: 13980234 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 045E6C021AD for ; Tue, 18 Feb 2025 16:26:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892004.1301036 (Exim 4.92) (envelope-from ) id 1tkQQm-0005Eq-MQ; Tue, 18 Feb 2025 16:26:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892004.1301036; Tue, 18 Feb 2025 16:26:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQm-0005Ej-JF; Tue, 18 Feb 2025 16:26:44 +0000 Received: by outflank-mailman (input) for mailman id 892004; Tue, 18 Feb 2025 16:26:43 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQl-0004Eu-Sz for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:43 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2308296b-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:42 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-38f2b7ce2e5so2338595f8f.2 for ; Tue, 18 Feb 2025 08:26:42 -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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2308296b-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896002; x=1740500802; darn=lists.xenproject.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=dpNjiOScx02LTjn9jwtoA3nc+FfVTHweCrBbrXN//oVV+YAx5BpA+QNSY50cr8eYwe cEUVWzRBHlpwsD9fB9jWex1GG3OMndQo15TsHdOFdQ7JcQQhm39GCIB/xKcSo+4Yln6h Xbv6nRI5e/aL7yixFVFZy8sKwPYtSdq7iR3YLa8cf7LcLW9Emeyie/Wac/1K4V99ZaIb yXjshQA/0QF3YkKo86zk/YW1akMfUDSVA7hMINyRBiHy/pWG5cXIdeVdSeG0YoE6Dc83 ZLDps494ldOG6JNZMMvW17/3QE2xknMSQnK0eZs46R3uOKFZaa6TDtMwAJnuKIM3ScIQ RwWA== 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=iTYIzBSKaaXryIxEsm/AV0pzkKS1G0pQAZeAt8pDfNS0jDzulvWBgHrZUL48pDjf0p OLeJlnsnjd4kw1DlZfLr/9AWHVDlbiTt08g4Q6uw4g9RFjllj83GgC3tgzUVeS6HuPmX l2JrCKgU44hslGp+Wz/B4qSegeAJ3lPbnHAAohTauWr2rZBLLItPlrBJFSvjIBrqVG/P LXZYwoALX0punCArJ1VSd/ScO9iee4gk1vWmZGlqGfMpNXnj+KuhdXgGwtJRzJ4wgJeC 0VhMuX22FRRdeHMqr4va+PkUIKf7DX4tvCw3gfNqfo0zVhvD0wuZ1rHagi1qly6HpSyI mkQA== X-Forwarded-Encrypted: i=1; AJvYcCX4zdbiLvRtB9v/JeCXHRa1ll98TjYkkXP76pfHHzW5Y/KMrPjyyVrHEGlwC/5s5U6Jp4HJzWqnb6E=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx/CVBFaa2xpSGakd0A1LsZFj06ayTBFPVmiCzRakB5p4xy0vKe egEscNBy+KZDO+IFKX4xArZD7OBB7D8qs3S0l0yHyJItTwGkXMwQqi2XrwEsKvs= X-Gm-Gg: ASbGncvL25Zi7oZgXhGtmO+lmDBPYXovLtXyzGEk/dqHy7CwEfxzq7eA14l7ayKawZf fQtK2m530PUSMzHj2u6Erx5Dnakv6SWitTkamHoJ1VJLBX5p+jzJKBc2D1S9WKToj07fDuaotwb RKBUqJy/gEAcx8CIuK+KAAZh0DetZBv3lrNh9ZS8V4g2Qmk0/W+d+DlkqZEAFF2Vs7WHwHsOJhE bK6Dsboy2I67GB+cACEfEkvqTcAfcDOEWaFBx47+qK/161H++JkT5bsdw4hA02G+LFZAwmamdrZ zm+9SyhEJUgcYArGfkqkhtDAS8Y8WFkJqrByPiMffPjusMco7AlV1qmpw711frdQ4g== 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) 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 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: 13980235 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 B5B07C021AD for ; Tue, 18 Feb 2025 16:26:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892012.1301046 (Exim 4.92) (envelope-from ) id 1tkQQs-0005l4-4k; Tue, 18 Feb 2025 16:26:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892012.1301046; Tue, 18 Feb 2025 16:26:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQs-0005kt-1l; Tue, 18 Feb 2025 16:26:50 +0000 Received: by outflank-mailman (input) for mailman id 892012; Tue, 18 Feb 2025 16:26:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQr-0004Eu-5g for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:49 +0000 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [2a00:1450:4864:20::334]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 26227fb8-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:47 +0100 (CET) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-439946a49e1so6551445e9.0 for ; Tue, 18 Feb 2025 08:26:47 -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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 26227fb8-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896007; x=1740500807; darn=lists.xenproject.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=znvXKY1GINt8oIWo3Pmuo5lViy3vnfUzrUnnEP7BrqX/BR5+HIlr4MH9rmKTHN3YYy UdCNJzf3cYn84fHiB9TNItb7wZLUjo0Y/cv/YxBP9kbu8UOd1y8bvF0ILx/uhYrNRAq0 RBlWoKekFFAr1JEyQs39+c3hFFExdroHp0O65nrZ06/3D0Lw/sDGixHuAfjZJf0o6bd/ EvIk/AvtwJKjILEVIXXDfe94muqdNqbcG+DoYO52jHLFR286OrRP2C7YoLfCLQrV7SWv X5UDIpPvcKeL5ymTMXS2enK/wcZr9iUVOE7Uwoaypq1ZlnDqVnIt2h599CcaJyPomVl1 3pGQ== 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=SGD5NeFHqesV5+JH0lAL3kO7Rge6K/yd1OKt+cWvy5r1Ul24ucRv6IiUObPYvSoofv KnxzuUVcXCRhY2Sr7I8hVXfNhHGdGVjJGsiwP0TcfiEpEnKhFW+egf0sIFOjDzrRZptX DabQRDPoK/GADkzzEh1ax9c821KdZR8xcOs00NFqFqIcXvnt7SgGp1FojfxgFjcUcQxs HHrqRYUiKBZlUkVEpaa9RrByafSrS1XQe9AWrk+jdym6rSlwVZOnP11y/vZbhb6WJ9mv /rTWHtwiDM9Vf9byM2gpl0gHPLNmj6slpmk8s459UFEIrhLOH+chC/TBbQ6ePjM+Tcg6 F2Pg== X-Forwarded-Encrypted: i=1; AJvYcCWJA8Sh+GOuSgsXbQZuIRQcl5kKmoZaS6V2BEo4e0yBx53ecXSJe3Tq1wpVsGsObcJ0pkran518AQg=@lists.xenproject.org X-Gm-Message-State: AOJu0YybzxqLVVw1HPojC+MxxMgnVgXQNAen9J4L0ISZ6xTW3KBYcUgy CL1mqwMneP7V/jHXVJ8JCbreCnaBq0nZFP90a+6izRljShCdrGzEhLbvJzuSKuo= X-Gm-Gg: ASbGncscDshBPAV4uWKpbrp7dVqbxKteqHeyg2kavBWt+v2/8NpqAvk8u4gyAXofiub A8BuUI+0Q5Afp3EmmIQQkxoDt3k05qlLe9CC/rFhRMKiKLFrdlGqn2IkZfzXc7Yd40NgGRF+TBs TK4xlgtc/pCTJ5CyssZ/y0Gk8VFLEJ58Ft0BjN1sQuI+J0U9lOH7oSyrDHBIWncfb73XMvR5L// 2NKZ7SSBK4jSL/+cBqEMRxsWj8tBO5prpAKDn2oMG0vTCPwEU0YfA5R5seFYqZyqAuaGTWSTWs0 vj7SBKMi/pIXrAQMmQ1Z4hnffqommQNv4xS0dbM9aBfn/j5uAOYhXeXeu5Kez5i32Q== 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) 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 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: 13980236 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 F0881C021AA for ; Tue, 18 Feb 2025 16:27:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892020.1301056 (Exim 4.92) (envelope-from ) id 1tkQQx-0006LD-CT; Tue, 18 Feb 2025 16:26:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892020.1301056; Tue, 18 Feb 2025 16:26:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQx-0006L2-9X; Tue, 18 Feb 2025 16:26:55 +0000 Received: by outflank-mailman (input) for mailman id 892020; Tue, 18 Feb 2025 16:26:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQQw-0004Eu-43 for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:54 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 292ea6ac-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:26:52 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43932b9b09aso63534735e9.3 for ; Tue, 18 Feb 2025 08:26:52 -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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 292ea6ac-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896012; x=1740500812; darn=lists.xenproject.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=hDh6SfUi7hYIJGN4xG/4G/OmTM0X3aqarNwmoUDnJSzEagmOoFsAfiiDC1LTSWUhJt 3nfoYiUWstx/n3RNqUzFlbtar54OPLl9KfZz5XgSD9aEORSZzBjvxPgPWyNZZnyNX6WH L1cdJ49+V9AAhic+WKxVEfFeuDdyvWy/kXz+pjtpLS7jFc3Dg09mctO6VcL5YJ+HrnmZ ON1Ec7W7xzMhnc9Yl2IlBm5MR9+SVcC5F3+kVpxdseTd9zYI3uZYUVMVyvTaOLmg5Qvr 8z2knL2R5zw+w2OWbbTpNDdFaQRrmeuyqBwFrGqnqThMowWAfVTEbR4VSn83IdIwdPkq Rk3w== 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=NaiK2ARSuUKmMrF1KnQdW5LFk0Lc5bCbBWaZAD9TuJZHPi3Nbej5ck6MG9o8QIpwAo ay2D1eUhEl3goeVa8uiuSG3+dhCNkstFif3sAQsLxdzK5MMmvmDC0bFez8JDe0h7BpqJ tiQz5PFKwujF0UKMzPxf2Vn+pRfYkIAFS80+wFJ6C8+7o0SNrmqKySy3oRLTsrjFa8j4 ZUSeq/Mncut7p4K96cOrbaicevW6rsBqHaLRBFrZGA0Ql4zR+MEm3e4ohSduGI0cHB7p hKIzIezjxEhEznDoMAGl4soJHeAiJw0Rexqv3mZWe9Rfe/fkTBaBYHHfgLgmdgp1zlNt Uc7w== X-Forwarded-Encrypted: i=1; AJvYcCXGJkO2zZ7cHzDi1Wwj1rdMZgCxot06UJvOkMZOKCgg98U5DS7ZDwKpaX35ffXG/c++9l42yMXO02Q=@lists.xenproject.org X-Gm-Message-State: AOJu0Yzi8/7CzzHi6JyfR7Hhvy0tXe4C9zX44qTLNeyUIkWtTy+kroCW VXqonNetaF09INlZvj+ThaSNby1THws0Caj5dK9T8tR73wGw1za50dkiRC75SwY= X-Gm-Gg: ASbGncvE34YpfTKa1aYZE8TP5yDgm3FuxhV5dZB0SSU2NALweYlbzzUEwSqJMi2ZBat dkr9SyY0GdGgskwagpp4/efEshlPS7vSXZ7zOxGAUSsJWHSwYIzyXWUvt/Cm8voEdsZMfTNuoSU 4BJKvFTxOfPrSYG5AO776DM3QZI2SFtJtWLHl+pp44VTr2uN6D3gyHfEOEQFVwKzrhgCm0FoXz3 KFMswsIxJxscexmsDYC7wOZasBXdPnI/TWmuQg3xKtqYNRbfIb+nGl1Oq//tpoqDJi8xhGHNqgb tVOci9i+3bo/7+jy39DYYxusUmZfTiJwknoKhVLuXckZc7xcDg6AaGQUVyXD93rb3Q== 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) 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 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: 13980237 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 CA07BC021AA for ; Tue, 18 Feb 2025 16:27:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892029.1301066 (Exim 4.92) (envelope-from ) id 1tkQR2-0006pf-Kh; Tue, 18 Feb 2025 16:27:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892029.1301066; Tue, 18 Feb 2025 16:27:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQR2-0006pU-H3; Tue, 18 Feb 2025 16:27:00 +0000 Received: by outflank-mailman (input) for mailman id 892029; Tue, 18 Feb 2025 16:26:59 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQR1-0003yu-2r for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:26:59 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2cbd687d-ee15-11ef-9aa7-95dc52dad729; Tue, 18 Feb 2025 17:26:58 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-439350f1a0bso34734545e9.0 for ; Tue, 18 Feb 2025 08:26:58 -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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2cbd687d-ee15-11ef-9aa7-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896018; x=1740500818; darn=lists.xenproject.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=TCQerYR+4TBAt11bIGDudigKkAKdBszbAUNNh4Cjii5mELuq0vTBgr0Gompb1wyHd0 uFIlFQvhp/BDUFDw7mFms5QqpBASdQRCXaBfFtcK588Se1YCOmaGYULefUgJVIvEJwGN 6SkzThZcdwzepHAz24NZf3krWLNcUufbLtA2JZ5tAh3c4Ko53MXP4Qp0s73d/VT8sUxK 0UKOljPDYyBRgvzUdDExKE7tEop2iNxh+aKGZ6TC0jW7QmKdCFFr4qE8TeLiymHeAPMz ZnHlwkCifDOQ7ZJ2aA7nWKDlbBgNMoJznWxB1G4ma0vZKiUtvyMj/+b6xDojxaJA9agq 2L2Q== 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=YVkDKgVzYgBSN7Oas6CTReSFje8gp5gGh3ZZZhJbj4kfQhxme7W632fJUi2y9WdBud ETQWgD4p2Y/An05kMzd8cclk0m1GlQ7PNhJex8MEQ1V1V/SQyHPwFHNy46y5thE3Pwse IYov/4ue9MXgwGwT7lVm+2DtMUYFATRE4xcTeoORG2XP+pc0NqSzCD70V8tdpHi6HySP RxhzM1e58pm2sHF/Joqlewtsjq6qoXQ4L8w6VUG/Pffbr56emKspY6NiGysTEUdlloI2 CIf4283j3r8WJSqwow7Ymf0C6z+TzTFmJUKviocXki+lagGduCfIjyeEFB1m/KyqLTht rlhw== X-Forwarded-Encrypted: i=1; AJvYcCVfZB/GOEXj6krBzNjvTWq3BodD+UNfhFpI4+xd/N0J30McIuU+px824L5MLoQG+Un6KFwKNh/6I1E=@lists.xenproject.org X-Gm-Message-State: AOJu0YxHWLAf7eQ5bX/FwBZU42ZaJzukO8KisSWYQk+thzbDbq5qIpdg uh3jUCN72dNXPJI6LrbKgdQB8JEYEHdqG/N2FXxJ5pgT6vlayLTwXV9jR91ci5w= X-Gm-Gg: ASbGncsZH/oAES2aQoBTgupjmMayQ4bJROVHOe9E3psfQdt1E1VX0z+/uCza+bwVqDd /yYSWRa0Ihrk5TCCYJ4n2kRmbb0k2oWAtvcQfsLp9bWpOhxlocWOysDI+kFCQoiHLevkIZwQyDY H+mwFjGgWYXEOTnFZavZYd13bezA3vCU8Fv4ntLSSuvMu45tEo0drjDXhj9spceOhKvV0RS4rbg KO402/HaqLBDVuD1GJtcFHVTxtBnG1rZ9BPW5wpH8EIKs7he+hvE+B0YfQ6sHPYisiq7cE7YDGE 8yqxWT0w447qF34jOIY489UNYThpTBNFXLHX8vg6YE+L/gSHe8oK6cT69ZovI3vWKA== 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) 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 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: 13980247 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 271B2C021AD for ; Tue, 18 Feb 2025 16:32:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.892059.1301075 (Exim 4.92) (envelope-from ) id 1tkQWH-0002ze-8B; Tue, 18 Feb 2025 16:32:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 892059.1301075; Tue, 18 Feb 2025 16:32:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQWH-0002zX-51; Tue, 18 Feb 2025 16:32:25 +0000 Received: by outflank-mailman (input) for mailman id 892059; Tue, 18 Feb 2025 16:32:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tkQR7-0004Eu-AW for xen-devel@lists.xenproject.org; Tue, 18 Feb 2025 16:27:05 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2fc91fe1-ee15-11ef-9896-31a8f345e629; Tue, 18 Feb 2025 17:27:03 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4398738217aso20634445e9.3 for ; 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) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2fc91fe1-ee15-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739896023; x=1740500823; darn=lists.xenproject.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=AYtDsKwhxS9Ob8XA4G4+zy8Zub/4CzVT4CajUFgYBDmFWY3dCR2OPt1Ey5dC8il4lW +ZGIRAW2qK/lPmEhjkAixQRUuUM0cwAmeqRJFDybtT3+wIgqL7jPuMKx83glrLIiHP1l eRkELE/QRHgy/BTVnQRwMSzRhFOXGo3688U6QAaOT0jgBG7z9PpjpPWaw01SPSEvCGWk pKsmpZD9vXx3gQWTrKlRA8eOg1/ONE2ewHm7oBJCRpfr530dJEOpNJstN9rYEHSg9gbD zsmy65gqmprtFvAR6MVhZZZUErxDvieAvAuJ1uy7zdtAZ6d4jILFd9/dtSqSaQCeuFuz d7IQ== 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=F8jr+qm2n5bp8AyYWA/wJJ46A3tDGKx2uBY7IGYDti8IFwWrMq0oSLJ8KNlp3SnAh/ j3ELm2Is81dULFLFusJ1jfxYPtPtCn0SlRgGhNAZ4T9/1LziOJ4qJ0VONXy8vT7F4upW TxoDaIoffnESiV+hB7EcjfcmgEYN8BC69ajwxJVNnh40JzrJr5ngAukJOh8NdC5YlKNm SACCV/yZfDKlRwH4+Yh75ZIyZ99oWGiA7+G3dSu2VF37cvN+UV3ljwWh4NFgcPpv4GMO BtXS0n9N95Z3Vom/v9LNqOqLknR4Di3JWiBRpDtYTkS1gMiu4Eyor3WmgbDduCqDX6F4 jX9Q== X-Forwarded-Encrypted: i=1; AJvYcCW//xaSFMvpcPSpfq742w7IoVJpcXz+/hfMu1O2ll9ITXsGYiOH6/Ljg+UJqa7ZUvqbxhqThZVqPNg=@lists.xenproject.org X-Gm-Message-State: AOJu0YwkXnbJcSAyJPsr3iIzEsAT/cGzCKfWsOcyEiLR4FtfOXneLI8C bfBEYvCpCSQGrV3e7pOVCcNbhMlTApA7dq9JmVO+r97X7wxeCm6/wM7RNPyMyjs= X-Gm-Gg: ASbGncuy4VbPRO59bJjs5RwvEHT6QeSRnouXBEUAEo178hYbsK8bG5RjrgPBOnef/hu xV8lUtLgCWLboqO9rgWAj1Mm62tL9/h0AKz0j42sgHRmrVmvCh81MIUKNC0iZh16+iD/SzE4ch6 e6K7Rh+6hc7CEq5pdI7cXwo0QDigFomhWByOvXo80jKZm6d//SVVIZe7+gSdIfYQQHRlNWgoEsb 21UrLSWFeIzjdcux9g+IclHUNM0Wl441+jSjNtcwX3KY0oNnSHP1h4AxMZ9tvBuEQORQvvTWGwd l+KpW2bOOp5o+JqvGRjxxsu4PVRckwR+58R28NwiYd4VvfACdEfRTDfOOtwnLLvM1g== 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) 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 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']