Commit 88076854 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Remove redundant arguments from pc_cmos_init() 



Remove arguments that can be found in PCMachineState.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent df1f79fd

hw/i386/pc.c

+7 −9
Original line number Diff line number Diff line
@@ -429,8 +429,6 @@ static void pc_cmos_init_late(void *opaque) 
}



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,

                  ISADevice *s)

{
@@ -442,12 +440,12 @@ void pc_cmos_init(PCMachineState *pcms, 


    /* memory size */

    /* 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, 0x16, val >> 8);

    /* extended memory (next 64MiB) */

    if (ram_size > 1024 * 1024) {

        val = (ram_size - 1024 * 1024) / 1024;

    if (pcms->below_4g_mem_size > 1024 * 1024) {

        val = (pcms->below_4g_mem_size - 1024 * 1024) / 1024;

    } else {

        val = 0;

    }
@@ -458,8 +456,8 @@ void pc_cmos_init(PCMachineState *pcms, 
    rtc_set_memory(s, 0x30, val);

    rtc_set_memory(s, 0x31, val >> 8);

    /* memory between 16MiB and 4GiB */

    if (ram_size > 16 * 1024 * 1024) {

        val = (ram_size - 16 * 1024 * 1024) / 65536;

    if (pcms->below_4g_mem_size > 16 * 1024 * 1024) {

        val = (pcms->below_4g_mem_size - 16 * 1024 * 1024) / 65536;

    } else {

        val = 0;

    }
@@ -468,7 +466,7 @@ void pc_cmos_init(PCMachineState *pcms, 
    rtc_set_memory(s, 0x34, val);

    rtc_set_memory(s, 0x35, val >> 8);

    /* 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, 0x5c, val >> 8);

    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),

                             "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) {

        error_report_err(local_err);

        exit(1);

hw/i386/pc_piix.c

+1 −4
Original line number Diff line number Diff line
@@ -267,10 +267,7 @@ static void pc_init1(MachineState *machine) 
        }

    }



    pc_cmos_init(pcms,

                 pcms->below_4g_mem_size, pcms->above_4g_mem_size,

                 machine->boot_order,

                 idebus[0], idebus[1], rtc_state);

    pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);



    if (pci_enabled && usb_enabled()) {

        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");

hw/i386/pc_q35.c

+1 −4
Original line number Diff line number Diff line
@@ -276,10 +276,7 @@ static void pc_q35_init(MachineState *machine) 
                                    0xb100),

                      8, NULL, 0);



    pc_cmos_init(pcms,

                 pcms->below_4g_mem_size, pcms->above_4g_mem_size,

                 machine->boot_order,

                 idebus[0], idebus[1], rtc_state);

    pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);



    /* the rest devices to which pci devfn is automatically assigned */

    pc_vga_init(isa_bus, host_bus);

include/hw/i386/pc.h

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
                          uint32 hpet_irqs);

void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);

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,

                  ISADevice *s);

void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus);