Commit 0e4213a7 authored by Andreas Färber's avatar Andreas Färber
Browse files

s390x hw/: Don't use CPUState 



Scripted conversion:
  for file in hw/s390-*.[hc]; do
    sed -i "s/CPUState/CPUS390XState/g" $file
  done

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Acked-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent e2684c0b

hw/s390-virtio-bus.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}

hw/s390-virtio.c

+8 −8
Original line number Diff line number Diff line
@@ -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) {