08304a8689
Currently, we allocate space for all the cpu objects within a single core
in one big block. This was copied from an older version of the spapr code
and requires some ugly pointer manipulation to extract the individual
objects.
This design was due to a misunderstanding of qemu lifetime conventions and
has already been changed in spapr (in 94ad93bd "spapr_cpu_core: instantiate
CPUs separately".
Make an equivalent change in pnv_core to get rid of the nasty pointer
arithmetic.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
51 lines
1.5 KiB
C
51 lines
1.5 KiB
C
/*
|
|
* QEMU PowerPC PowerNV CPU Core model
|
|
*
|
|
* Copyright (c) 2016, IBM Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef _PPC_PNV_CORE_H
|
|
#define _PPC_PNV_CORE_H
|
|
|
|
#include "hw/cpu/core.h"
|
|
|
|
#define TYPE_PNV_CORE "powernv-cpu-core"
|
|
#define PNV_CORE(obj) \
|
|
OBJECT_CHECK(PnvCore, (obj), TYPE_PNV_CORE)
|
|
#define PNV_CORE_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(PnvCoreClass, (klass), TYPE_PNV_CORE)
|
|
#define PNV_CORE_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(PnvCoreClass, (obj), TYPE_PNV_CORE)
|
|
|
|
typedef struct PnvCore {
|
|
/*< private >*/
|
|
CPUCore parent_obj;
|
|
|
|
/*< public >*/
|
|
PowerPCCPU **threads;
|
|
uint32_t pir;
|
|
|
|
MemoryRegion xscom_regs;
|
|
} PnvCore;
|
|
|
|
typedef struct PnvCoreClass {
|
|
DeviceClass parent_class;
|
|
} PnvCoreClass;
|
|
|
|
#define PNV_CORE_TYPE_SUFFIX "-" TYPE_PNV_CORE
|
|
#define PNV_CORE_TYPE_NAME(cpu_model) cpu_model PNV_CORE_TYPE_SUFFIX
|
|
|
|
#endif /* _PPC_PNV_CORE_H */
|