[Qemu-devel] [PATCH for-2.1 v2] pc-dimm: error out if memory hotplug is not enabled

[Qemu-devel] [PATCH for-2.1 v2] pc-dimm: error out if memory hotplug is not enabled

[Igor Mammedov]

fixes QEMU abort in case it's started without memory
hotplug enabled.

as result of fix it will print following messages:
"
-device pc-dimm,id=d1,memdev=m1: memory hotplug is not enabled, enable it on startup
-device pc-dimm,id=d1,memdev=m1: Device 'pc-dimm' could not be initialized
"

Also fixup assert condition to detect hotplug address
space overflow.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reported-by:  Hu Tao <hutao@cn.fujitsu.com>
---
v2:
 - amend error message
---
 hw/mem/pc-dimm.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index ad176b7..08f49ed 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -146,7 +146,13 @@ 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) {
+        error_setg(errp, "memory hotplug is not enabled, "
+                         "please add maxmem option");
+        goto out;
+    }
+
+    assert(address_space_end > address_space_start);
     object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);
 
     if (hint) {
-- 
1.7.1

Re: [Qemu-devel] [PATCH for-2.1 v2] pc-dimm: error out if memory hotplug is not enabled

[Michael S. Tsirkin]

On Mon, Jun 30, 2014 at 12:43:29PM +0200, Igor Mammedov wrote:
> fixes QEMU abort in case it's started without memory
> hotplug enabled.
> 
> as result of fix it will print following messages:
> "
> -device pc-dimm,id=d1,memdev=m1: memory hotplug is not enabled, enable it on startup
> -device pc-dimm,id=d1,memdev=m1: Device 'pc-dimm' could not be initialized
> "
> 
> Also fixup assert condition to detect hotplug address
> space overflow.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reported-by:  Hu Tao <hutao@cn.fujitsu.com>

Applied, thanks.

> ---
> v2:
>  - amend error message
> ---
>  hw/mem/pc-dimm.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index ad176b7..08f49ed 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -146,7 +146,13 @@ 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) {
> +        error_setg(errp, "memory hotplug is not enabled, "
> +                         "please add maxmem option");
> +        goto out;
> +    }
> +
> +    assert(address_space_end > address_space_start);
>      object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);
>  
>      if (hint) {
> -- 
> 1.7.1