diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-09 19:00:41 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-10 15:45:15 +0200 |
| commit | b061f0598b9231f7992aff4fcdf3f336f9747d11 (patch) | |
| tree | a3dbbc77954d0d608fc409c58d69c69a98fe7809 /include/hw/i386/x86.h | |
| parent | b348fdcdac9f9fc70be9ae56c54e41765e9aae24 (diff) | |
| download | focaccia-qemu-b061f0598b9231f7992aff4fcdf3f336f9747d11.tar.gz focaccia-qemu-b061f0598b9231f7992aff4fcdf3f336f9747d11.zip | |
hw/i386: split x86.c in multiple parts
Keep the basic X86MachineState definition in x86.c. Move out functions that are only needed by other files: x86-common.c for the pc and microvm machines, x86-cpu.c for those used by accelerator code. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Message-ID: <20240509170044.190795-11-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/hw/i386/x86.h')
| -rw-r--r-- | include/hw/i386/x86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index c2062db13f..b006f16b8d 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -21,6 +21,7 @@ #include "exec/memory.h" #include "hw/boards.h" +#include "hw/i386/topology.h" #include "hw/intc/ioapic.h" #include "hw/isa/isa.h" #include "qom/object.h" @@ -109,12 +110,11 @@ struct X86MachineState { #define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86") OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE) -uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms, +void init_topo_info(X86CPUTopoInfo *topo_info, const X86MachineState *x86ms); +uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms, unsigned int cpu_index); -void x86_cpu_new(X86MachineState *pcms, int64_t apic_id, Error **errp); void x86_cpus_init(X86MachineState *pcms, int default_cpu_version); -CPUArchId *x86_find_cpu_slot(MachineState *ms, uint32_t id, int *idx); void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count); void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp); |