Re: [Qemu-ppc] [Qemu-devel] [PATCH 1/4] machine: conversion of QEMUMachineInitArgs to MachineState

[Cornelia Huck]

On Wed,  7 May 2014 17:42:57 +0300
Marcel Apfelbaum <address@hidden> wrote:

> Total removal of QEMUMachineInitArgs struct. QEMUMachineInitArgs's fields
> are copied into MachineState. Removed duplicated fields from MachineState.
> 
> All the other changes are only mechanical refactoring, no semantic changes.
> 
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> ---
>    - I am perfectly aware that patches touching a lot of files
>      are not desirable, but this one is a very simple replacement
>      patch:
>        QEMUMachineInitArgs -> MachineState
>        args -> ms
>    - This is the simplest way to get rid of QEMUMachineInitArgs fast.
> 

>  hw/s390x/s390-virtio-ccw.c               |  10 +--
>  hw/s390x/s390-virtio.c                   |  10 +--

> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 0d4f6ae..3d28045 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -79,9 +79,9 @@ static void virtio_ccw_register_hcalls(void)
>                                     virtio_ccw_hcall_early_printk);
>  }
> 
> -static void ccw_init(QEMUMachineInitArgs *args)
> +static void ccw_init(MachineState *ms)
>  {
> -    ram_addr_t my_ram_size = args->ram_size;
> +    ram_addr_t my_ram_size = ms->ram_size;
>      MemoryRegion *sysmem = get_system_memory();
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
>      int shift = 0;
> @@ -102,8 +102,8 @@ static void ccw_init(QEMUMachineInitArgs *args)
>      /* get a BUS */
>      css_bus = virtual_css_bus_init();
>      s390_sclp_init();
> -    s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline,
> -                      args->initrd_filename, "s390-ccw.img");
> +    s390_init_ipl_dev(ms->kernel_filename, ms->kernel_cmdline,
> +                      ms->initrd_filename, "s390-ccw.img");
>      s390_flic_init();
> 
>      /* register hypercalls */
> @@ -118,7 +118,7 @@ static void ccw_init(QEMUMachineInitArgs *args)
>      storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE);
> 
>      /* init CPUs */
> -    s390_init_cpus(args->cpu_model, storage_keys);
> +    s390_init_cpus(ms->cpu_model, storage_keys);
> 
>      if (kvm_enabled()) {
>          kvm_s390_enable_css_support(s390_cpu_addr2state(0));
> diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
> index aef2003..19443d2 100644
> --- a/hw/s390x/s390-virtio.c
> +++ b/hw/s390x/s390-virtio.c
> @@ -224,9 +224,9 @@ void s390_create_virtio_net(BusState *bus, const char 
> *name)
>  }
> 
>  /* PC hardware initialisation */
> -static void s390_init(QEMUMachineInitArgs *args)
> +static void s390_init(MachineState *ms)
>  {
> -    ram_addr_t my_ram_size = args->ram_size;
> +    ram_addr_t my_ram_size = ms->ram_size;
>      MemoryRegion *sysmem = get_system_memory();
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
>      int shift = 0;
> @@ -248,8 +248,8 @@ static void s390_init(QEMUMachineInitArgs *args)
>      /* get a BUS */
>      s390_bus = s390_virtio_bus_init(&my_ram_size);
>      s390_sclp_init();
> -    s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline,
> -                      args->initrd_filename, ZIPL_FILENAME);
> +    s390_init_ipl_dev(ms->kernel_filename, ms->kernel_cmdline,
> +                      ms->initrd_filename, ZIPL_FILENAME);
>      s390_flic_init();
> 
>      /* register hypercalls */
> @@ -273,7 +273,7 @@ static void s390_init(QEMUMachineInitArgs *args)
>      storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE);
> 
>      /* init CPUs */
> -    s390_init_cpus(args->cpu_model, storage_keys);
> +    s390_init_cpus(ms->cpu_model, storage_keys);
> 
>      /* Create VirtIO network adapters */
>      s390_create_virtio_net((BusState *)s390_bus, "virtio-net-s390");

The changes to the s390 machines look sane to me.

Acked-by: Cornelia Huck <address@hidden>