[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/17] hw/i386/pc_piix: Turn some local variables into initial
From: |
Bernhard Beschow |
Subject: |
[PATCH v3 07/17] hw/i386/pc_piix: Turn some local variables into initializers |
Date: |
Fri, 30 Jun 2023 09:37:10 +0200 |
Eliminates an else branch.
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/i386/pc_piix.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index f9947fbc10..6a5b6dad2f 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -122,11 +122,11 @@ static void pc_init1(MachineState *machine,
BusState *idebus[MAX_IDE_BUS];
ISADevice *rtc_state;
MemoryRegion *ram_memory;
- MemoryRegion *pci_memory;
- MemoryRegion *rom_memory;
+ MemoryRegion *pci_memory = NULL;
+ MemoryRegion *rom_memory = system_memory;
ram_addr_t lowmem;
- uint64_t hole64_size;
- DeviceState *i440fx_host;
+ uint64_t hole64_size = 0;
+ DeviceState *i440fx_host = NULL;
/*
* Calculate ram split, for memory below and above 4G. It's a bit
@@ -205,11 +205,6 @@ static void pc_init1(MachineState *machine,
hole64_size = object_property_get_uint(OBJECT(i440fx_host),
PCI_HOST_PROP_PCI_HOLE64_SIZE,
&error_abort);
- } else {
- pci_memory = NULL;
- rom_memory = system_memory;
- i440fx_host = NULL;
- hole64_size = 0;
}
pc_guest_info_init(pcms);
--
2.41.0
- [PATCH v3 00/17] Q35 and I440FX host bridge QOM cleanup, Bernhard Beschow, 2023/06/30
- [PATCH v3 01/17] hw/i386/pc_q35: Resolve redundant q35_host variable, Bernhard Beschow, 2023/06/30
- [PATCH v3 02/17] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Bernhard Beschow, 2023/06/30
- [PATCH v3 03/17] hw/pci-host/q35: Initialize PCMachineState::bus in board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 05/17] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 06/17] hw/pci-host/q35: Make some property name macros reusable by i440fx, Bernhard Beschow, 2023/06/30
- [PATCH v3 15/17] hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property, Bernhard Beschow, 2023/06/30
- [PATCH v3 04/17] hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro, Bernhard Beschow, 2023/06/30
- [PATCH v3 07/17] hw/i386/pc_piix: Turn some local variables into initializers,
Bernhard Beschow <=
- [PATCH v3 09/17] hw/pci-host/i440fx: Replace magic values by existing constants, Bernhard Beschow, 2023/06/30
- [PATCH v3 08/17] hw/pci-host/i440fx: Add "i440fx" child property in board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 12/17] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties, Bernhard Beschow, 2023/06/30
- [PATCH v3 11/17] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section, Bernhard Beschow, 2023/06/30
- [PATCH v3 16/17] hw/pci-host/i440fx: Resolve i440fx_init(), Bernhard Beschow, 2023/06/30
- [PATCH v3 14/17] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties, Bernhard Beschow, 2023/06/30
- [PATCH v3 17/17] hw/i386/pc_piix: Move i440fx' realize near its qdev_new(), Bernhard Beschow, 2023/06/30
- [PATCH v3 13/17] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property, Bernhard Beschow, 2023/06/30
- [PATCH v3 10/17] hw/pci-host/i440fx: Have common names for some local variables, Bernhard Beschow, 2023/06/30