From nobody Mon Feb 9 13:59:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499239419956467.32130864661406; Wed, 5 Jul 2017 00:23:39 -0700 (PDT) Received: from localhost ([::1]:44521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeew-0003Y0-NA for importer@patchew.org; Wed, 05 Jul 2017 03:23:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeWZ-0004OE-U6 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSeWY-0007US-Fj for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:14:59 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSeWY-0007Ti-7x for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:14:58 -0400 Received: by mail-wm0-x243.google.com with SMTP id p204so30533812wmg.1 for ; Wed, 05 Jul 2017 00:14:58 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y35sm22202793wrc.51.2017.07.05.00.14.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZXrOjnyj09B6R9L4/7BvrpuNYi8UPSKMH5JN7Z3j57Q=; b=cbzUAexmMJvrfTfTzWRd9zYNeoF/SLewtsUEuXpZOxiymqNlKKzetIEhxAnEpXVa0e YlJaeflWSVQt9t9RiAwtItgUo+zhaNHI/4fWpOjiDm7psSU+60xQ7IbF3CVnhcWO7aAB HnDSdaCWCyY5gDxWBPveny/sXVopkXNGiBp6HUS/yySfVI9lttKbVW+ThsdtHHG8Vvjy IzPd3K7sv4FOdwn2mRHAp0FCWnZK2Of2r76HFAPYf6pvQMF+NUKqTQGuZKmsydbhk4W6 rpAN6YqI4Xf1adAQRtQSU/PPhVeWS7IaDQ8daLmGKV93R5ShVI6Sf0c33KKTvoevjj23 pLeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ZXrOjnyj09B6R9L4/7BvrpuNYi8UPSKMH5JN7Z3j57Q=; b=P9hzEdh3+8yaL64eJMdbORkby07zLe1uUPSzszNzgWSmQHOzjO0+zAzLDdIPL2OyY9 v2WyLeDn0ReZqFbJZ+eBLN3rdGp/xgiFqKkIZBTLekn4Zn1UISkBsAUp1CS+n4iDqXaw brnhRrUa+pYZ7+ADgb3SlcvJjXvbQGPIIUH3F2RM+KwBkJYHgaaxGiWFuXRgju5/pJ3z AK5Z6IekuPTjZCCFXWvqmPCiz2nNj6Ki1kmLNytq10dJx6Z9s918PQfMMwnu7xVnQ0AH E4/RH1WlHQcB7ANMH249by4JVnytB01LKCxO+uHd0rJNrAGZn0bbwm2ukLUjTOsj4WPW GrQA== X-Gm-Message-State: AIVw113GFtLZDH2AB3mYqK6uyHHI9h/4Wzyod7Kl5qWHMORTSV//X2t0 hz2LThbaCU22fdiVNm8= X-Received: by 10.28.101.6 with SMTP id z6mr8641247wmb.99.1499238897101; Wed, 05 Jul 2017 00:14:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Jul 2017 09:14:10 +0200 Message-Id: <1499238885-26161-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> References: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 07/42] Move CONFIG_KVM related definitions to kvm_i386.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth pc.h and sysemu/kvm.h are also included from common code (where CONFIG_KVM is not available), so the #defines that depend on CONFIG_KVM should not be declared here to avoid that anybody is using them in a wrong way. Since we're also going to poison CONFIG_KVM for common code, let's move them to kvm_i386.h instead. Most of the dummy definitions from sysemu/kvm.h are also unused since the code that uses them is only compiled for CONFIG_KVM (e.g. target/i386/kvm.c), so the unused defines are also simply dropped here instead of being moved. Signed-off-by: Thomas Huth Message-Id: <1498454578-18709-3-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc_q35.c | 1 + include/hw/i386/pc.h | 13 ------------- include/sysemu/kvm.h | 15 --------------- target/i386/kvm_i386.h | 23 +++++++++++++++++++++++ 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 1523ef3..8f696b7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -36,6 +36,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/xen/xen.h" #include "sysemu/kvm.h" +#include "kvm_i386.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" #include "exec/address-spaces.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 233216a..f48d167 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -20,19 +20,6 @@ =20 #define HPET_INTCAP "hpet-intcap" =20 -#ifdef CONFIG_KVM -#define kvm_pit_in_kernel() \ - (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) -#define kvm_pic_in_kernel() \ - (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) -#define kvm_ioapic_in_kernel() \ - (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) -#else -#define kvm_pit_in_kernel() 0 -#define kvm_pic_in_kernel() 0 -#define kvm_ioapic_in_kernel() 0 -#endif - /** * PCMachineState: * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 1e91613..ca40b6e 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -22,21 +22,6 @@ #ifdef CONFIG_KVM #include #include -#else -/* These constants must never be used at runtime if kvm_enabled() is false. - * They exist so we don't need #ifdefs around KVM-specific code that alrea= dy - * checks kvm_enabled() properly. - */ -#define KVM_CPUID_SIGNATURE 0 -#define KVM_CPUID_FEATURES 0 -#define KVM_FEATURE_CLOCKSOURCE 0 -#define KVM_FEATURE_NOP_IO_DELAY 0 -#define KVM_FEATURE_MMU_OP 0 -#define KVM_FEATURE_CLOCKSOURCE2 0 -#define KVM_FEATURE_ASYNC_PF 0 -#define KVM_FEATURE_STEAL_TIME 0 -#define KVM_FEATURE_PV_EOI 0 -#define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0 #endif =20 extern bool kvm_allowed; diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index bfce427..1de9876 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -15,6 +15,29 @@ =20 #define kvm_apic_in_kernel() (kvm_irqchip_in_kernel()) =20 +#ifdef CONFIG_KVM + +#define kvm_pit_in_kernel() \ + (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) +#define kvm_pic_in_kernel() \ + (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) +#define kvm_ioapic_in_kernel() \ + (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) + +#else + +#define kvm_pit_in_kernel() 0 +#define kvm_pic_in_kernel() 0 +#define kvm_ioapic_in_kernel() 0 + +/* These constants must never be used at runtime if kvm_enabled() is false. + * They exist so we don't need #ifdefs around KVM-specific code that alrea= dy + * checks kvm_enabled() properly. + */ +#define KVM_CPUID_FEATURES 0 + +#endif /* CONFIG_KVM */ + bool kvm_allows_irq0_override(void); bool kvm_has_smm(void); bool kvm_has_adjust_clock_stable(void); --=20 1.8.3.1