ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: Remove redundant arguments from pc_cmos_init() 

Remove arguments that can be found in PCMachineState.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-08-07 16:55:54 -03:00 committed by Michael S. Tsirkin
parent df1f79fdbb
commit 880768546e
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/i386/pc.c
View File

@ -429,8 +429,6 @@ static void pc_cmos_init_late(void *opaque)
} }
void pc_cmos_init(PCMachineState *pcms, void pc_cmos_init(PCMachineState *pcms,
ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
const char *boot_device,
BusState *idebus0, BusState *idebus1, BusState *idebus0, BusState *idebus1,
ISADevice *s) ISADevice *s)
{ {
@ -442,12 +440,12 @@ void pc_cmos_init(PCMachineState *pcms,
/* memory size */ /* memory size */
/* base memory (first MiB) */ /* base memory (first MiB) */
val = MIN(ram_size / 1024, 640); val = MIN(pcms->below_4g_mem_size / 1024, 640);
rtc_set_memory(s, 0x15, val); rtc_set_memory(s, 0x15, val);
rtc_set_memory(s, 0x16, val >> 8); rtc_set_memory(s, 0x16, val >> 8);
/* extended memory (next 64MiB) */ /* extended memory (next 64MiB) */
if (ram_size > 1024 * 1024) { if (pcms->below_4g_mem_size > 1024 * 1024) {
val = (ram_size - 1024 * 1024) / 1024; val = (pcms->below_4g_mem_size - 1024 * 1024) / 1024;
} else { } else {
val = 0; val = 0;
} }
@ -458,8 +456,8 @@ void pc_cmos_init(PCMachineState *pcms,
rtc_set_memory(s, 0x30, val); rtc_set_memory(s, 0x30, val);
rtc_set_memory(s, 0x31, val >> 8); rtc_set_memory(s, 0x31, val >> 8);
/* memory between 16MiB and 4GiB */ /* memory between 16MiB and 4GiB */
if (ram_size > 16 * 1024 * 1024) { if (pcms->below_4g_mem_size > 16 * 1024 * 1024) {
val = (ram_size - 16 * 1024 * 1024) / 65536; val = (pcms->below_4g_mem_size - 16 * 1024 * 1024) / 65536;
} else { } else {
val = 0; val = 0;
} }
@ -468,7 +466,7 @@ void pc_cmos_init(PCMachineState *pcms,
rtc_set_memory(s, 0x34, val); rtc_set_memory(s, 0x34, val);
rtc_set_memory(s, 0x35, val >> 8); rtc_set_memory(s, 0x35, val >> 8);
/* memory above 4GiB */ /* memory above 4GiB */
val = above_4g_mem_size / 65536; val = pcms->above_4g_mem_size / 65536;
rtc_set_memory(s, 0x5b, val); rtc_set_memory(s, 0x5b, val);
rtc_set_memory(s, 0x5c, val >> 8); rtc_set_memory(s, 0x5c, val >> 8);
rtc_set_memory(s, 0x5d, val >> 16); rtc_set_memory(s, 0x5d, val >> 16);
@ -484,7 +482,7 @@ void pc_cmos_init(PCMachineState *pcms,
object_property_set_link(OBJECT(pcms), OBJECT(s), object_property_set_link(OBJECT(pcms), OBJECT(s),
"rtc_state", &error_abort); "rtc_state", &error_abort);
set_boot_dev(s, boot_device, &local_err); set_boot_dev(s, MACHINE(pcms)->boot_order, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
exit(1); exit(1);

5
hw/i386/pc_piix.c
View File

@ -267,10 +267,7 @@ static void pc_init1(MachineState *machine)
} }
} }
pc_cmos_init(pcms, pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
pcms->below_4g_mem_size, pcms->above_4g_mem_size,
machine->boot_order,
idebus[0], idebus[1], rtc_state);
if (pci_enabled && usb_enabled()) { if (pci_enabled && usb_enabled()) {
pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");

5
hw/i386/pc_q35.c
View File

@ -276,10 +276,7 @@ static void pc_q35_init(MachineState *machine)
0xb100), 0xb100),
8, NULL, 0); 8, NULL, 0);
pc_cmos_init(pcms, pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
pcms->below_4g_mem_size, pcms->above_4g_mem_size,
machine->boot_order,
idebus[0], idebus[1], rtc_state);
/* the rest devices to which pci devfn is automatically assigned */ /* the rest devices to which pci devfn is automatically assigned */
pc_vga_init(isa_bus, host_bus); pc_vga_init(isa_bus, host_bus);

2
include/hw/i386/pc.h
View File

@ -198,8 +198,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
uint32 hpet_irqs); uint32 hpet_irqs);
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
void pc_cmos_init(PCMachineState *pcms, void pc_cmos_init(PCMachineState *pcms,
ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
const char *boot_device,
BusState *ide0, BusState *ide1, BusState *ide0, BusState *ide1,
ISADevice *s); ISADevice *s);
void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus);