diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2015-06-03 17:10:43 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-04 11:20:34 +0200 |
| commit | b5d3b039221f056befb3715471fee1f68214815c (patch) | |
| tree | 03e08bfe9578c180cdf8ad22587634d630a9dccd /hw/mem/pc-dimm.c | |
| parent | 814550d73a94dcf9f2c9f8d2ee280226f1145388 (diff) | |
| download | focaccia-qemu-b5d3b039221f056befb3715471fee1f68214815c.tar.gz focaccia-qemu-b5d3b039221f056befb3715471fee1f68214815c.zip | |
pc-dimm: don't assert if pc-dimm alignment != hotpluggable mem range size
Drop superfluous pc-dimm alignment on hot-pluggable mem range size assert, since it causes QEMU crash during hotplug when hotplugging pc-dimm with alignment bigger than an alignment of hot-pluggable mem range size. Instead allow pc_dimm_get_free_addr() find free address and bail out gracefully later in that function during checking if pc-dimm will fit in hot-pluggable mem range. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/mem/pc-dimm.c')
| -rw-r--r-- | hw/mem/pc-dimm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 39f0c97c0c..e70633d29f 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -211,7 +211,6 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, uint64_t address_space_end = address_space_start + address_space_size; g_assert(QEMU_ALIGN_UP(address_space_start, align) == address_space_start); - g_assert(QEMU_ALIGN_UP(address_space_size, align) == address_space_size); if (!address_space_size) { error_setg(errp, "memory hotplug is not enabled, " |