]> git.proxmox.com Git - mirror_qemu.git/commit
exec: Fix Xen RAM allocation with unusual options
authorMarkus Armbruster <armbru@redhat.com>
Wed, 31 Jul 2013 13:11:05 +0000 (15:11 +0200)
committerAnthony Liguori <anthony@codemonkey.ws>
Thu, 12 Sep 2013 16:45:31 +0000 (11:45 -0500)
commitdfeaf2abc73429171ecc5b0b26ac4e5a24c047fc
tree11c655aa3da1fceeb46473c91d0d1b51d91b99b6
parent2d1fe1873a984d1c2c89ffa3d12949cafc718551
exec: Fix Xen RAM allocation with unusual options

Issues:

* We try to obey -mem-path even though it can't work with Xen.

* To implement -machine mem-merge, we call
  memory_try_enable_merging(new_block->host, size).  But with Xen,
  new_block->host remains null.  Oops.

Fix by separating Xen allocation from normal allocation.

Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1375276272-15988-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
exec.c