ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets 

hvf_get_supported_cpuid() is only defined for x86 targets
(in target/i386/hvf/x86_cpuid.c).
Its declaration is pointless on all other targets.

All the calls to it in target/i386/cpu.c are guarded by
a call on hvf_enabled(), so are elided when HVF is not
built in. Therefore we can remove the unnecessary function
stub.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004092510.39498-3-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-04 11:25:09 +02:00 committed by Paolo Bonzini
parent 6da9447929
commit 044431cfe7
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sysemu/hvf.h
View File

@ -20,13 +20,10 @@
#include "cpu.h" #include "cpu.h"
#ifdef CONFIG_HVF #ifdef CONFIG_HVF
uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
int reg);
extern bool hvf_allowed; extern bool hvf_allowed;
#define hvf_enabled() (hvf_allowed) #define hvf_enabled() (hvf_allowed)
#else /* !CONFIG_HVF */ #else /* !CONFIG_HVF */
#define hvf_enabled() 0 #define hvf_enabled() 0
#define hvf_get_supported_cpuid(func, idx, reg) 0
#endif /* !CONFIG_HVF */ #endif /* !CONFIG_HVF */
#endif /* NEED_CPU_H */ #endif /* NEED_CPU_H */

1
target/i386/cpu.c
View File

@ -26,6 +26,7 @@
#include "tcg/helper-tcg.h" #include "tcg/helper-tcg.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "sysemu/hvf.h" #include "sysemu/hvf.h"
#include "hvf/hvf-i386.h"
#include "kvm/kvm_i386.h" #include "kvm/kvm_i386.h"
#include "sev.h" #include "sev.h"
#include "qapi/error.h" #include "qapi/error.h"

1
target/i386/hvf/hvf-cpu.c
View File

@ -15,6 +15,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "sysemu/hvf.h" #include "sysemu/hvf.h"
#include "hw/core/accel-cpu.h" #include "hw/core/accel-cpu.h"
#include "hvf-i386.h"
static void hvf_cpu_max_instance_init(X86CPU *cpu) static void hvf_cpu_max_instance_init(X86CPU *cpu)
{ {

2
target/i386/hvf/hvf-i386.h
View File

@ -16,6 +16,8 @@
#ifndef HVF_I386_H #ifndef HVF_I386_H
#define HVF_I386_H #define HVF_I386_H
uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg);
void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int); void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int);
/* Host specific functions */ /* Host specific functions */

1
target/i386/hvf/x86_cpuid.c
View File

@ -25,6 +25,7 @@
#include "x86.h" #include "x86.h"
#include "vmx.h" #include "vmx.h"
#include "sysemu/hvf.h" #include "sysemu/hvf.h"
#include "hvf-i386.h"
static bool xgetbv(uint32_t cpuid_ecx, uint32_t idx, uint64_t *xcr) static bool xgetbv(uint32_t cpuid_ecx, uint32_t idx, uint64_t *xcr)
{ {