From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 2/2] fix compilation with --disable-kvm Date: Thu, 2 Oct 2008 09:49:57 -0300 Message-ID: <1222951797-9717-3-git-send-email-glommer@redhat.com> References: <1222951797-9717-1-git-send-email-glommer@redhat.com> Cc: avi@redhat.com, aliguori@us.ibm.com To: kvm@vger.kernel.org Return-path: Received: from mx2.redhat.com ([66.187.237.31]:37245 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753086AbYJBMxz (ORCPT ); Thu, 2 Oct 2008 08:53:55 -0400 In-Reply-To: <1222951797-9717-1-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Currently, kvm is failing to build with --disable-kvm. this patch fixes the issue. Signed-off-by: Glauber Costa --- qemu/gdbstub.c | 15 ++++++++++----- qemu/hw/acpi.c | 6 +++++- qemu/hw/cirrus_vga.c | 7 +++---- qemu/monitor.c | 6 ++++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c index d57cd61..d65f1cf 100644 --- a/qemu/gdbstub.c +++ b/qemu/gdbstub.c @@ -994,10 +994,12 @@ static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf) addr = strtoull(p, (char **)&p, 16); #if defined(TARGET_I386) env->eip = addr; - kvm_load_registers(env); + if (kvm_enabled()) + kvm_load_registers(env); #elif defined (TARGET_PPC) env->nip = addr; - kvm_load_registers(env); + if (kvm_enabled()) + kvm_load_registers(env); #elif defined (TARGET_SPARC) env->pc = addr; env->npc = addr + 4; @@ -1033,7 +1035,8 @@ static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf) addr = strtoull(p, (char **)&p, 16); #if defined(TARGET_I386) env->eip = addr; - kvm_load_registers(env); + if (kvm_enabled()) + kvm_load_registers(env); #elif defined (TARGET_PPC) env->nip = addr; kvm_load_registers(env); @@ -1078,7 +1081,8 @@ static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf) } break; case 'g': - kvm_save_registers(env); + if (kvm_enabled()) + kvm_save_registers(env); reg_size = cpu_gdb_read_registers(env, mem_buf); memtohex(buf, mem_buf, reg_size); put_packet(s, buf); @@ -1088,7 +1092,8 @@ static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf) len = strlen(p) / 2; hextomem((uint8_t *)registers, p, len); cpu_gdb_write_registers(env, mem_buf, len); - kvm_load_registers(env); + if (kvm_enabled()) + kvm_load_registers(env); put_packet(s, "OK"); break; case 'm': diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c index 05f5dc0..a51fcb7 100644 --- a/qemu/hw/acpi.c +++ b/qemu/hw/acpi.c @@ -726,7 +726,11 @@ void qemu_system_cpu_hot_add(int cpu, int state) { CPUState *env; - if ((state) && (!qemu_kvm_cpu_env(cpu))) { + if (state +#ifdef USE_KVM + && (!qemu_kvm_cpu_env(cpu)) +#endif + ) { env = pc_new_cpu(cpu, model, 1); if (!env) { fprintf(stderr, "cpu %d creation failed\n", cpu); diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c index 4f3aef9..dac0731 100644 --- a/qemu/hw/cirrus_vga.c +++ b/qemu/hw/cirrus_vga.c @@ -2677,14 +2677,13 @@ static void kvm_update_vga_alias(CirrusVGAState *s, int ok, int bank) if (!s->aliases_enabled || base != s->aliased_bank_base[bank] || limit != s->aliased_bank_limit[bank]) { - kvm_create_memory_alias(kvm_context, - 0xa0000 + bank * 0x8000, - limit, base); + kvm_qemu_create_memory_alias(0xa0000 + bank * 0x8000, + limit, base); s->aliased_bank_base[bank] = base; s->aliased_bank_limit[bank] = limit; } } else { - kvm_destroy_memory_alias(kvm_context, 0xa0000 + bank * 0x8000); + kvm_qemu_destroy_memory_alias(0xa0000 + bank * 0x8000); } } diff --git a/qemu/monitor.c b/qemu/monitor.c index d6b3da6..97b5cbe 100644 --- a/qemu/monitor.c +++ b/qemu/monitor.c @@ -292,7 +292,8 @@ static CPUState *mon_get_cpu(void) mon_set_cpu(0); } - kvm_save_registers(mon_cpu); + if (kvm_enabled()) + kvm_save_registers(mon_cpu); return mon_cpu; } @@ -320,7 +321,8 @@ static void do_info_cpus(void) mon_get_cpu(); for(env = first_cpu; env != NULL; env = env->next_cpu) { - kvm_save_registers(env); + if (kvm_enabled()) + kvm_save_registers(env); term_printf("%c CPU #%d:", (env == mon_cpu) ? '*' : ' ', env->cpu_index); -- 1.5.5.1