[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 045/113] ppc: do not use ram_size global
From: |
Paolo Bonzini |
Subject: |
[PULL 045/113] ppc: do not use ram_size global |
Date: |
Wed, 2 Dec 2020 03:07:41 -0500 |
Use the machine properties instead.
Cc: qemu-ppc@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/ppc/prep.c | 2 +-
hw/ppc/spapr_vio.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index c6b9d1ddcb..7e72f6e4a9 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -420,7 +420,7 @@ static void ibm_40p_init(MachineState *machine)
/* Prepare firmware configuration for Open Hack'Ware */
if (m48t59) {
- PPC_NVRAM_set_params(m48t59, NVRAM_SIZE, "PREP", ram_size,
+ PPC_NVRAM_set_params(m48t59, NVRAM_SIZE, "PREP", machine->ram_size,
boot_device,
kernel_base, kernel_size,
machine->kernel_cmdline,
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 5d6c56473f..3cc9421526 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -525,10 +525,10 @@ static void spapr_vio_busdev_realize(DeviceState *qdev,
Error **errp)
uint32_t liobn = SPAPR_VIO_LIOBN(dev->reg);
memory_region_init(&dev->mrroot, OBJECT(dev), "iommu-spapr-root",
- ram_size);
+ MACHINE(spapr)->ram_size);
memory_region_init_alias(&dev->mrbypass, OBJECT(dev),
"iommu-spapr-bypass", get_system_memory(),
- 0, ram_size);
+ 0, MACHINE(spapr)->ram_size);
memory_region_add_subregion_overlap(&dev->mrroot, 0, &dev->mrbypass,
1);
address_space_init(&dev->as, &dev->mrroot, qdev->id);
--
2.26.2
- [PULL 029/113] ppc: remove bios_name, (continued)
- [PULL 029/113] ppc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 032/113] sh4: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 035/113] vl: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 034/113] digic: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 040/113] m68k: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 033/113] sparc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 041/113] microblaze: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 043/113] moxie: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 042/113] mips: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 046/113] riscv: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 045/113] ppc: do not use ram_size global,
Paolo Bonzini <=
- [PULL 049/113] make ram_size local to vl.c, Paolo Bonzini, 2020/12/02
- [PULL 053/113] vl: remove bogus check, Paolo Bonzini, 2020/12/02
- [PULL 044/113] nios2: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 048/113] sparc64: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 052/113] vl: extract validation of -smp to machine.c, Paolo Bonzini, 2020/12/02
- [PULL 063/113] vl: load plugins as late as possible, Paolo Bonzini, 2020/12/02
- [PULL 054/113] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/12/02
- [PULL 058/113] vl: extract various command line validation snippets to a new function, Paolo Bonzini, 2020/12/02
- [PULL 039/113] i386: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 047/113] s390x: do not use ram_size global, Paolo Bonzini, 2020/12/02