Re: [Qemu-devel] [PATCH v2 2/3] exec.c: check memory backend file size with 'size' option

2016-10-31 Thread Paolo Bonzini 


On 31/10/2016 18:23, Eduardo Habkost wrote:
> On Thu, Oct 27, 2016 at 12:22:59PM +0800, Haozhong Zhang wrote:
>> If the memory backend file is not large enough to hold the required 'size',
>> Qemu will report error and exit.
>>
>> Signed-off-by: Haozhong Zhang 
> 
> Applied to machine-next. Thanks!

Also part of my pull request. :)

Paolo

>> ---
>>  exec.c | 7 +++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/exec.c b/exec.c
>> index a2b371a..264a25f 100644
>> --- a/exec.c
>> +++ b/exec.c
>> @@ -1316,6 +1316,13 @@ static void *file_ram_alloc(RAMBlock *block,
>>  goto error;
>>  }
>>  
>> +if (file_size > 0 && file_size < memory) {
>> +error_setg(errp, "backing store %s size %"PRId64
>> +   " does not match 'size' option %"PRIu64,
>> +   path, file_size, memory);
>> +goto error;
>> +}
>> +
>>  memory = ROUND_UP(memory, block->page_size);
>>  
>>  /*
>> -- 
>> 2.10.1
>>
>>
>

Re: [Qemu-devel] [PATCH v2 2/3] exec.c: check memory backend file size with 'size' option

2016-10-31 Thread Eduardo Habkost 
On Thu, Oct 27, 2016 at 12:22:59PM +0800, Haozhong Zhang wrote:
> If the memory backend file is not large enough to hold the required 'size',
> Qemu will report error and exit.
> 
> Signed-off-by: Haozhong Zhang 

Applied to machine-next. Thanks!

> ---
>  exec.c | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/exec.c b/exec.c
> index a2b371a..264a25f 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1316,6 +1316,13 @@ static void *file_ram_alloc(RAMBlock *block,
>  goto error;
>  }
>  
> +if (file_size > 0 && file_size < memory) {
> +error_setg(errp, "backing store %s size %"PRId64
> +   " does not match 'size' option %"PRIu64,
> +   path, file_size, memory);
> +goto error;
> +}
> +
>  memory = ROUND_UP(memory, block->page_size);
>  
>  /*
> -- 
> 2.10.1
> 
> 

-- 
Eduardo

Re: [Qemu-devel] [PATCH v2 2/3] exec.c: check memory backend file size with 'size' option

2016-10-27 Thread Eduardo Habkost 
On Thu, Oct 27, 2016 at 12:22:59PM +0800, Haozhong Zhang wrote:
> If the memory backend file is not large enough to hold the required 'size',
> Qemu will report error and exit.
> 
> Signed-off-by: Haozhong Zhang 

Reviewed-by: Eduardo Habkost 

> ---
>  exec.c | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/exec.c b/exec.c
> index a2b371a..264a25f 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1316,6 +1316,13 @@ static void *file_ram_alloc(RAMBlock *block,
>  goto error;
>  }
>  
> +if (file_size > 0 && file_size < memory) {
> +error_setg(errp, "backing store %s size %"PRId64
> +   " does not match 'size' option %"PRIu64,
> +   path, file_size, memory);
> +goto error;
> +}
> +
>  memory = ROUND_UP(memory, block->page_size);
>  
>  /*
> -- 
> 2.10.1
> 

-- 
Eduardo

[Qemu-devel] [PATCH v2 2/3] exec.c: check memory backend file size with 'size' option

2016-10-26 Thread Haozhong Zhang 
If the memory backend file is not large enough to hold the required 'size',
Qemu will report error and exit.

Signed-off-by: Haozhong Zhang 
---
 exec.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/exec.c b/exec.c
index a2b371a..264a25f 100644
--- a/exec.c
+++ b/exec.c
@@ -1316,6 +1316,13 @@ static void *file_ram_alloc(RAMBlock *block,
 goto error;
 }
 
+if (file_size > 0 && file_size < memory) {
+error_setg(errp, "backing store %s size %"PRId64
+   " does not match 'size' option %"PRIu64,
+   path, file_size, memory);
+goto error;
+}
+
 memory = ROUND_UP(memory, block->page_size);
 
 /*
-- 
2.10.1