[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 38/43] s390x hw/: Don't use CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v5 38/43] s390x hw/: Don't use CPUState |
Date: |
Wed, 14 Mar 2012 22:42:51 +0100 |
Scripted conversion:
for file in hw/s390-*.[hc]; do
sed -i "s/CPUState/CPUS390XState/g" $file
done
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Anthony Liguori <address@hidden>
---
hw/s390-virtio-bus.c | 6 +++---
hw/s390-virtio.c | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index c450e4b..be1f5f1 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -85,7 +85,7 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size)
return bus;
}
-static void s390_virtio_irq(CPUState *env, int config_change, uint64_t token)
+static void s390_virtio_irq(CPUS390XState *env, int config_change, uint64_t
token)
{
if (kvm_enabled()) {
kvm_s390_virtio_irq(env, config_change, token);
@@ -116,7 +116,7 @@ static int s390_virtio_device_init(VirtIOS390Device *dev,
VirtIODevice *vdev)
s390_virtio_device_sync(dev);
if (dev->qdev.hotplugged) {
- CPUState *env = s390_cpu_addr2state(0);
+ CPUS390XState *env = s390_cpu_addr2state(0);
s390_virtio_irq(env, VIRTIO_PARAM_DEV_ADD, dev->dev_offs);
}
@@ -331,7 +331,7 @@ static void virtio_s390_notify(void *opaque, uint16_t
vector)
{
VirtIOS390Device *dev = (VirtIOS390Device*)opaque;
uint64_t token = s390_virtio_device_vq_token(dev, vector);
- CPUState *env = s390_cpu_addr2state(0);
+ CPUS390XState *env = s390_cpu_addr2state(0);
s390_virtio_irq(env, 0, token);
}
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 15e3ef3..1ebe70d 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -61,9 +61,9 @@
#define MAX_BLK_DEVS 10
static VirtIOS390Bus *s390_bus;
-static CPUState **ipi_states;
+static CPUS390XState **ipi_states;
-CPUState *s390_cpu_addr2state(uint16_t cpu_addr)
+CPUS390XState *s390_cpu_addr2state(uint16_t cpu_addr)
{
if (cpu_addr >= smp_cpus) {
return NULL;
@@ -72,7 +72,7 @@ CPUState *s390_cpu_addr2state(uint16_t cpu_addr)
return ipi_states[cpu_addr];
}
-int s390_virtio_hypercall(CPUState *env, uint64_t mem, uint64_t hypercall)
+int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall)
{
int r = 0, i;
@@ -129,7 +129,7 @@ int s390_virtio_hypercall(CPUState *env, uint64_t mem,
uint64_t hypercall)
*/
static unsigned s390_running_cpus;
-void s390_add_running_cpu(CPUState *env)
+void s390_add_running_cpu(CPUS390XState *env)
{
if (env->halted) {
s390_running_cpus++;
@@ -138,7 +138,7 @@ void s390_add_running_cpu(CPUState *env)
}
}
-unsigned s390_del_running_cpu(CPUState *env)
+unsigned s390_del_running_cpu(CPUS390XState *env)
{
if (env->halted == 0) {
assert(s390_running_cpus >= 1);
@@ -157,7 +157,7 @@ static void s390_init(ram_addr_t my_ram_size,
const char *initrd_filename,
const char *cpu_model)
{
- CPUState *env = NULL;
+ CPUS390XState *env = NULL;
MemoryRegion *sysmem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
ram_addr_t kernel_size = 0;
@@ -205,10 +205,10 @@ static void s390_init(ram_addr_t my_ram_size,
cpu_model = "host";
}
- ipi_states = g_malloc(sizeof(CPUState *) * smp_cpus);
+ ipi_states = g_malloc(sizeof(CPUS390XState *) * smp_cpus);
for (i = 0; i < smp_cpus; i++) {
- CPUState *tmp_env;
+ CPUS390XState *tmp_env;
tmp_env = cpu_init(cpu_model);
if (!env) {
--
1.7.7
- [Qemu-devel] [PATCH v5 29/43] alpha hw/: Don't use CPUState, (continued)
- [Qemu-devel] [PATCH v5 29/43] alpha hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 07/43] target-unicore32: Rename to CPUUniCore32State, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 33/43] lm32 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 08/43] hw/mc146818: Drop unneeded #includes, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 25/43] target-xtensa: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 19/43] target-mips: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 30/43] arm hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 39/43] sh4 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 35/43] microblaze hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 37/43] ppc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 38/43] s390x hw/: Don't use CPUState,
Andreas Färber <=
- [Qemu-devel] [PATCH v5 40/43] sparc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 43/43] qom: Introduce CPU class, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 32/43] i386 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 34/43] m68k hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 23/43] target-sparc: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 36/43] mips hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 31/43] cris hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 41/43] xtensa hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- Re: [Qemu-devel] [PULL] QOM CPUState v5, Anthony Liguori, 2012/03/14