mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: Rename pc_machine variables to pcms

Browse Source 
Make the code use the same variable name everywhere. "pcms" is already
being used in existing code and it's shorter.

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:45 -03:00 committed by Michael S. Tsirkin
parent dda65c7c4b
commit ec68007a29
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -435,7 +435,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
{ {
int val; int val;
static pc_cmos_init_late_arg arg; static pc_cmos_init_late_arg arg;
PCMachineState *pc_machine = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
Error *local_err = NULL; Error *local_err = NULL;
/* various important CMOS locations needed by PC/Bochs bios */ /* various important CMOS locations needed by PC/Bochs bios */
@ -478,7 +478,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
object_property_add_link(OBJECT(machine), "rtc_state", object_property_add_link(OBJECT(machine), "rtc_state",
TYPE_ISA_DEVICE, TYPE_ISA_DEVICE,
(Object **)&pc_machine->rtc, (Object **)&pcms->rtc,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
object_property_set_link(OBJECT(machine), OBJECT(s), object_property_set_link(OBJECT(machine), OBJECT(s),

20
hw/i386/pc_piix.c
View File

@ -78,7 +78,7 @@ static bool kvmclock_enabled = true;
/* PC hardware initialisation */ /* PC hardware initialisation */
static void pc_init1(MachineState *machine) static void pc_init1(MachineState *machine)
{ {
PCMachineState *pc_machine = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_memory = get_system_memory();
MemoryRegion *system_io = get_system_io(); MemoryRegion *system_io = get_system_io();
int i; int i;
@ -117,13 +117,13 @@ static void pc_init1(MachineState *machine)
/* Handle the machine opt max-ram-below-4g. It is basically doing /* Handle the machine opt max-ram-below-4g. It is basically doing
* min(qemu limit, user limit). * min(qemu limit, user limit).
*/ */
if (lowmem > pc_machine->max_ram_below_4g) { if (lowmem > pcms->max_ram_below_4g) {
lowmem = pc_machine->max_ram_below_4g; lowmem = pcms->max_ram_below_4g;
if (machine->ram_size - lowmem > lowmem && if (machine->ram_size - lowmem > lowmem &&
lowmem & ((1ULL << 30) - 1)) { lowmem & ((1ULL << 30) - 1)) {
error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64
") not a multiple of 1G; possible bad performance.", ") not a multiple of 1G; possible bad performance.",
pc_machine->max_ram_below_4g); pcms->max_ram_below_4g);
} }
} }
@ -234,14 +234,14 @@ static void pc_init1(MachineState *machine)
pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL); pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
assert(pc_machine->vmport != ON_OFF_AUTO_MAX); assert(pcms->vmport != ON_OFF_AUTO_MAX);
if (pc_machine->vmport == ON_OFF_AUTO_AUTO) { if (pcms->vmport == ON_OFF_AUTO_AUTO) {
pc_machine->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON; pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
} }
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, gsi, &rtc_state, true, pc_basic_device_init(isa_bus, gsi, &rtc_state, true,
(pc_machine->vmport != ON_OFF_AUTO_ON), 0x4); (pcms->vmport != ON_OFF_AUTO_ON), 0x4);
pc_nic_init(isa_bus, pci_bus); pc_nic_init(isa_bus, pci_bus);
@ -286,13 +286,13 @@ static void pc_init1(MachineState *machine)
/* TODO: Populate SPD eeprom data. */ /* TODO: Populate SPD eeprom data. */
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
gsi[9], smi_irq, gsi[9], smi_irq,
pc_machine_is_smm_enabled(pc_machine), pc_machine_is_smm_enabled(pcms),
&piix4_pm); &piix4_pm);
smbus_eeprom_init(smbus, 8, NULL, 0); smbus_eeprom_init(smbus, 8, NULL, 0);
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP, object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
TYPE_HOTPLUG_HANDLER, TYPE_HOTPLUG_HANDLER,
(Object **)&pc_machine->acpi_dev, (Object **)&pcms->acpi_dev,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
object_property_set_link(OBJECT(machine), OBJECT(piix4_pm), object_property_set_link(OBJECT(machine), OBJECT(piix4_pm),

20
hw/i386/pc_q35.c
View File

@ -65,7 +65,7 @@ static bool has_reserved_memory = true;
/* PC hardware initialisation */ /* PC hardware initialisation */
static void pc_q35_init(MachineState *machine) static void pc_q35_init(MachineState *machine)
{ {
PCMachineState *pc_machine = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
ram_addr_t below_4g_mem_size, above_4g_mem_size; ram_addr_t below_4g_mem_size, above_4g_mem_size;
Q35PCIHost *q35_host; Q35PCIHost *q35_host;
PCIHostState *phb; PCIHostState *phb;
@ -108,13 +108,13 @@ static void pc_q35_init(MachineState *machine)
/* Handle the machine opt max-ram-below-4g. It is basically doing /* Handle the machine opt max-ram-below-4g. It is basically doing
* min(qemu limit, user limit). * min(qemu limit, user limit).
*/ */
if (lowmem > pc_machine->max_ram_below_4g) { if (lowmem > pcms->max_ram_below_4g) {
lowmem = pc_machine->max_ram_below_4g; lowmem = pcms->max_ram_below_4g;
if (machine->ram_size - lowmem > lowmem && if (machine->ram_size - lowmem > lowmem &&
lowmem & ((1ULL << 30) - 1)) { lowmem & ((1ULL << 30) - 1)) {
error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64
") not a multiple of 1G; possible bad performance.", ") not a multiple of 1G; possible bad performance.",
pc_machine->max_ram_below_4g); pcms->max_ram_below_4g);
} }
} }
@ -207,7 +207,7 @@ static void pc_q35_init(MachineState *machine)
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP, object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
TYPE_HOTPLUG_HANDLER, TYPE_HOTPLUG_HANDLER,
(Object **)&pc_machine->acpi_dev, (Object **)&pcms->acpi_dev,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
object_property_set_link(OBJECT(machine), OBJECT(lpc), object_property_set_link(OBJECT(machine), OBJECT(lpc),
@ -242,17 +242,17 @@ static void pc_q35_init(MachineState *machine)
pc_register_ferr_irq(gsi[13]); pc_register_ferr_irq(gsi[13]);
assert(pc_machine->vmport != ON_OFF_AUTO_MAX); assert(pcms->vmport != ON_OFF_AUTO_MAX);
if (pc_machine->vmport == ON_OFF_AUTO_AUTO) { if (pcms->vmport == ON_OFF_AUTO_AUTO) {
pc_machine->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON; pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
} }
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, gsi, &rtc_state, !mc->no_floppy, pc_basic_device_init(isa_bus, gsi, &rtc_state, !mc->no_floppy,
(pc_machine->vmport != ON_OFF_AUTO_ON), 0xff0104); (pcms->vmport != ON_OFF_AUTO_ON), 0xff0104);
/* connect pm stuff to lpc */ /* connect pm stuff to lpc */
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pc_machine), !mc->no_tco); ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms), !mc->no_tco);
/* ahci and SATA device, for q35 1 ahci controller is built-in */ /* ahci and SATA device, for q35 1 ahci controller is built-in */
ahci = pci_create_simple_multifunction(host_bus, ahci = pci_create_simple_multifunction(host_bus,