From 788d11aa2cb3f1a8f2b8406aad3e7dd997a2e6fd Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Fri, 27 Jan 2017 18:22:29 +0100
Subject: [PATCH] hax: Fix some merge problems

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 cpus.c | 12 +-----------
 exec.c | 16 ----------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/cpus.c b/cpus.c
index ef8ba4d613..5ccfff82b7 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1271,11 +1271,6 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
         return;
     }
     cpu->thread_kicked = true;
-#ifdef CONFIG_DARWIN
-    if (hax_enabled()) {
-        cpu->exit_request = 1;
-    }
-#endif
     err = pthread_kill(cpu->thread->thread, SIG_IPI);
     if (err) {
         fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
@@ -1455,9 +1450,6 @@ static void qemu_tcg_init_vcpu(CPUState *cpu)
     static QemuCond *tcg_halt_cond;
     static QemuThread *tcg_cpu_thread;
 
-    if (hax_enabled())
-        hax_init_vcpu(cpu);
-
     /* share a single thread for all cpus with TCG */
     if (!tcg_cpu_thread) {
         cpu->thread = g_malloc0(sizeof(QemuThread));
@@ -1605,9 +1597,7 @@ int vm_stop_force_state(RunState state)
 void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)
 {
     /* XXX: implement xxx_cpu_list for targets that still miss it */
-#if defined(cpu_list_id)
-    cpu_list_id(f, cpu_fprintf, optarg);
-#elif defined(cpu_list)
+#if defined(cpu_list)
     cpu_list(f, cpu_fprintf); /* deprecated */
 #else
     printf("Target ignores cpu selection\n");
diff --git a/exec.c b/exec.c
index 2f9690cf38..02452bb382 100644
--- a/exec.c
+++ b/exec.c
@@ -31,7 +31,6 @@
 #include "hw/xen/xen.h"
 #endif
 #include "sysemu/kvm.h"
-#include "sysemu/hax.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "qemu/config-file.h"
@@ -1650,21 +1649,6 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
                 qemu_mutex_unlock_ramlist();
                 return;
             }
-            /*
-             * In Hax, the qemu allocate the virtual address, and HAX kernel
-             * populate the memory with physical memory. Currently we have no
-             * paging, so user should make sure enough free memory in advance
-             */
-            if (hax_enabled()) {
-                int ret;
-                ret = hax_populate_ram((uint64_t)(uintptr_t)new_block->host,
-                                       new_block->max_length);
-                if (ret < 0) {
-                    error_setg(errp, "Hax failed to populate ram");
-                    return;
-                }
-            }
-
             memory_try_enable_merging(new_block->host, new_block->max_length);
         }
     }
-- 
2.11.4.GIT