0479097859
QEMU currently crashes when trying to use a 'pc-dimm' on the pseries machine without specifying its 'memdev' property. This happens because pc_dimm_get_memory_region() does not check whether the 'memdev' property has properly been set by the user. Looking closer at this function, it's also obvious that it is using &error_abort to call another function - and this is bad in a function that is used in the hot-plugging calling chain since this can also cause QEMU to exit unexpectedly. So let's fix these issues in a proper way now: Add a "Error **errp" parameter to pc_dimm_get_memory_region() which we use in case the 'memdev' property has not been set by the user, and which we can use instead of the &error_abort, and change the callers of get_memory_region() to make use of this "errp" parameter for proper error checking. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
103 lines
3.2 KiB
C
103 lines
3.2 KiB
C
/*
|
|
* PC DIMM device
|
|
*
|
|
* Copyright ProfitBricks GmbH 2012
|
|
* Copyright (C) 2013-2014 Red Hat Inc
|
|
*
|
|
* Authors:
|
|
* Vasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
|
|
* Igor Mammedov <imammedo@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QEMU_PC_DIMM_H
|
|
#define QEMU_PC_DIMM_H
|
|
|
|
#include "exec/memory.h"
|
|
#include "sysemu/hostmem.h"
|
|
#include "hw/qdev.h"
|
|
|
|
#define TYPE_PC_DIMM "pc-dimm"
|
|
#define PC_DIMM(obj) \
|
|
OBJECT_CHECK(PCDIMMDevice, (obj), TYPE_PC_DIMM)
|
|
#define PC_DIMM_CLASS(oc) \
|
|
OBJECT_CLASS_CHECK(PCDIMMDeviceClass, (oc), TYPE_PC_DIMM)
|
|
#define PC_DIMM_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(PCDIMMDeviceClass, (obj), TYPE_PC_DIMM)
|
|
|
|
#define PC_DIMM_ADDR_PROP "addr"
|
|
#define PC_DIMM_SLOT_PROP "slot"
|
|
#define PC_DIMM_NODE_PROP "node"
|
|
#define PC_DIMM_SIZE_PROP "size"
|
|
#define PC_DIMM_MEMDEV_PROP "memdev"
|
|
|
|
#define PC_DIMM_UNASSIGNED_SLOT -1
|
|
|
|
/**
|
|
* PCDIMMDevice:
|
|
* @addr: starting guest physical address, where @PCDIMMDevice is mapped.
|
|
* Default value: 0, means that address is auto-allocated.
|
|
* @node: numa node to which @PCDIMMDevice is attached.
|
|
* @slot: slot number into which @PCDIMMDevice is plugged in.
|
|
* Default value: -1, means that slot is auto-allocated.
|
|
* @hostmem: host memory backend providing memory for @PCDIMMDevice
|
|
*/
|
|
typedef struct PCDIMMDevice {
|
|
/* private */
|
|
DeviceState parent_obj;
|
|
|
|
/* public */
|
|
uint64_t addr;
|
|
uint32_t node;
|
|
int32_t slot;
|
|
HostMemoryBackend *hostmem;
|
|
} PCDIMMDevice;
|
|
|
|
/**
|
|
* PCDIMMDeviceClass:
|
|
* @realize: called after common dimm is realized so that the dimm based
|
|
* devices get the chance to do specified operations.
|
|
* @get_memory_region: returns #MemoryRegion associated with @dimm which
|
|
* is directly mapped into the physical address space of guest.
|
|
* @get_vmstate_memory_region: returns #MemoryRegion which indicates the
|
|
* memory of @dimm should be kept during live migration.
|
|
*/
|
|
typedef struct PCDIMMDeviceClass {
|
|
/* private */
|
|
DeviceClass parent_class;
|
|
|
|
/* public */
|
|
void (*realize)(PCDIMMDevice *dimm, Error **errp);
|
|
MemoryRegion *(*get_memory_region)(PCDIMMDevice *dimm, Error **errp);
|
|
MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm);
|
|
} PCDIMMDeviceClass;
|
|
|
|
/**
|
|
* MemoryHotplugState:
|
|
* @base: address in guest physical address space where hotplug memory
|
|
* address space begins.
|
|
* @mr: hotplug memory address space container
|
|
*/
|
|
typedef struct MemoryHotplugState {
|
|
hwaddr base;
|
|
MemoryRegion mr;
|
|
} MemoryHotplugState;
|
|
|
|
uint64_t pc_dimm_get_free_addr(uint64_t address_space_start,
|
|
uint64_t address_space_size,
|
|
uint64_t *hint, uint64_t align, uint64_t size,
|
|
Error **errp);
|
|
|
|
int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp);
|
|
|
|
int qmp_pc_dimm_device_list(Object *obj, void *opaque);
|
|
uint64_t pc_existing_dimms_capacity(Error **errp);
|
|
void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
|
|
MemoryRegion *mr, uint64_t align, Error **errp);
|
|
void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms,
|
|
MemoryRegion *mr);
|
|
#endif
|