diff options
| author | Markus Armbruster | 2013-07-31 15:11:05 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-09-12 18:45:31 +0200 |
| commit | dfeaf2abc73429171ecc5b0b26ac4e5a24c047fc (patch) | |
| tree | 11c655aa3da1fceeb46473c91d0d1b51d91b99b6 /include/exec | |
| parent | Merge remote-tracking branch 'pmaydell/tags/pull-target-arm-20130910' into st... (diff) | |
| download | qemu-dfeaf2abc73429171ecc5b0b26ac4e5a24c047fc.tar.gz qemu-dfeaf2abc73429171ecc5b0b26ac4e5a24c047fc.tar.xz qemu-dfeaf2abc73429171ecc5b0b26ac4e5a24c047fc.zip | |
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>
Diffstat (limited to 'include/exec')
0 files changed, 0 insertions, 0 deletions