218e99
From c12c0b02880f4162cc237f11407532375882b941 Mon Sep 17 00:00:00 2001
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Sat, 2 Nov 2013 10:01:18 +0100
218e99
Subject: [PATCH 18/29] pc: Don't prematurely explode QEMUMachineInitArgs
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1383386488-29789-2-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 55237
218e99
O-Subject: [PATCH 7.0 qemu-kvm 01/11] pc: Don't prematurely explode QEMUMachineInitArgs
218e99
Bugzilla: 994490
218e99
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
218e99
Don't explode QEMUMachineInitArgs before passing it to pc_init1().
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
218e99
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
218e99
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
218e99
(cherry picked from commit 5650f5f48bfe2a684138505aae008dc4440202f1)
218e99
218e99
Conflicts:
218e99
	hw/i386/pc_piix.c
218e99
218e99
Maintainer's note: Fixed incorrect change in c_init_pci_no_kvmclock()
218e99
218e99
---
218e99
 hw/i386/pc_piix.c | 66 ++++++++++++++-----------------------------------------
218e99
 1 file changed, 16 insertions(+), 50 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c |   65 +++++++++++++----------------------------------------
218e99
 1 files changed, 16 insertions(+), 49 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index 3a8418e..65f7f3a 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -59,14 +59,9 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
218e99
 static bool has_pvpanic = true;
218e99
 
218e99
 /* PC hardware initialisation */
218e99
-static void pc_init1(MemoryRegion *system_memory,
218e99
+static void pc_init1(QEMUMachineInitArgs *args,
218e99
+                     MemoryRegion *system_memory,
218e99
                      MemoryRegion *system_io,
218e99
-                     ram_addr_t ram_size,
218e99
-                     const char *boot_device,
218e99
-                     const char *kernel_filename,
218e99
-                     const char *kernel_cmdline,
218e99
-                     const char *initrd_filename,
218e99
-                     const char *cpu_model,
218e99
                      int pci_enabled,
218e99
                      int kvmclock_enabled)
218e99
 {
218e99
@@ -95,18 +90,18 @@ static void pc_init1(MemoryRegion *system_memory,
218e99
     object_property_add_child(qdev_get_machine(), "icc-bridge",
218e99
                               OBJECT(icc_bridge), NULL);
218e99
 
218e99
-    pc_cpus_init(cpu_model, icc_bridge);
218e99
+    pc_cpus_init(args->cpu_model, icc_bridge);
218e99
 
218e99
     if (kvmclock_enabled) {
218e99
         kvmclock_create();
218e99
     }
218e99
 
218e99
-    if (ram_size >= QEMU_BELOW_4G_RAM_END ) {
218e99
-        above_4g_mem_size = ram_size - QEMU_BELOW_4G_RAM_END;
218e99
+    if (args->ram_size >= QEMU_BELOW_4G_RAM_END ) {
218e99
+        above_4g_mem_size = args->ram_size - QEMU_BELOW_4G_RAM_END;
218e99
         below_4g_mem_size = QEMU_BELOW_4G_RAM_END;
218e99
     } else {
218e99
         above_4g_mem_size = 0;
218e99
-        below_4g_mem_size = ram_size;
218e99
+        below_4g_mem_size = args->ram_size;
218e99
     }
218e99
 
218e99
     if (pci_enabled) {
218e99
@@ -121,7 +116,8 @@ static void pc_init1(MemoryRegion *system_memory,
218e99
     /* allocate ram and load rom/bios */
218e99
     if (!xen_enabled()) {
218e99
         fw_cfg = pc_memory_init(system_memory,
218e99
-                       kernel_filename, kernel_cmdline, initrd_filename,
218e99
+                       args->kernel_filename, args->kernel_cmdline,
218e99
+                       args->initrd_filename,
218e99
                        below_4g_mem_size, above_4g_mem_size,
218e99
                        rom_memory, &ram_memory);
218e99
     }
218e99
@@ -137,7 +133,7 @@ static void pc_init1(MemoryRegion *system_memory,
218e99
 
218e99
     if (pci_enabled) {
218e99
         pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
218e99
-                              system_memory, system_io, ram_size,
218e99
+                              system_memory, system_io, args->ram_size,
218e99
                               below_4g_mem_size,
218e99
                               0x100000000ULL - below_4g_mem_size,
218e99
                               0x100000000ULL + above_4g_mem_size,
218e99
@@ -202,7 +198,7 @@ static void pc_init1(MemoryRegion *system_memory,
218e99
         }
218e99
     }
218e99
 
218e99
-    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
218e99
+    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_device,
218e99
                  floppy, idebus[0], idebus[1], rtc_state);
218e99
 
218e99
     if (pci_enabled && usb_enabled(false)) {
218e99
@@ -232,17 +228,7 @@ static void pc_init1(MemoryRegion *system_memory,
218e99
 
218e99
 static void pc_init_pci(QEMUMachineInitArgs *args)
218e99
 {
218e99
-    ram_addr_t ram_size = args->ram_size;
218e99
-    const char *cpu_model = args->cpu_model;
218e99
-    const char *kernel_filename = args->kernel_filename;
218e99
-    const char *kernel_cmdline = args->kernel_cmdline;
218e99
-    const char *initrd_filename = args->initrd_filename;
218e99
-    const char *boot_device = args->boot_device;
218e99
-    pc_init1(get_system_memory(),
218e99
-             get_system_io(),
218e99
-             ram_size, boot_device,
218e99
-             kernel_filename, kernel_cmdline,
218e99
-             initrd_filename, cpu_model, 1, 1);
218e99
+    pc_init1(args, get_system_memory(), get_system_io(), 1, 1);
218e99
 }
218e99
 
218e99
 #if 0 /* Disabled for Red Hat Enterprise Linux */
218e99
@@ -283,40 +269,21 @@ static void pc_init_pci_1_0(QEMUMachineInitArgs *args)
218e99
 /* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
218e99
 static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
218e99
 {
218e99
-    ram_addr_t ram_size = args->ram_size;
218e99
-    const char *cpu_model = args->cpu_model;
218e99
-    const char *kernel_filename = args->kernel_filename;
218e99
-    const char *kernel_cmdline = args->kernel_cmdline;
218e99
-    const char *initrd_filename = args->initrd_filename;
218e99
-    const char *boot_device = args->boot_device;
218e99
     has_pvpanic = false;
218e99
     disable_kvm_pv_eoi();
218e99
     enable_compat_apic_id_mode();
218e99
-    pc_init1(get_system_memory(),
218e99
-             get_system_io(),
218e99
-             ram_size, boot_device,
218e99
-             kernel_filename, kernel_cmdline,
218e99
-             initrd_filename, cpu_model, 1, 0);
218e99
+    pc_init1(args, get_system_memory(), get_system_io(), 1, 0);
218e99
 }
218e99
 
218e99
 static void pc_init_isa(QEMUMachineInitArgs *args)
218e99
 {
218e99
-    ram_addr_t ram_size = args->ram_size;
218e99
-    const char *cpu_model = args->cpu_model;
218e99
-    const char *kernel_filename = args->kernel_filename;
218e99
-    const char *kernel_cmdline = args->kernel_cmdline;
218e99
-    const char *initrd_filename = args->initrd_filename;
218e99
-    const char *boot_device = args->boot_device;
218e99
     has_pvpanic = false;
218e99
-    if (cpu_model == NULL)
218e99
-        cpu_model = "486";
218e99
+    if (!args->cpu_model) {
218e99
+        args->cpu_model = "486";
218e99
+    }
218e99
     disable_kvm_pv_eoi();
218e99
     enable_compat_apic_id_mode();
218e99
-    pc_init1(get_system_memory(),
218e99
-             get_system_io(),
218e99
-             ram_size, boot_device,
218e99
-             kernel_filename, kernel_cmdline,
218e99
-             initrd_filename, cpu_model, 0, 1);
218e99
+    pc_init1(args, get_system_memory(), get_system_io(), 0, 1);
218e99
 }
218e99
 
218e99
 #ifdef CONFIG_XEN
218e99
-- 
218e99
1.7.1
218e99