diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-08-17 08:59:02 +0200 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 17:02:34 -0300 |
commit | ea709154e3a0e8c9be8ffbc8be294ea956352685 (patch) | |
tree | 6a50b0bbc105c957e304941177e8450d3932779e | |
parent | 2b823c5ca04857e214adbf946592ac04c7e27a30 (diff) |
qemu-kvm: Kill qemu-kvm.[ch]
Hurray!
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | hw/device-assignment.c | 1 | ||||
-rw-r--r-- | kvm-all.c | 3 | ||||
-rw-r--r-- | kvm.h | 7 | ||||
-rw-r--r-- | qemu-kvm.c | 37 | ||||
-rw-r--r-- | qemu-kvm.h | 37 |
5 files changed, 0 insertions, 85 deletions
diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 32a082d7e..5ef562993 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -31,7 +31,6 @@ #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> -#include "qemu-kvm.h" #include "hw.h" #include "pc.h" #include "qemu-error.h" @@ -2043,6 +2043,3 @@ int kvm_on_sigbus(int code, void *addr) { return kvm_arch_on_sigbus(code, addr); } - -#undef PAGE_SIZE -#include "qemu-kvm.c" @@ -146,7 +146,6 @@ int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset); int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#endif /* NEED_CPU_H */ /* internal API */ @@ -154,7 +153,6 @@ int kvm_ioctl(KVMState *s, int type, ...); int kvm_vm_ioctl(KVMState *s, int type, ...); -#ifdef NEED_CPU_H int kvm_vcpu_ioctl(CPUArchState *env, int type, ...); /* Arch specific hooks */ @@ -280,9 +278,4 @@ int kvm_irqchip_add_irqfd(KVMState *s, int fd, int virq); int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq); int kvm_irqchip_add_irq_notifier(KVMState *s, EventNotifier *n, int virq); int kvm_irqchip_remove_irq_notifier(KVMState *s, EventNotifier *n, int virq); - -#ifdef NEED_CPU_H -#include "qemu-kvm.h" -#endif - #endif diff --git a/qemu-kvm.c b/qemu-kvm.c deleted file mode 100644 index 3dc56eae1..000000000 --- a/qemu-kvm.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * qemu/kvm integration - * - * Copyright (C) 2006-2008 Qumranet Technologies - * - * Licensed under the terms of the GNU GPL version 2 or higher. - */ -#include "config.h" -#include "config-host.h" - -#include <assert.h> -#include <string.h> -#include "hw/hw.h" -#include "sysemu.h" -#include "qemu-common.h" -#include "console.h" -#include "block.h" -#include "compatfd.h" -#include "gdbstub.h" -#include "monitor.h" -#include "cpus.h" - -#include "qemu-kvm.h" - -#define EXPECTED_KVM_API_VERSION 12 - -#if EXPECTED_KVM_API_VERSION != KVM_API_VERSION -#error libkvm: userspace and kernel version mismatch -#endif - -#define ALIGN(x, y) (((x)+(y)-1) & ~((y)-1)) - -#if !defined(TARGET_I386) -void kvm_arch_init_irq_routing(KVMState *s) -{ -} -#endif diff --git a/qemu-kvm.h b/qemu-kvm.h deleted file mode 100644 index f7d9cd563..000000000 --- a/qemu-kvm.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * qemu/kvm integration - * - * Copyright (C) 2006-2008 Qumranet Technologies - * - * Licensed under the terms of the GNU GPL version 2 or higher. - */ -#ifndef THE_ORIGINAL_AND_TRUE_QEMU_KVM_H -#define THE_ORIGINAL_AND_TRUE_QEMU_KVM_H - -#include "cpu.h" - -#include <signal.h> -#include <stdlib.h> - -#ifdef CONFIG_KVM - -#include <stdint.h> - -#ifndef __user -#define __user /* temporary, until installed via make headers_install */ -#endif - -#include <linux/kvm.h> - -#include <signal.h> - -/* FIXME: share this number with kvm */ -/* FIXME: or dynamically alloc/realloc regions */ -#define KVM_MAX_NUM_MEM_REGIONS 32u -#define MAX_VCPUS 16 - -#include "kvm.h" - -#endif /* CONFIG_KVM */ - -#endif |