* [Qemu-devel] [PATCH 0/2] xtensa boards: don't prematurely explode QEMUMachineInitArgs @ 2012-10-25 8:47 Max Filippov 2012-10-25 8:47 ` [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: " Max Filippov 2012-10-25 8:47 ` [Qemu-devel] [PATCH 2/2] hw/xtensa_sim: get rid of intermediate xtensa_sim_init Max Filippov 0 siblings, 2 replies; 5+ messages in thread From: Max Filippov @ 2012-10-25 8:47 UTC (permalink / raw) To: qemu-devel Cc: Blue Swirl, Peter Maydell, Max Filippov, Markus Armbruster, Eduardo Habkost Max Filippov (2): hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs hw/xtensa_sim: get rid of intermediate xtensa_sim_init hw/xtensa_lx60.c | 25 ++++++------------------- hw/xtensa_sim.c | 27 ++++++++------------------- 2 files changed, 14 insertions(+), 38 deletions(-) -- 1.7.7.6 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs 2012-10-25 8:47 [Qemu-devel] [PATCH 0/2] xtensa boards: don't prematurely explode QEMUMachineInitArgs Max Filippov @ 2012-10-25 8:47 ` Max Filippov 2012-10-25 10:04 ` Peter Maydell 2012-10-25 8:47 ` [Qemu-devel] [PATCH 2/2] hw/xtensa_sim: get rid of intermediate xtensa_sim_init Max Filippov 1 sibling, 1 reply; 5+ messages in thread From: Max Filippov @ 2012-10-25 8:47 UTC (permalink / raw) To: qemu-devel Cc: Blue Swirl, Peter Maydell, Max Filippov, Markus Armbruster, Eduardo Habkost 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(-) 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 = { -- 1.7.7.6 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs 2012-10-25 8:47 ` [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: " Max Filippov @ 2012-10-25 10:04 ` Peter Maydell 2012-10-25 11:37 ` Max Filippov 0 siblings, 1 reply; 5+ messages in thread From: Peter Maydell @ 2012-10-25 10:04 UTC (permalink / raw) To: Max Filippov; +Cc: Blue Swirl, qemu-devel, Eduardo Habkost, Markus Armbruster 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs 2012-10-25 10:04 ` Peter Maydell @ 2012-10-25 11:37 ` Max Filippov 0 siblings, 0 replies; 5+ messages in thread From: Max Filippov @ 2012-10-25 11:37 UTC (permalink / raw) To: Peter Maydell; +Cc: Blue Swirl, qemu-devel, Eduardo Habkost, Markus Armbruster 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. -- Thanks. -- Max ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/2] hw/xtensa_sim: get rid of intermediate xtensa_sim_init 2012-10-25 8:47 [Qemu-devel] [PATCH 0/2] xtensa boards: don't prematurely explode QEMUMachineInitArgs Max Filippov 2012-10-25 8:47 ` [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: " Max Filippov @ 2012-10-25 8:47 ` Max Filippov 1 sibling, 0 replies; 5+ messages in thread From: Max Filippov @ 2012-10-25 8:47 UTC (permalink / raw) To: qemu-devel Cc: Blue Swirl, Peter Maydell, Max Filippov, Markus Armbruster, Eduardo Habkost Remove xtensa_sim_init that only explodes machine init args, rename sim_init to xtensa_sim_init. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- hw/xtensa_sim.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index 2e846d8..0d633e4 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -44,16 +44,20 @@ static void sim_reset(void *opaque) cpu_reset(CPU(cpu)); } -static void sim_init(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) +static void xtensa_sim_init(QEMUMachineInitArgs *args) { XtensaCPU *cpu = NULL; CPUXtensaState *env = NULL; MemoryRegion *ram, *rom; + ram_addr_t ram_size = args->ram_size; + const char *cpu_model = args->cpu_model; + const char *kernel_filename = args->kernel_filename; int n; + if (!cpu_model) { + cpu_model = XTENSA_DEFAULT_CPU_MODEL; + } + for (n = 0; n < smp_cpus; n++) { cpu = cpu_xtensa_init(cpu_model); if (cpu == NULL) { @@ -96,21 +100,6 @@ static void sim_init(ram_addr_t ram_size, } } -static void xtensa_sim_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; - if (!cpu_model) { - cpu_model = XTENSA_DEFAULT_CPU_MODEL; - } - sim_init(ram_size, boot_device, kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); -} - static QEMUMachine xtensa_sim_machine = { .name = "sim", .desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")", -- 1.7.7.6 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-25 11:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-10-25 8:47 [Qemu-devel] [PATCH 0/2] xtensa boards: don't prematurely explode QEMUMachineInitArgs Max Filippov 2012-10-25 8:47 ` [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: " Max Filippov 2012-10-25 10:04 ` Peter Maydell 2012-10-25 11:37 ` Max Filippov 2012-10-25 8:47 ` [Qemu-devel] [PATCH 2/2] hw/xtensa_sim: get rid of intermediate xtensa_sim_init Max Filippov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).