diff mbox series

[PULL,18/49] kvm: remove unnecessary #ifdef

Message ID	20241211162720.320070-19-pbonzini@redhat.com (mailing list archive)
State	New
Headers	show Return-Path: <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org> From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 18/49] kvm: remove unnecessary #ifdef Date: Wed, 11 Dec 2024 17:26:48 +0100 Message-ID: <20241211162720.320070-19-pbonzini@redhat.com> In-Reply-To: <20241211162720.320070-1-pbonzini@redhat.com> References: <20241211162720.320070-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.472, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Series	[PULL,01/49] ci: enable rust in the Debian and Ubuntu system build job \| expand [PULL,01/49] ci: enable rust in the Debian and Ubuntu system build job [PULL,02/49] rust: apply --cfg MESON to all crates [PULL,03/49] rust: allow using build-root bindings.rs from cargo [PULL,04/49] rust: build: move rustc_args.py invocation to qemu-api crate [PULL,05/49] rust: build: restrict --cfg generation to only required symbols [PULL,06/49] rust: build: generate lint flags from Cargo.toml [PULL,07/49] rust: cargo: store desired warning levels in workspace Cargo.toml [PULL,08/49] rust: build: move strict lints handling to rustc_args.py [PULL,09/49] rust: fix a couple style issues from clippy [PULL,10/49] rust: build: establish a baseline of lints across all crates [PULL,11/49] rust: build: add "make clippy", "make rustfmt", "make rustdoc" [PULL,12/49] rust: ci: add job that runs Rust tools [PULL,13/49] rust: fix doc test syntax [PULL,14/49] rust/qemu-api: Fix fragment-specifiers in define_property macro [PULL,15/49] clock: clear callback on unparent [PULL,16/49] clock: treat outputs and inputs the same in NamedClockList [PULL,17/49] clock: inline most of qdev_init_clocklist [PULL,18/49] kvm: remove unnecessary #ifdef [PULL,19/49] arm: Replace type_register() with type_register_static() [PULL,20/49] hw/block: Replace type_register() with type_register_static() [PULL,21/49] hw/net: Replace type_register() with type_register_static() [PULL,22/49] ppc: Replace type_register() with type_register_static() [PULL,23/49] hw/rtc: Replace type_register() with type_register_static() [PULL,24/49] hw/scsi: Replace type_register() with type_register_static() [PULL,25/49] hw/sensor: Replace type_register() with type_register_static() [PULL,26/49] hw/usb: Replace type_register() with type_register_static() [PULL,27/49] hw/virtio: Replace type_register() with type_register_static() [PULL,28/49] i386: Replace type_register() with type_register_static() [PULL,29/49] target/mips: Replace type_register() with type_register_static() [PULL,30/49] target/sparc: Replace type_register() with type_register_static() [PULL,31/49] target/xtensa: Replace type_register() with type_register_static() [PULL,32/49] ui: Replace type_register() with type_register_static() [PULL,33/49] script/codeconverter/qom_type_info: Deprecate MakeTypeRegisterStatic and MakeTypeRegis… [PULL,34/49] qom/object: Remove type_register() [PULL,35/49] bql: check that the BQL is not dropped within marked sections [PULL,36/49] rust: cell: add BQL-enforcing Cell variant [PULL,37/49] rust: cell: add BQL-enforcing RefCell variant [PULL,38/49] rust: define prelude [PULL,39/49] rust: add bindings for interrupt sources [PULL,40/49] rust: add a bit operation module [PULL,41/49] rust: qom: add default definitions for ObjectImpl [PULL,42/49] rust: qom: rename Class trait to ClassInitImpl [PULL,43/49] rust: qom: convert type_info! macro to an associated const [PULL,44/49] rust: qom: move ClassInitImpl to the instance side [PULL,45/49] rust: qdev: move device_class_init! body to generic function, ClassInitImpl implementa… [PULL,46/49] rust: qdev: move bridge for realize and reset functions out of pl011 [PULL,47/49] rust: qom: move bridge for TypeInfo functions out of pl011 [PULL,48/49] rust: qom: split ObjectType from ObjectImpl trait [PULL,49/49] rust: qom: change the parent type to an associated type

Commit Message

Paolo Bonzini Dec. 11, 2024, 4:26 p.m. UTC

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/kvm/kvm_i386.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index 9de9c0d3038..7edb154a16e 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -13,8 +13,7 @@ 
 
 #include "sysemu/kvm.h"
 
-#ifdef CONFIG_KVM
-
+/* always false if !CONFIG_KVM */
 #define kvm_pit_in_kernel() \
     (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split())
 #define kvm_pic_in_kernel()  \
@@ -22,14 +21,6 @@ 
 #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  /* CONFIG_KVM */
-
 bool kvm_has_smm(void);
 bool kvm_enable_x2apic(void);
 bool kvm_hv_vpindex_settable(void);