The MachineClass::fixup_ram_size callback, which was added
in commit 5c30ef937f5 ("vl/s390x: fixup ram sizes for compat
machines"), was only used by the s390-ccw-virtio-4.2 machine,
which got removed. Remove it as now unused.
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/boards.h | 7 -------
hw/core/machine.c | 3 ---
2 files changed, 10 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 665b6201214..d0a69cd490b 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -250,12 +250,6 @@ typedef struct {
* It also will be used as a way to option into "-m" option support.
* If it's not set by board, '-m' will be ignored and generic code will
* not create default RAM MemoryRegion.
- * @fixup_ram_size:
- * Amends user provided ram size (with -m option) using machine
- * specific algorithm. To be used by old machine types for compat
- * purposes only.
- * Applies only to default memory backend, i.e., explicit memory backend
- * wasn't used.
* @smbios_memory_device_size:
* Default size of memory device,
* SMBIOS 3.1.0 "7.18 Memory Device (Type 17)"
@@ -325,7 +319,6 @@ struct MachineClass {
unsigned cpu_index);
const CPUArchIdList *(*possible_cpu_arch_ids)(MachineState *machine);
int64_t (*get_default_cpu_node_id)(const MachineState *ms, int idx);
- ram_addr_t (*fixup_ram_size)(ram_addr_t size);
uint64_t smbios_memory_device_size;
bool (*create_default_memdev)(MachineState *ms, const char *path,
Error **errp);
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 681adbb7ac5..7aec3916e80 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -648,9 +648,6 @@ static void machine_set_mem(Object *obj, Visitor *v, const char *name,
mem->size = mc->default_ram_size;
}
mem->size = QEMU_ALIGN_UP(mem->size, 8192);
- if (mc->fixup_ram_size) {
- mem->size = mc->fixup_ram_size(mem->size);
- }
if ((ram_addr_t)mem->size != mem->size) {
error_setg(errp, "ram size %llu exceeds permitted maximum %llu",
(unsigned long long)mem->size,
--
2.51.0