Skip to content

Commit

Permalink
target/nios2: Declare QOM definitions in 'cpu-qom.h'
Browse files Browse the repository at this point in the history
"target/foo/cpu.h" contains the target specific declarations.

A heterogeneous setup need to access target agnostic declarations
(at least the QOM ones, to instantiate the objects).

Our convention is to add such target agnostic QOM declarations in
the "target/foo/cpu-qom.h" header.
Add a comment clarifying that in the header.

Extract QOM definitions from "cpu.h" to "cpu-qom.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231013140116.255-10-philmd@linaro.org>
  • Loading branch information
philmd committed Nov 7, 2023
1 parent edcea14 commit d368064
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
19 changes: 19 additions & 0 deletions target/nios2/cpu-qom.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* QEMU Nios II CPU QOM header (target agnostic)
*
* Copyright (c) 2012 Chris Wulff <crwulff@gmail.com>
*
* SPDX-License-Identifier: LGPL-2.1-or-later
*/

#ifndef QEMU_NIOS2_CPU_QOM_H
#define QEMU_NIOS2_CPU_QOM_H

#include "hw/core/cpu.h"
#include "qom/object.h"

#define TYPE_NIOS2_CPU "nios2-cpu"

OBJECT_DECLARE_CPU_TYPE(Nios2CPU, Nios2CPUClass, NIOS2_CPU)

#endif
7 changes: 1 addition & 6 deletions target/nios2/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,15 @@
#ifndef NIOS2_CPU_H
#define NIOS2_CPU_H

#include "cpu-qom.h"
#include "exec/cpu-defs.h"
#include "hw/core/cpu.h"
#include "hw/registerfields.h"
#include "qom/object.h"

typedef struct CPUArchState CPUNios2State;
#if !defined(CONFIG_USER_ONLY)
#include "mmu.h"
#endif

#define TYPE_NIOS2_CPU "nios2-cpu"

OBJECT_DECLARE_CPU_TYPE(Nios2CPU, Nios2CPUClass, NIOS2_CPU)

/**
* Nios2CPUClass:
* @parent_phases: The parent class' reset phase handlers.
Expand Down

0 comments on commit d368064

Please sign in to comment.