diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-07 07:35:25 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-07 07:35:25 -0800 |
| commit | 0c0cb6a2378f937410f5f55cbf3e3b2c20f293c6 (patch) | |
| tree | f4a35f4f40d49203f47d5cea8008237df2d64413 /vl.c | |
| parent | 3c88da3c243ff7b452026e207cbba853123250cc (diff) | |
| parent | 33f373d7c56350fd2ec3e31f4f2c46cb49464911 (diff) | |
| download | focaccia-qemu-0c0cb6a2378f937410f5f55cbf3e3b2c20f293c6.tar.gz focaccia-qemu-0c0cb6a2378f937410f5f55cbf3e3b2c20f293c6.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
# By Alex Williamson (1) and others # Via Paolo Bonzini * qemu-kvm/uq/master: target-i386: fix cpuid leaf 0x0d qemu: mempath: prefault pages manually (v4) kvm: Query KVM for available memory slots Message-id: 1386345276-9803-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vl.c b/vl.c index 668f0f3921..b0399de25f 100644 --- a/vl.c +++ b/vl.c @@ -188,9 +188,7 @@ static int display_remote; const char* keyboard_layout = NULL; ram_addr_t ram_size; const char *mem_path = NULL; -#ifdef MAP_POPULATE int mem_prealloc = 0; /* force preallocation of physical target memory */ -#endif int nb_nics; NICInfo nd_table[MAX_NICS]; int autostart; @@ -3211,11 +3209,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_mempath: mem_path = optarg; break; -#ifdef MAP_POPULATE case QEMU_OPTION_mem_prealloc: mem_prealloc = 1; break; -#endif case QEMU_OPTION_d: log_mask = optarg; break; |