Commit 1e00b8d5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw: move CPU state serialization to migration/cpu.h 



Remove usage of NEED_CPU_H from hw/hw.h.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cbd62f86

include/hw/hw.h

+0 −49
Original line number Diff line number Diff line
@@ -14,28 +14,6 @@ 
#include "qemu/log.h"

#include "qemu/module.h"



#ifdef NEED_CPU_H

#if TARGET_LONG_BITS == 64

#define qemu_put_betl qemu_put_be64

#define qemu_get_betl qemu_get_be64

#define qemu_put_betls qemu_put_be64s

#define qemu_get_betls qemu_get_be64s

#define qemu_put_sbetl qemu_put_sbe64

#define qemu_get_sbetl qemu_get_sbe64

#define qemu_put_sbetls qemu_put_sbe64s

#define qemu_get_sbetls qemu_get_sbe64s

#else

#define qemu_put_betl qemu_put_be32

#define qemu_get_betl qemu_get_be32

#define qemu_put_betls qemu_put_be32s

#define qemu_get_betls qemu_get_be32s

#define qemu_put_sbetl qemu_put_sbe32

#define qemu_get_sbetl qemu_get_sbe32

#define qemu_put_sbetls qemu_put_sbe32s

#define qemu_get_sbetls qemu_get_sbe32s

#endif

#endif



typedef void QEMUResetHandler(void *opaque);



void qemu_register_reset(QEMUResetHandler *func, void *opaque);
@@ -43,31 +21,4 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); 


void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);



#ifdef NEED_CPU_H

#if TARGET_LONG_BITS == 64

#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT64_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint64

#else

#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT32_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint32

#endif

#define VMSTATE_UINTTL(_f, _s)                                        \

    VMSTATE_UINTTL_V(_f, _s, 0)

#define VMSTATE_UINTTL_EQUAL(_f, _s)                                  \

    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)

#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \

    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)



#endif



#endif

include/migration/cpu.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* Declarations for use for CPU state serialization.  */

#ifndef MIGRATION_CPU_H

#define MIGRATION_CPU_H



#if TARGET_LONG_BITS == 64

#define qemu_put_betl qemu_put_be64

#define qemu_get_betl qemu_get_be64

#define qemu_put_betls qemu_put_be64s

#define qemu_get_betls qemu_get_be64s

#define qemu_put_sbetl qemu_put_sbe64

#define qemu_get_sbetl qemu_get_sbe64

#define qemu_put_sbetls qemu_put_sbe64s

#define qemu_get_sbetls qemu_get_sbe64s



#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT64_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint64

#else

#define qemu_put_betl qemu_put_be32

#define qemu_get_betl qemu_get_be32

#define qemu_put_betls qemu_put_be32s

#define qemu_get_betls qemu_get_be32s

#define qemu_put_sbetl qemu_put_sbe32

#define qemu_get_sbetl qemu_get_sbe32

#define qemu_put_sbetls qemu_put_sbe32s

#define qemu_get_sbetls qemu_get_sbe32s



#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT32_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint32

#endif



#define VMSTATE_UINTTL(_f, _s)                                        \

    VMSTATE_UINTTL_V(_f, _s, 0)

#define VMSTATE_UINTTL_EQUAL(_f, _s)                                  \

    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)

#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \

    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)



#endif

target-alpha/machine.c

+1 −0
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/boards.h"

#include "migration/cpu.h"



static int get_fpcr(QEMUFile *f, void *opaque, size_t size)

{

target-arm/machine.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "sysemu/kvm.h"

#include "kvm_arm.h"

#include "internals.h"

#include "migration/cpu.h"



static bool vfp_needed(void *opaque)

{

target-cris/machine.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "qemu/osdep.h"

#include "hw/hw.h"

#include "migration/cpu.h"



static const VMStateDescription vmstate_tlbset = {

    .name = "cpu/tlbset",