From patchwork Thu Aug 16 13:54:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1332241 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4378D40211 for ; Thu, 16 Aug 2012 13:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932572Ab2HPNz7 (ORCPT ); Thu, 16 Aug 2012 09:55:59 -0400 Received: from david.siemens.de ([192.35.17.14]:34088 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757113Ab2HPNym (ORCPT ); Thu, 16 Aug 2012 09:54:42 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsZUq007019; Thu, 16 Aug 2012 15:54:35 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsYJN012893; Thu, 16 Aug 2012 15:54:35 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson Subject: [PATCH 13/19] qemu-kvm: Kill qemu-kvm.[ch] Date: Thu, 16 Aug 2012 15:54:27 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hurray! Signed-off-by: Jan Kiszka --- hw/device-assignment.c | 1 - kvm-all.c | 3 --- kvm.h | 7 ------- qemu-kvm.c | 37 ------------------------------------- qemu-kvm.h | 37 ------------------------------------- 5 files changed, 0 insertions(+), 85 deletions(-) delete mode 100644 qemu-kvm.c delete mode 100644 qemu-kvm.h diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 32a082d..5ef5629 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -31,7 +31,6 @@ #include #include #include -#include "qemu-kvm.h" #include "hw.h" #include "pc.h" #include "qemu-error.h" diff --git a/kvm-all.c b/kvm-all.c index 8ab47f1..badf1d8 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -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" diff --git a/kvm.h b/kvm.h index 0c09be8..2a68a52 100644 --- a/kvm.h +++ b/kvm.h @@ -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 3dc56ea..0000000 --- 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 -#include -#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 f7d9cd5..0000000 --- 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 -#include - -#ifdef CONFIG_KVM - -#include - -#ifndef __user -#define __user /* temporary, until installed via make headers_install */ -#endif - -#include - -#include - -/* 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