[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 32/39] pc: Rename pc_machine variable to pcms
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v2 32/39] pc: Rename pc_machine variable to pcms |
Date: |
Fri, 13 Jun 2014 16:44:11 -0300 |
"pcms" being the initials of "PCMachineState". The variable will be used
a lot, so it's better to make it short.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_piix.c | 6 +++---
hw/i386/pc_q35.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 5fb1888..1761f11 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -61,8 +61,8 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
/* PC hardware initialisation */
static void pc_init1(MachineState *machine)
{
- PCMachineState *pc_machine = PC_MACHINE(machine);
- PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pc_machine);
+ PCMachineState *pcms = PC_MACHINE(machine);
+ PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
bool pci_enabled = pcmc->pci_enabled;
bool kvmclock_enabled = pcmc->kvmclock_enabled;
MemoryRegion *system_memory = get_system_memory();
@@ -249,7 +249,7 @@ static void pc_init1(MachineState *machine)
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
TYPE_HOTPLUG_HANDLER,
- (Object **)&pc_machine->acpi_dev,
+ (Object **)&pcms->acpi_dev,
object_property_allow_set_link,
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
object_property_set_link(OBJECT(machine), OBJECT(piix4_pm),
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 9e30130..fc19f0b 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -51,7 +51,7 @@
/* PC hardware initialisation */
static void pc_q35_init(MachineState *machine)
{
- PCMachineState *pc_machine = PC_MACHINE(machine);
+ PCMachineState *pcms = PC_MACHINE(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine);
bool pci_enabled = pcmc->pci_enabled;
ram_addr_t below_4g_mem_size, above_4g_mem_size;
@@ -172,7 +172,7 @@ static void pc_q35_init(MachineState *machine)
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
TYPE_HOTPLUG_HANDLER,
- (Object **)&pc_machine->acpi_dev,
+ (Object **)&pcms->acpi_dev,
object_property_allow_set_link,
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
object_property_set_link(OBJECT(machine), OBJECT(lpc),
--
1.9.0
- [Qemu-devel] [RFC v2 23/39] pc: Move has_pci_info to PCMachineClass, (continued)
- [Qemu-devel] [RFC v2 23/39] pc: Move has_pci_info to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 24/39] pc: Move gigabyte_align to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 04/39] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 25/39] pc: Move has_reserved_memory to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 26/39] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 27/39] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 28/39] piix: Introduce struct PCI440FXMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 29/39] pc: Create common machine init function, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 30/39] pc: Eliminate empty or trivial compat functions, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 31/39] piix: Move compat/init functions closer to corresponding class_init, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 32/39] pc: Rename pc_machine variable to pcms,
Eduardo Habkost <=
- [Qemu-devel] [RFC v2 34/39] pc: Move duplicate Xen init code to pc_machine_init(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 35/39] pc: Move icc_bridge variable to PCMachineState, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 36/39] pc: Move duplicate icc-bridge and CPU initalization to pc_machine_init(), Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 37/39] pc: Make pc_cpus_init() static, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 38/39] pc: Make pc_cpus_init() use PCMachineState, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 39/39] machine: Eliminate QEMUMachine.compat_props, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 19/39] pc: Move kvmclock_enabled to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 20/39] pc: Move smbios_legacy_mode to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 17/39] pc: Move pci_enabled parameter to PCMachineClass, Eduardo Habkost, 2014/06/13
- [Qemu-devel] [RFC v2 18/39] q35: Use PCMachineClass.pci_enabled field, Eduardo Habkost, 2014/06/13