| Message ID | 1351154852-29217-2-git-send-email-jcmvbkbc@gmail.com |
|---|---|
| State | New |
| Headers | show |
On 25 October 2012 09:47, Max Filippov <jcmvbkbc@gmail.com> wrote: > @@ -272,37 +273,23 @@ static void lx_init(const LxBoardDesc *board, > static void xtensa_lx60_init(QEMUMachineInitArgs *args) > { > ram_addr_t ram_size = args->ram_size; > - const char *cpu_model = args->cpu_model; > - const char *kernel_filename = args->kernel_filename; > - const char *kernel_cmdline = args->kernel_cmdline; > - const char *initrd_filename = args->initrd_filename; > - const char *boot_device = args->boot_device; > static const LxBoardDesc lx60_board = { > .flash_size = 0x400000, > .flash_sector_size = 0x10000, > .sram_size = 0x20000, > }; > - lx_init(&lx60_board, ram_size, boot_device, > - kernel_filename, kernel_cmdline, > - initrd_filename, cpu_model); > + lx_init(&lx60_board, ram_size, args); > } > > static void xtensa_lx200_init(QEMUMachineInitArgs *args) > { > ram_addr_t ram_size = args->ram_size; > - const char *cpu_model = args->cpu_model; > - const char *kernel_filename = args->kernel_filename; > - const char *kernel_cmdline = args->kernel_cmdline; > - const char *initrd_filename = args->initrd_filename; > - const char *boot_device = args->boot_device; > static const LxBoardDesc lx200_board = { > .flash_size = 0x1000000, > .flash_sector_size = 0x20000, > .sram_size = 0x2000000, > }; > - lx_init(&lx200_board, ram_size, boot_device, > - kernel_filename, kernel_cmdline, > - initrd_filename, cpu_model); > + lx_init(&lx200_board, ram_size, args); > } Why not let lx_init() pull the ram_size out of args->ram_size as well? -- PMM
On Thu, Oct 25, 2012 at 2:04 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 25 October 2012 09:47, Max Filippov <jcmvbkbc@gmail.com> wrote: >> @@ -272,37 +273,23 @@ static void lx_init(const LxBoardDesc *board, >> static void xtensa_lx60_init(QEMUMachineInitArgs *args) >> { >> ram_addr_t ram_size = args->ram_size; >> - const char *cpu_model = args->cpu_model; >> - const char *kernel_filename = args->kernel_filename; >> - const char *kernel_cmdline = args->kernel_cmdline; >> - const char *initrd_filename = args->initrd_filename; >> - const char *boot_device = args->boot_device; >> static const LxBoardDesc lx60_board = { >> .flash_size = 0x400000, >> .flash_sector_size = 0x10000, >> .sram_size = 0x20000, >> }; >> - lx_init(&lx60_board, ram_size, boot_device, >> - kernel_filename, kernel_cmdline, >> - initrd_filename, cpu_model); >> + lx_init(&lx60_board, ram_size, args); >> } >> >> static void xtensa_lx200_init(QEMUMachineInitArgs *args) >> { >> ram_addr_t ram_size = args->ram_size; >> - const char *cpu_model = args->cpu_model; >> - const char *kernel_filename = args->kernel_filename; >> - const char *kernel_cmdline = args->kernel_cmdline; >> - const char *initrd_filename = args->initrd_filename; >> - const char *boot_device = args->boot_device; >> static const LxBoardDesc lx200_board = { >> .flash_size = 0x1000000, >> .flash_sector_size = 0x20000, >> .sram_size = 0x2000000, >> }; >> - lx_init(&lx200_board, ram_size, boot_device, >> - kernel_filename, kernel_cmdline, >> - initrd_filename, cpu_model); >> + lx_init(&lx200_board, ram_size, args); >> } > > Why not let lx_init() pull the ram_size out of args->ram_size > as well? Completely thoughtless refactoring: it didn't match the pattern. Will resend.
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 5dd2e08..b4d3b8e 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -156,9 +156,7 @@ static void lx60_reset(void *opaque) } static void lx_init(const LxBoardDesc *board, - ram_addr_t ram_size, const char *boot_device, - const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename, const char *cpu_model) + ram_addr_t ram_size, QEMUMachineInitArgs *args) { #ifdef TARGET_WORDS_BIGENDIAN int be = 1; @@ -171,6 +169,9 @@ static void lx_init(const LxBoardDesc *board, MemoryRegion *ram, *rom, *system_io; DriveInfo *dinfo; pflash_t *flash = NULL; + const char *cpu_model = args->cpu_model; + const char *kernel_filename = args->kernel_filename; + const char *kernel_cmdline = args->kernel_cmdline; int n; if (!cpu_model) { @@ -272,37 +273,23 @@ static void lx_init(const LxBoardDesc *board, static void xtensa_lx60_init(QEMUMachineInitArgs *args) { ram_addr_t ram_size = args->ram_size; - const char *cpu_model = args->cpu_model; - const char *kernel_filename = args->kernel_filename; - const char *kernel_cmdline = args->kernel_cmdline; - const char *initrd_filename = args->initrd_filename; - const char *boot_device = args->boot_device; static const LxBoardDesc lx60_board = { .flash_size = 0x400000, .flash_sector_size = 0x10000, .sram_size = 0x20000, }; - lx_init(&lx60_board, ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); + lx_init(&lx60_board, ram_size, args); } static void xtensa_lx200_init(QEMUMachineInitArgs *args) { ram_addr_t ram_size = args->ram_size; - const char *cpu_model = args->cpu_model; - const char *kernel_filename = args->kernel_filename; - const char *kernel_cmdline = args->kernel_cmdline; - const char *initrd_filename = args->initrd_filename; - const char *boot_device = args->boot_device; static const LxBoardDesc lx200_board = { .flash_size = 0x1000000, .flash_sector_size = 0x20000, .sram_size = 0x2000000, }; - lx_init(&lx200_board, ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); + lx_init(&lx200_board, ram_size, args); } static QEMUMachine xtensa_lx60_machine = {
Don't explode QEMUMachineInitArgs before passing it to lx_init. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- hw/xtensa_lx60.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-)