[Qemu-commits] [qemu/qemu] 87a45c: pc-dimm: add a function to calculate VM's current ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9
      
https://github.com/qemu/qemu/commit/87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M hw/mem/pc-dimm.c
    M include/exec/cpu-common.h
    M stubs/qmp_pc_dimm_device_list.c

  Log Message:
  -----------
  pc-dimm: add a function to calculate VM's current RAM size

The global parameter 'ram_size' does not take into account
the hotplugged memory.

In some codes, we use 'ram_size' as current VM's real RAM size,
which is not correct.

Add function 'get_current_ram_size' to calculate VM's current RAM size,
it will enumerate present memory devices and also plus ram_size.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 463756d03164d640e3de00460488ba97302bf77e
      
https://github.com/qemu/qemu/commit/463756d03164d640e3de00460488ba97302bf77e
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M hw/virtio/virtio-balloon.c

  Log Message:
  -----------
  virtio-balloon: Fix balloon not working correctly when hotplug memory

When do memory balloon, it takes the 'ram_size' as the VM's current ram size,
But 'ram_size' is the startup configured ram size, it does not take into
account the hotplugged memory.

As a result, the balloon result will be confused.
Steps to reproduce:
(1)Start VM: qemu -m size=1024,slots=4,maxmem=8G
(2)In VM: #free -m : 1024M
(3)qmp balloon 512M
(4)In VM: #free -m : 512M
(5)hotplug pc-dimm 1G
(6)In VM: #free -m : 1512M
(7)qmp balloon 256M
(8)In VM: #free -m :1256M
We expect the VM's available ram size to be 256M after 'qmp balloon 256M'
command, but VM's real available ram size is 1256M.

For "qmp balloon" is not performance critical code, we use function
'get_current_ram_size' to get VM's current ram size.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 6adfdc5a6a4c2540a802e10fe0370d3ffb14487b
      
https://github.com/qemu/qemu/commit/6adfdc5a6a4c2540a802e10fe0370d3ffb14487b
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M hw/virtio/virtio-balloon.c
    M trace-events

  Log Message:
  -----------
  virtio-balloon: Add some trace events

Add some trace events for easier debugging

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 9fcc07948608423539f2030f8ea12aadbcdbb6ed
      
https://github.com/qemu/qemu/commit/9fcc07948608423539f2030f8ea12aadbcdbb6ed
  Author: Luiz Capitulino <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options.hx: improve -m description

Add memory hotplug options to the command-line format. Also,
add a complete command-line example and improve description.

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Paulo Vital <address@hidden>


  Commit: a3b042179859c68b3d08f8aa43866d28d6b56987
      
https://github.com/qemu/qemu/commit/a3b042179859c68b3d08f8aa43866d28d6b56987
  Author: Luiz Capitulino <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    A docs/memory-hotplug.txt

  Log Message:
  -----------
  docs: add memory-hotplug.txt

This document describes how to use memory hotplug in QEMU.

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Paulo Vital <address@hidden>


  Commit: 9c31a8219a8fb6e790d5510987ae2c810ff968b5
      
https://github.com/qemu/qemu/commit/9c31a8219a8fb6e790d5510987ae2c810ff968b5
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    A docs/memory-hotplug.txt
    M hw/mem/pc-dimm.c
    M hw/virtio/virtio-balloon.c
    M include/exec/cpu-common.h
    M qemu-options.hx
    M stubs/qmp_pc_dimm_device_list.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  docs: add memory-hotplug.txt
  qemu-options.hx: improve -m description
  virtio-balloon: Add some trace events
  virtio-balloon: Fix balloon not working correctly when hotplug memory
  pc-dimm: add a function to calculate VM's current RAM size

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/033c7ddf86fe...9c31a8219a8f