OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc: Don't explode QEMUMachineInitArgs into local variables needlessly

Browse Source 
Don't explode when the variable is used just once, and never changed.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2013-08-16 13:13:48 +02:00 committed by Michael S. Tsirkin
parent 6b63ef4d0f
commit ee87e32f83
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/ppc/e500plat.c
View File

@ -30,19 +30,13 @@ static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
static void e500plat_init(QEMUMachineInitArgs *args) static void e500plat_init(QEMUMachineInitArgs *args)
{ {
ram_addr_t ram_size = args->ram_size;
const char *boot_device = args->boot_device;
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;
PPCE500Params params = { PPCE500Params params = {
.ram_size = ram_size, .ram_size = args->ram_size,
.boot_device = boot_device, .boot_device = args->boot_device,
.kernel_filename = kernel_filename, .kernel_filename = args->kernel_filename,
.kernel_cmdline = kernel_cmdline, .kernel_cmdline = args->kernel_cmdline,
.initrd_filename = initrd_filename, .initrd_filename = args->initrd_filename,
.cpu_model = cpu_model, .cpu_model = args->cpu_model,
.pci_first_slot = 0x1, .pci_first_slot = 0x1,
.pci_nr_slots = PCI_SLOT_MAX - 1, .pci_nr_slots = PCI_SLOT_MAX - 1,
.fixup_devtree = e500plat_fixup_devtree, .fixup_devtree = e500plat_fixup_devtree,

18
hw/ppc/mpc8544ds.c
View File

@ -28,19 +28,13 @@ static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
static void mpc8544ds_init(QEMUMachineInitArgs *args) static void mpc8544ds_init(QEMUMachineInitArgs *args)
{ {
ram_addr_t ram_size = args->ram_size;
const char *boot_device = args->boot_device;
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;
PPCE500Params params = { PPCE500Params params = {
.ram_size = ram_size, .ram_size = args->ram_size,
.boot_device = boot_device, .boot_device = args->boot_device,
.kernel_filename = kernel_filename, .kernel_filename = args->kernel_filename,
.kernel_cmdline = kernel_cmdline, .kernel_cmdline = args->kernel_cmdline,
.initrd_filename = initrd_filename, .initrd_filename = args->initrd_filename,
.cpu_model = cpu_model, .cpu_model = args->cpu_model,
.pci_first_slot = 0x11, .pci_first_slot = 0x11,
.pci_nr_slots = 2, .pci_nr_slots = 2,
.fixup_devtree = mpc8544ds_fixup_devtree, .fixup_devtree = mpc8544ds_fixup_devtree,