| Message ID | 20220216162426.1885923-24-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: SPR registration cleanups | expand |
On Wed, Feb 16, 2022 at 01:24:22PM -0300, Fabiano Rosas wrote: > Initial intent for the spr_tcg header was to expose the spr_read|write > callbacks that are only used by TCG code. However, although these > routines are TCG-specific, the KVM code needs access to env->sprs > which creation is currently coupled to the callback registration. > > We are probably not going to decouple SPR creation and TCG callback > registration any time soon, so let's rename the header to spr_common > to accomodate the register_*_sprs functions that will be moved out of > cpu_init.c in the following patches. > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu_init.c | 2 +- > target/ppc/{spr_tcg.h => spr_common.h} | 4 ++-- > target/ppc/translate.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > rename target/ppc/{spr_tcg.h => spr_common.h} (99%) > > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index adb23019ef..17f12aceb6 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -44,7 +44,7 @@ > > #include "helper_regs.h" > #include "internal.h" > -#include "spr_tcg.h" > +#include "spr_common.h" > #include "power8-pmu.h" > > /* #define PPC_DEBUG_SPR */ > diff --git a/target/ppc/spr_tcg.h b/target/ppc/spr_common.h > similarity index 99% > rename from target/ppc/spr_tcg.h > rename to target/ppc/spr_common.h > index df2abacc64..5aec76ade4 100644 > --- a/target/ppc/spr_tcg.h > +++ b/target/ppc/spr_common.h > @@ -16,8 +16,8 @@ > * 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 SPR_TCG_H > -#define SPR_TCG_H > +#ifndef SPR_COMMON_H > +#define SPR_COMMON_H > > #define SPR_NOACCESS (&spr_noaccess) > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 2eaffd432a..ecc5a104e0 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -35,7 +35,7 @@ > #include "exec/translator.h" > #include "exec/log.h" > #include "qemu/atomic128.h" > -#include "spr_tcg.h" > +#include "spr_common.h" > > #include "qemu/qemu-print.h" > #include "qapi/error.h"
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index adb23019ef..17f12aceb6 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -44,7 +44,7 @@ #include "helper_regs.h" #include "internal.h" -#include "spr_tcg.h" +#include "spr_common.h" #include "power8-pmu.h" /* #define PPC_DEBUG_SPR */ diff --git a/target/ppc/spr_tcg.h b/target/ppc/spr_common.h similarity index 99% rename from target/ppc/spr_tcg.h rename to target/ppc/spr_common.h index df2abacc64..5aec76ade4 100644 --- a/target/ppc/spr_tcg.h +++ b/target/ppc/spr_common.h @@ -16,8 +16,8 @@ * 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 SPR_TCG_H -#define SPR_TCG_H +#ifndef SPR_COMMON_H +#define SPR_COMMON_H #define SPR_NOACCESS (&spr_noaccess) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 2eaffd432a..ecc5a104e0 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -35,7 +35,7 @@ #include "exec/translator.h" #include "exec/log.h" #include "qemu/atomic128.h" -#include "spr_tcg.h" +#include "spr_common.h" #include "qemu/qemu-print.h" #include "qapi/error.h"
Initial intent for the spr_tcg header was to expose the spr_read|write callbacks that are only used by TCG code. However, although these routines are TCG-specific, the KVM code needs access to env->sprs which creation is currently coupled to the callback registration. We are probably not going to decouple SPR creation and TCG callback registration any time soon, so let's rename the header to spr_common to accomodate the register_*_sprs functions that will be moved out of cpu_init.c in the following patches. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/cpu_init.c | 2 +- target/ppc/{spr_tcg.h => spr_common.h} | 4 ++-- target/ppc/translate.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename target/ppc/{spr_tcg.h => spr_common.h} (99%)