mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/i386/x86: Reduce init_topo_info() scope

Browse Source 
This function is not used anywhere outside this file, so
we can delete the prototype from include/hw/i386/x86.h and
make the function "static void".

This fixes when building with -Wall and using Clang
("Apple clang version 14.0.0 (clang-1400.0.29.202)"):

  ../hw/i386/x86.c:70:24: error: static function 'MACHINE' is used in an inline function with external linkage [-Werror,-Wstatic-in-inline]
      MachineState *ms = MACHINE(x86ms);
                         ^
  include/hw/i386/x86.h:101:1: note: use 'static' to give inline function 'init_topo_info' internal linkage
  void init_topo_info(X86CPUTopoInfo *topo_info, const X86MachineState *x86ms);
  ^
  static
  include/hw/boards.h:24:49: note: 'MACHINE' declared here
  OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE)
                                                  ^

Reported-by: Stefan Weil <sw@weilnetz.de>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20221216220158.6317-6-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-12-16 22:25:23 +01:00
parent a371975ef6
commit 892afa04e6
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/x86.c
View File

@ -64,7 +64,7 @@
/* Physical Address of PVH entry point read from kernel ELF NOTE */ /* Physical Address of PVH entry point read from kernel ELF NOTE */
static size_t pvh_start_addr; static size_t pvh_start_addr;
inline void init_topo_info(X86CPUTopoInfo *topo_info, static void init_topo_info(X86CPUTopoInfo *topo_info,
const X86MachineState *x86ms) const X86MachineState *x86ms)
{ {
MachineState *ms = MACHINE(x86ms); MachineState *ms = MACHINE(x86ms);

3
include/hw/i386/x86.h
View File

@ -20,7 +20,6 @@
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "hw/i386/topology.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/nmi.h" #include "hw/nmi.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
@ -98,8 +97,6 @@ struct X86MachineState {
#define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86") #define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86")
OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE) OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE)
void init_topo_info(X86CPUTopoInfo *topo_info, const X86MachineState *x86ms);
uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms, uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms,
unsigned int cpu_index); unsigned int cpu_index);