Commit 2744ece8 authored by Tao Xu's avatar Tao Xu Committed by Eduardo Habkost
Browse files

hw/arm: simplify arm_load_dtb 



In struct arm_boot_info, kernel_filename, initrd_filename and
kernel_cmdline are copied from from MachineState. This patch add
MachineState as a parameter into arm_load_dtb() and move the copy chunk
of kernel_filename, initrd_filename and kernel_cmdline into
arm_load_kernel().

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarLiu Jingqi <jingqi.liu@intel.com>
Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarTao Xu <tao3.xu@intel.com>
Message-Id: <20190809065731.9097-2-tao3.xu@intel.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Acked-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Acked-by: default avatarCédric Le Goater <clg@kaod.org>
[ehabkost: include hw/boards.h again to fix build failures]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 14a25a51

hw/arm/aspeed.c

+1 −4
Original line number Diff line number Diff line
@@ -242,9 +242,6 @@ static void aspeed_board_init(MachineState *machine, 
        write_boot_rom(drive0, FIRMWARE_ADDR, fl->size, &error_abort);

    }



    aspeed_board_binfo.kernel_filename = machine->kernel_filename;

    aspeed_board_binfo.initrd_filename = machine->initrd_filename;

    aspeed_board_binfo.kernel_cmdline = machine->kernel_cmdline;

    aspeed_board_binfo.ram_size = ram_size;

    aspeed_board_binfo.loader_start = sc->info->memmap[ASPEED_SDRAM];

    aspeed_board_binfo.nb_cpus = bmc->soc.num_cpus;
@@ -253,7 +250,7 @@ static void aspeed_board_init(MachineState *machine, 
        cfg->i2c_init(bmc);

    }



    arm_load_kernel(ARM_CPU(first_cpu), &aspeed_board_binfo);

    arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);

}



static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)

hw/arm/boot.c

+9 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "hw/boards.h"

#include "sysemu/reset.h"

#include "hw/loader.h"

#include "elf.h"
@@ -523,7 +524,7 @@ static void fdt_add_psci_node(void *fdt) 
}



int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,

                 hwaddr addr_limit, AddressSpace *as)

                 hwaddr addr_limit, AddressSpace *as, MachineState *ms)

{

    void *fdt = NULL;

    int size, rc, n = 0;
@@ -626,9 +627,9 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
        qemu_fdt_add_subnode(fdt, "/chosen");

    }



    if (binfo->kernel_cmdline && *binfo->kernel_cmdline) {

    if (ms->kernel_cmdline && *ms->kernel_cmdline) {

        rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",

                                     binfo->kernel_cmdline);

                                     ms->kernel_cmdline);

        if (rc < 0) {

            fprintf(stderr, "couldn't set /chosen/bootargs\n");

            goto fail;
@@ -1260,7 +1261,7 @@ static void arm_setup_firmware_boot(ARMCPU *cpu, struct arm_boot_info *info) 
     */

}



void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)

void arm_load_kernel(ARMCPU *cpu, MachineState *ms, struct arm_boot_info *info)

{

    CPUState *cs;

    AddressSpace *as = arm_boot_address_space(cpu, info);
@@ -1281,7 +1282,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
     * doesn't support secure.

     */

    assert(!(info->secure_board_setup && kvm_enabled()));



    info->kernel_filename = ms->kernel_filename;

    info->kernel_cmdline = ms->kernel_cmdline;

    info->initrd_filename = ms->initrd_filename;

    info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");

    info->dtb_limit = 0;
@@ -1293,7 +1296,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
    }



    if (!info->skip_dtb_autoload && have_dtb(info)) {

        if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as) < 0) {

        if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as, ms) < 0) {

            exit(1);

        }

    }

hw/arm/collie.c

+1 −7
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ static struct arm_boot_info collie_binfo = { 


static void collie_init(MachineState *machine)

{

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;

    StrongARMState *s;

    DriveInfo *dinfo;

    MemoryRegion *sysmem = get_system_memory();
@@ -46,11 +43,8 @@ static void collie_init(MachineState *machine) 


    sysbus_create_simple("scoop", 0x40800000, NULL);



    collie_binfo.kernel_filename = kernel_filename;

    collie_binfo.kernel_cmdline = kernel_cmdline;

    collie_binfo.initrd_filename = initrd_filename;

    collie_binfo.board_id = 0x208;

    arm_load_kernel(s->cpu, &collie_binfo);

    arm_load_kernel(s->cpu, machine, &collie_binfo);

}



static void collie_machine_init(MachineClass *mc)

hw/arm/cubieboard.c

+1 −4
Original line number Diff line number Diff line
@@ -73,10 +73,7 @@ static void cubieboard_init(MachineState *machine) 
    /* TODO create and connect IDE devices for ide_drive_get() */



    cubieboard_binfo.ram_size = machine->ram_size;

    cubieboard_binfo.kernel_filename = machine->kernel_filename;

    cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;

    cubieboard_binfo.initrd_filename = machine->initrd_filename;

    arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);

    arm_load_kernel(&s->a10->cpu, machine, &cubieboard_binfo);

}



static void cubieboard_machine_init(MachineClass *mc)

hw/arm/exynos4_boards.c

+2 −5
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ exynos4_boards_init_common(MachineState *machine, 
    exynos4_board_binfo.board_id = exynos4_board_id[board_type];

    exynos4_board_binfo.smp_bootreg_addr =

            exynos4_board_smp_bootreg_addr[board_type];

    exynos4_board_binfo.kernel_filename = machine->kernel_filename;

    exynos4_board_binfo.initrd_filename = machine->initrd_filename;

    exynos4_board_binfo.kernel_cmdline = machine->kernel_cmdline;

    exynos4_board_binfo.gic_cpu_if_addr =

            EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
@@ -143,7 +140,7 @@ static void nuri_init(MachineState *machine) 
{

    exynos4_boards_init_common(machine, EXYNOS4_BOARD_NURI);



    arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo);

    arm_load_kernel(ARM_CPU(first_cpu), machine, &exynos4_board_binfo);

}



static void smdkc210_init(MachineState *machine)
@@ -153,7 +150,7 @@ static void smdkc210_init(MachineState *machine) 


    lan9215_init(SMDK_LAN9118_BASE_ADDR,

            qemu_irq_invert(s->soc.irq_table[exynos4210_get_irq(37, 1)]));

    arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo);

    arm_load_kernel(ARM_CPU(first_cpu), machine, &exynos4_board_binfo);

}



static void nuri_class_init(ObjectClass *oc, void *data)