[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 2/4] check if we have space left for hotplugged
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH RFC 2/4] check if we have space left for hotplugged memory |
Date: |
Sat, 14 Jun 2014 12:48:57 +0800 |
If pc-dimm is specified on qemu command line, but only with
-m size (aka not -m size,maxmem,slots) then qemu will core dump.
This patch fixes the problem.
Signed-off-by: Hu Tao <address@hidden>
---
hw/mem/pc-dimm.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 8c26568..6e8bf43 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -107,7 +107,12 @@ uint64_t pc_dimm_get_free_addr(uint64_t
address_space_start,
uint64_t new_addr, ret = 0;
uint64_t address_space_end = address_space_start + address_space_size;
- assert(address_space_end > address_space_size);
+ if (address_space_size == 0) {
+ error_setg(errp, "can't add memory beyond 0x%" PRIx64,
+ address_space_end);
+ goto out;
+ }
+
object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);
if (hint) {
--
1.9.3
- Re: [Qemu-devel] [PATCH v5 00/16] NUMA series v5, (continued)
- Re: [Qemu-devel] [PATCH v5 00/16] NUMA series v5, Michael S. Tsirkin, 2014/06/13
- [Qemu-devel] [PATCH RFC 0/4] fixes for pci tree, Hu Tao, 2014/06/14
- [Qemu-devel] [PATCH RFC 1/4] get rid of signed range, Hu Tao, 2014/06/14
- Re: [Qemu-devel] [PATCH RFC 1/4] get rid of signed range, Michael S. Tsirkin, 2014/06/15
- Re: [Qemu-devel] [PATCH RFC 1/4] get rid of signed range, Hu Tao, 2014/06/16
- [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory, Hu Tao, 2014/06/14
- Re: [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory, Paolo Bonzini, 2014/06/14
- Re: [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory, Michael S. Tsirkin, 2014/06/15
- Re: [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory, Hu Tao, 2014/06/16
- Re: [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory, Paolo Bonzini, 2014/06/16
- [Qemu-devel] [PATCH RFC 2/4] check if we have space left for hotplugged memory,
Hu Tao <=
- Re: [Qemu-devel] [PATCH RFC 2/4] check if we have space left for hotplugged memory, Michael S. Tsirkin, 2014/06/15
- Re: [Qemu-devel] [PATCH RFC 2/4] check if we have space left for hotplugged memory, Hu Tao, 2014/06/16
- [Qemu-devel] [PATCH RFC 4/4] memory-backend-file: error out if failed to allocate memory, Hu Tao, 2014/06/14
- Re: [Qemu-devel] [PATCH RFC 4/4] memory-backend-file: error out if failed to allocate memory, Paolo Bonzini, 2014/06/14
- Re: [Qemu-devel] [PATCH RFC 4/4] memory-backend-file: error out if failed to allocate memory, Hu Tao, 2014/06/16
- Re: [Qemu-devel] [PATCH RFC 0/4] fixes for pci tree, Michael S. Tsirkin, 2014/06/15
- Re: [Qemu-devel] [PATCH RFC 0/4] fixes for pci tree, Hu Tao, 2014/06/16
- Re: [Qemu-devel] [PATCH RFC 0/4] fixes for pci tree, Michael S. Tsirkin, 2014/06/16
- Re: [Qemu-devel] [PATCH RFC 0/4] fixes for pci tree, Hu Tao, 2014/06/16