From patchwork Mon Nov 13 15:21:11 2023 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: 743458 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp1677619wrw; Mon, 13 Nov 2023 07:23:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAO62dOR/M3qbgKyzXOMbylR3x3lP1l1LKxR6kVDkMyr3G53ehIuoEE0E1zWbn7l8eeXM4 X-Received: by 2002:a05:6214:4002:b0:671:1d0:d758 with SMTP id kd2-20020a056214400200b0067101d0d758mr8069310qvb.17.1699888985046; Mon, 13 Nov 2023 07:23:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699888985; cv=none; d=google.com; s=arc-20160816; b=jcKqkmVgoblJZjSb5RSYS2rVVcx2D/b4BON8rT1X2lkx11xPgGwZvv70L9zK/IlTLN sFA0V2ZLUeS/HWc6IMcnZj48SEtElNUQNaJfw2Dzmm8uWN2YUblKXHx7D0z2syEiRhla aBkh/yuHoUShADU5D6jeWIfqEKeTYuRGOhXYGETm3uc4To24nd4b9HulNPDWe1ipEDDj M2Egz0RnfYa9KyU46Z5DdUrIWr6RuWOYdIII3cKhd5G2Y8jabaoP1ImNzcmjKtMui8hd v92mHpGjWLEmMq3sOxyE/AQRPNjwOxmEauYq7HbFL72vPk7blG20Kd4xz7c3xqMJXEYE s7vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M3IanRET4oRDB/554uZaBMmk8ZcCL79rxTcGgU2jVuI=; fh=GiBYw8tXOCcndxW9R737jZrIBncGjjApaby5duidRsc=; b=TY9f/jKY+E0ZG5hkjxUNrx9AtX6jd2Qz+Qp2FdlIOQxxjwD8diP6DgwptSWqKO+XVz MCWugP6MipeRSaJjR6DMqaQZTYHJNaP5qIkX0mYM6zLFpEKh7GMJ2iJtf4ffuOmy6df+ DWTRAl8NbUT69zk1VOwc2QdDL9tu8Hf0KPJWsaREcDV/akCDQ3TUJUTpscYp9IKJ/BUw VDnDyGjGKX4wC6oiatnZ9MxqNhhZtkNvR+AR/0xjuWcPZKA7x6RPkniln92Bdai+b3Nw znO+2xGazjRrjorb5DfmYiXk1dRy+cYaS8ZqZusY7YL+klpKiU/EIc27hSzvZ7sX8J1b MYWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zmg2Z92S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b9-20020a056214002900b0066d121fdf87si4762930qvr.206.2023.11.13.07.23.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Nov 2023 07:23:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zmg2Z92S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2Ylb-0002Rv-QG; Mon, 13 Nov 2023 10:22:23 -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 1r2YlZ-0002G9-LY for qemu-devel@nongnu.org; Mon, 13 Nov 2023 10:22:21 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2YlN-0003Kl-4n for qemu-devel@nongnu.org; Mon, 13 Nov 2023 10:22:21 -0500 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5094cb3a036so6294104e87.2 for ; Mon, 13 Nov 2023 07:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699888927; x=1700493727; 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=M3IanRET4oRDB/554uZaBMmk8ZcCL79rxTcGgU2jVuI=; b=Zmg2Z92S+ZAynF5iomHSrDgJJtlXQgUrtUCYMJ0vjXah747IeUFFrnG+m80K6MmTTB GDMmNOj3C+pY/A3RGXvVjzMnqRjdPN099Ast/TTi/arPfr5ChcBEHGOoz+LaR2U5tWPy nQoGRlBsStg0xmpz5WlMN9zzxJ1YoAhTGOiZWq7wCMs0yd3cic+ztoDBzWUXIQYZiuHy EDktE/j0TJ4veZ81zjr0bR5XbJZG6vt1+RQtQ4daf7ujYb9/jah9OZoA+/hVurT89QVT 65Vnb8axpOZ4e3GDZy2aWCl8bnvAwXHDo8ZxxaSVUMFDQhAtKOBA2YgfwqfCsqFCNruu cPOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699888927; x=1700493727; 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=M3IanRET4oRDB/554uZaBMmk8ZcCL79rxTcGgU2jVuI=; b=iJNZwnf0+giQTCm0HmkpkG7nohQir6fT9TVxKzNSNPFmEd9aUwMFBjhBY+A2MBvttv jXO1mhGJzcJCml7aaOR/Pb+e5BVRYh1spqQbiQPDwsK6ZW4zDRbZc5z5KzfuGyKsp3sN BsxzipEH2nsWGxHqV2lddG7zp+AdRjaPcT7WXJesKpyX3ewdhMkJXp9hl01bbmhH2mGR lAi5PHtV3xeZrIW/hqfmgqNNyWTwLN723KMgMVbEbDAP+IF9yfuQNJz/RHtxy28yUuMq EQCBAd/dxItQ2GGHewk6fX6vY276WGh0ssu+YChy4qhkBhQI8yMjGCzylNS/LlRGi9Zu 0KqQ== X-Gm-Message-State: AOJu0YzjAOCGLfWsV9ujqCBVVOza2p2HcT3Z0YRHMPg5GIFNR41ibWw2 aBX7RPp7+PRVG03FmrEYFI1kVA== X-Received: by 2002:ac2:5e6f:0:b0:502:a4f4:ced9 with SMTP id a15-20020ac25e6f000000b00502a4f4ced9mr4406770lfr.62.1699888927362; Mon, 13 Nov 2023 07:22:07 -0800 (PST) Received: from m1x-phil.lan ([176.164.221.204]) by smtp.gmail.com with ESMTPSA id a9-20020a17090640c900b009e5ce1acb01sm4126763ejk.103.2023.11.13.07.22.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Nov 2023 07:22:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: David Woodhouse , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , Anthony Perard , xen-devel@lists.xenproject.org, Stefano Stabellini , qemu-block@nongnu.org, Thomas Huth , Paolo Bonzini , qemu-arm@nongnu.org, Paul Durrant , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , David Hildenbrand Subject: [PATCH-for-9.0 08/10] system/physmem: Only include 'hw/xen/xen.h' when Xen is available Date: Mon, 13 Nov 2023 16:21:11 +0100 Message-ID: <20231113152114.47916-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231113152114.47916-1-philmd@linaro.org> References: <20231113152114.47916-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-lf1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "hw/xen/xen.h" contains declarations for Xen hardware. There is no point including it when Xen is not available. When Xen is not available, we have enough with declarations of "sysemu/xen.h". Signed-off-by: Philippe Mathieu-Daudé --- system/physmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/physmem.c b/system/physmem.c index fc2b0fee01..fa667437da 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -35,9 +35,9 @@ #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/boards.h" -#include "hw/xen/xen.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" +#include "sysemu/xen.h" #include "sysemu/qtest.h" #include "qemu/timer.h" #include "qemu/config-file.h" @@ -51,6 +51,9 @@ #include "sysemu/hostmem.h" #include "sysemu/hw_accel.h" #include "sysemu/xen-mapcache.h" +#ifdef CONFIG_XEN +#include "hw/xen/xen.h" +#endif #include "trace/trace-root.h" #ifdef CONFIG_FALLOCATE_PUNCH_HOLE