@@ -2332,6 +2332,20 @@ static void x86_nmi(NMIState *n, int cpu_index, Error **errp)
}
}
+static void pc_machine_enforce_memory_device_align(const MachineClass *mc,
+ const MemoryDeviceState *md,
+ uint64_t *align)
+{
+ const PCMachineClass *pcmc = PC_MACHINE_CLASS(mc);
+
+ if (object_dynamic_cast(OBJECT(md), TYPE_PC_DIMM)) {
+ /* compat handling: force to TARGET_PAGE_SIZE */
+ if (!pcmc->enforce_aligned_dimm) {
+ *align = TARGET_PAGE_SIZE;
+ }
+ }
+}
+
static void pc_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -2371,6 +2385,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
hc->unplug = pc_machine_device_unplug_cb;
nc->nmi_monitor_handler = x86_nmi;
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+ mc->enforce_memory_device_align = pc_machine_enforce_memory_device_align;
object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
pc_machine_get_device_memory_region_size, NULL,
@@ -9,6 +9,7 @@
#include "qom/object.h"
#include "qom/cpu.h"
#include "hw/resource-handler.h"
+#include "hw/mem/memory-device.h"
/**
* memory_region_allocate_system_memory - Allocate a board's main memory
@@ -163,6 +164,10 @@ typedef struct {
* should instead use "unimplemented-device" for all memory ranges where
* the guest will attempt to probe for a device that QEMU doesn't
* implement and a stub device is required.
+ * @enforce_memory_device_align:
+ * For some memory devices (e.g. DIMMs), alignment has to be enforced for
+ * compat handling by the machine. This function will only modify the
+ * asignment if it needs to be enforced.
*/
struct MachineClass {
/*< private >*/
@@ -221,6 +226,9 @@ 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);
+ void (*enforce_memory_device_align)(const MachineClass *mc,
+ const MemoryDeviceState *md,
+ uint64_t *align);
};
/**
For compat handling, we'll have to ask the machine class if a certain memory device has alignment requirements when assigning resource to a memory device. This will only be required for PC for now, PPC is fine (and will be handled via the alignment of the memory region). Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/i386/pc.c | 15 +++++++++++++++ include/hw/boards.h | 8 ++++++++ 2 files changed, 23 insertions(+)