[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 45/51] target/i386: Restrict declarations specific to CONFIG_KVM
From: |
Paolo Bonzini |
Subject: |
[PULL 45/51] target/i386: Restrict declarations specific to CONFIG_KVM |
Date: |
Thu, 7 Sep 2023 14:59:54 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Keep the function accessed by target/i386/ and hw/i386/
exposed, restrict the ones accessed by target/i386/kvm/.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904124325.79040-10-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/kvm/kvm_i386.h | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index 470627b7504..ff309bad25f 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -31,30 +31,35 @@
#endif /* CONFIG_KVM */
bool kvm_has_smm(void);
-bool kvm_has_adjust_clock(void);
-bool kvm_has_adjust_clock_stable(void);
-bool kvm_has_exception_payload(void);
-void kvm_synchronize_all_tsc(void);
+bool kvm_enable_x2apic(void);
+bool kvm_hv_vpindex_settable(void);
+
+bool kvm_enable_sgx_provisioning(KVMState *s);
+bool kvm_hyperv_expand_features(X86CPU *cpu, Error **errp);
+
void kvm_arch_reset_vcpu(X86CPU *cs);
void kvm_arch_after_reset_vcpu(X86CPU *cpu);
void kvm_arch_do_init_vcpu(X86CPU *cs);
+void kvm_set_max_apic_id(uint32_t max_apic_id);
+void kvm_request_xsave_components(X86CPU *cpu, uint64_t mask);
+
+#ifdef CONFIG_KVM
+
+bool kvm_has_adjust_clock(void);
+bool kvm_has_adjust_clock_stable(void);
+bool kvm_has_exception_payload(void);
+void kvm_synchronize_all_tsc(void);
+
void kvm_put_apicbase(X86CPU *cpu, uint64_t value);
-bool kvm_enable_x2apic(void);
bool kvm_has_x2apic_api(void);
bool kvm_has_waitpkg(void);
-bool kvm_hv_vpindex_settable(void);
-bool kvm_hyperv_expand_features(X86CPU *cpu, Error **errp);
-
uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address);
void kvm_update_msi_routes_all(void *private, bool global,
uint32_t index, uint32_t mask);
-bool kvm_enable_sgx_provisioning(KVMState *s);
-void kvm_request_xsave_components(X86CPU *cpu, uint64_t mask);
-
typedef bool QEMURDMSRHandler(X86CPU *cpu, uint32_t msr, uint64_t *val);
typedef bool QEMUWRMSRHandler(X86CPU *cpu, uint32_t msr, uint64_t val);
typedef struct kvm_msr_handlers {
@@ -66,6 +71,6 @@ typedef struct kvm_msr_handlers {
bool kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr,
QEMUWRMSRHandler *wrmsr);
-void kvm_set_max_apic_id(uint32_t max_apic_id);
+#endif /* CONFIG_KVM */
#endif
--
2.41.0
- [PULL 41/51] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel(), (continued)
- [PULL 41/51] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel(), Paolo Bonzini, 2023/09/07
- [PULL 40/51] target/i386/helper: Restrict KVM declarations to system emulation, Paolo Bonzini, 2023/09/07
- [PULL 46/51] sysemu/kvm: Restrict kvm_arch_get_supported_cpuid/msr() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 48/51] sysemu/kvm: Restrict kvm_has_pit_state2() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 47/51] sysemu/kvm: Restrict kvm_get_apic_state() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 42/51] target/i386: Remove unused KVM stubs, Paolo Bonzini, 2023/09/07
- [PULL 44/51] target/i386: Allow elision of kvm_hv_vpindex_settable(), Paolo Bonzini, 2023/09/07
- [PULL 51/51] docs/system/replay: do not show removed command line option, Paolo Bonzini, 2023/09/07
- [PULL 49/51] sysemu/kvm: Restrict kvm_pc_setup_irq_routing() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 50/51] subprojects: add wrap file for libblkio, Paolo Bonzini, 2023/09/07
- [PULL 45/51] target/i386: Restrict declarations specific to CONFIG_KVM,
Paolo Bonzini <=
- [PULL 43/51] target/i386: Allow elision of kvm_enable_x2apic(), Paolo Bonzini, 2023/09/07
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/07
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Kevin Wolf, 2023/09/08
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/08
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Kevin Wolf, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Thomas Huth, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/08