[pve-devel] [PATCH v2 qemu-server 1/2] fix #3581: cover letter

[pve-devel] [PATCH v2 qemu-server 1/2] fix #3581: cover letter

[Constantin Herold]

props have been removed in qemu 6, use arguments instead
see https://qemu.weilnetz.de/doc/6.0/system/removed-features.html#object-add-option-props-removed-in-6-0

This might break memory hotplug for vm's tagged to qemu <=4.2

Constantin Herold (1):
  pass size via argument for memory-backend-ram qmp call

 PVE/QemuServer/Memory.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
2.23.0

[pve-devel] [PATCH v2 qemu-server 2/2] fix #3581: pass size via argument for memory-backend-ram qmp call

[Constantin Herold]

Signed-off-by: Constantin Herold <proxmox8914@herold.me>
---
 PVE/QemuServer/Memory.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index f3e15f1..a41f5ae 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -143,8 +143,7 @@ sub qemu_memory_hotplug {
 			my $hugepages_host_topology = hugepages_host_topology();
 			hugepages_allocate($hugepages_topology, $hugepages_host_topology);
 
-			eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-file", id => "mem-$name", props => {
-					     size => int($dimm_size*1024*1024), 'mem-path' => $path, share => JSON::true, prealloc => JSON::true } ); };
+			eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-file", id => "mem-$name", size => int($dimm_size*1024*1024), 'mem-path' => $path, share => JSON::true, prealloc => JSON::true ) };
 			if (my $err = $@) {
 			    hugepages_reset($hugepages_host_topology);
 			    die $err;
@@ -155,7 +154,7 @@ sub qemu_memory_hotplug {
 		    eval { hugepages_update_locked($code); };
 
 		} else {
-		    eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-ram", id => "mem-$name", props => { size => int($dimm_size*1024*1024) } ) };
+		    eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-ram", id => "mem-$name", size => int($dimm_size*1024*1024) ) };
 		}
 
 		if (my $err = $@) {
-- 
2.23.0

[pve-devel] applied: [PATCH v2 qemu-server 2/2] fix #3581: pass size via argument for memory-backend-ram qmp call

[Wolfgang Bumiller]

applied, thanks

For the record though, I didn't mean adding a cover letter, as that
won't appear in the git history, I meant including the info in the
commit message of the patch itself ;-)
(There's a bug number associated with it though containing the info, so
that's fine.)

On Tue, Aug 17, 2021 at 05:34:34PM +0200, Constantin Herold wrote:
> Signed-off-by: Constantin Herold <proxmox8914@herold.me>
> ---
>  PVE/QemuServer/Memory.pm | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index f3e15f1..a41f5ae 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -143,8 +143,7 @@ sub qemu_memory_hotplug {
>  			my $hugepages_host_topology = hugepages_host_topology();
>  			hugepages_allocate($hugepages_topology, $hugepages_host_topology);
>  
> -			eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-file", id => "mem-$name", props => {
> -					     size => int($dimm_size*1024*1024), 'mem-path' => $path, share => JSON::true, prealloc => JSON::true } ); };
> +			eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-file", id => "mem-$name", size => int($dimm_size*1024*1024), 'mem-path' => $path, share => JSON::true, prealloc => JSON::true ) };
>  			if (my $err = $@) {
>  			    hugepages_reset($hugepages_host_topology);
>  			    die $err;
> @@ -155,7 +154,7 @@ sub qemu_memory_hotplug {
>  		    eval { hugepages_update_locked($code); };
>  
>  		} else {
> -		    eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-ram", id => "mem-$name", props => { size => int($dimm_size*1024*1024) } ) };
> +		    eval { mon_cmd($vmid, "object-add", 'qom-type' => "memory-backend-ram", id => "mem-$name", size => int($dimm_size*1024*1024) ) };
>  		}
>  
>  		if (my $err = $@) {
> -- 
> 2.23.0