[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v4 30/44] alpha hw/: Don't use CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH RFC v4 30/44] alpha hw/: Don't use CPUState |
Date: |
Sat, 10 Mar 2012 03:28:02 +0100 |
Scripted conversion:
for file in hw/alpha_*.[hc]; do
sed -i "s/CPUState/CPUAlphaState/g" $file
done
Signed-off-by: Andreas Färber <address@hidden>
---
hw/alpha_dp264.c | 2 +-
hw/alpha_sys.h | 2 +-
hw/alpha_typhoon.c | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index ea0fd95..9eb939f 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -49,7 +49,7 @@ static void clipper_init(ram_addr_t ram_size,
const char *initrd_filename,
const char *cpu_model)
{
- CPUState *cpus[4];
+ CPUAlphaState *cpus[4];
PCIBus *pci_bus;
ISABus *isa_bus;
qemu_irq rtc_irq;
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index d54b18f..6c4ebe4 100644
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -12,7 +12,7 @@
#include "irq.h"
-PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, CPUState *[4],
+PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, CPUAlphaState *[4],
pci_map_irq_fn);
/* alpha_pci.c. */
diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index b539416..872e112 100644
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -21,7 +21,7 @@ typedef struct TyphoonCchip {
uint64_t drir;
uint64_t dim[4];
uint32_t iic[4];
- CPUState *cpu[4];
+ CPUAlphaState *cpu[4];
} TyphoonCchip;
typedef struct TyphoonWindow {
@@ -52,7 +52,7 @@ typedef struct TyphoonState {
} TyphoonState;
/* Called when one of DRIR or DIM changes. */
-static void cpu_irq_change(CPUState *env, uint64_t req)
+static void cpu_irq_change(CPUAlphaState *env, uint64_t req)
{
/* If there are any non-masked interrupts, tell the cpu. */
if (env) {
@@ -66,7 +66,7 @@ static void cpu_irq_change(CPUState *env, uint64_t req)
static uint64_t cchip_read(void *opaque, target_phys_addr_t addr, unsigned
size)
{
- CPUState *env = cpu_single_env;
+ CPUAlphaState *env = cpu_single_env;
TyphoonState *s = opaque;
uint64_t ret = 0;
@@ -347,7 +347,7 @@ static void cchip_write(void *opaque, target_phys_addr_t
addr,
if ((newval ^ oldval) & 0xff0) {
int i;
for (i = 0; i < 4; ++i) {
- CPUState *env = s->cchip.cpu[i];
+ CPUAlphaState *env = s->cchip.cpu[i];
if (env) {
/* IPI can be either cleared or set by the write. */
if (newval & (1 << (i + 8))) {
@@ -655,7 +655,7 @@ static void typhoon_set_timer_irq(void *opaque, int irq,
int level)
/* Deliver the interrupt to each CPU, considering each CPU's IIC. */
for (i = 0; i < 4; ++i) {
- CPUState *env = s->cchip.cpu[i];
+ CPUAlphaState *env = s->cchip.cpu[i];
if (env) {
uint32_t iic = s->cchip.iic[i];
@@ -693,7 +693,7 @@ static void typhoon_alarm_timer(void *opaque)
PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
qemu_irq *p_rtc_irq,
- CPUState *cpus[4], pci_map_irq_fn sys_map_irq)
+ CPUAlphaState *cpus[4], pci_map_irq_fn sys_map_irq)
{
const uint64_t MB = 1024 * 1024;
const uint64_t GB = 1024 * MB;
@@ -713,7 +713,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
/* Remember the CPUs so that we can deliver interrupts to them. */
for (i = 0; i < 4; i++) {
- CPUState *env = cpus[i];
+ CPUAlphaState *env = cpus[i];
s->cchip.cpu[i] = env;
if (env) {
env->alarm_timer = qemu_new_timer_ns(rtc_clock,
--
1.7.7
- [Qemu-devel] [PATCH RFC v4 25/44] target-unicore32: Don't overuse CPUState, (continued)
- [Qemu-devel] [PATCH RFC v4 25/44] target-unicore32: Don't overuse CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 09/44] hw/mc146818: Drop unneeded #includes, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 40/44] sh4 hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 36/44] microblaze hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 17/44] target-lm32: Don't overuse CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 39/44] s390x hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 08/44] target-unicore32: Rename to CPUUniCore32State, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 32/44] cris hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 30/44] alpha hw/: Don't use CPUState,
Andreas Färber <=
- [Qemu-devel] [PATCH RFC v4 21/44] target-ppc: Don't overuse CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 37/44] mips hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 20/44] target-mips: Don't overuse CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 28/44] m68k-semi: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 33/44] i386 hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 29/44] xtensa-semi: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 31/44] arm hw/: Don't use CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 10/44] linux-user: Don't overuse CPUState, Andreas Färber, 2012/03/09
- [Qemu-devel] [PATCH RFC v4 22/44] target-s390x: Don't overuse CPUState, Andreas Färber, 2012/03/09