From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4zzY-0008FY-Jb for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4zzS-0000H9-7j for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4zzR-0000H1-RJ for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:26 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s69M5PYf010326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 9 Jul 2014 18:05:25 -0400 From: Eduardo Habkost Date: Wed, 9 Jul 2014 19:04:18 -0300 Message-Id: <1404943462-711-22-git-send-email-ehabkost@redhat.com> In-Reply-To: <1404943462-711-1-git-send-email-ehabkost@redhat.com> References: <1404943462-711-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 21/25] kvm: x86 KVM accelerator subclass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Implements TYPE_X86_ACCEL. Signed-off-by: Eduardo Habkost --- include/sysemu/kvm.h | 3 +++ kvm-all.c | 2 -- target-i386/kvm.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 7b95bfd..34b4dfe 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -414,4 +414,7 @@ int kvm_set_one_reg(CPUState *cs, uint64_t id, void *source); * Returns: 0 on success, or a negative errno on failure. */ int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target); + +#define TYPE_KVM_ACCEL "kvm-accel" + #endif diff --git a/kvm-all.c b/kvm-all.c index 9185a62..c03b4e7 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -113,8 +113,6 @@ typedef struct KVMState #endif } KVMState; -#define TYPE_KVM_ACCEL "kvm-accel" - #define KVM_STATE(obj) \ OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 097fe11..6221794 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -28,6 +28,7 @@ #include "exec/gdbstub.h" #include "qemu/host-utils.h" #include "qemu/config-file.h" +#include "hw/i386/accel.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" #include "hw/i386/apic_internal.h" @@ -2591,3 +2592,21 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id) return kvm_deassign_irq_internal(s, dev_id, KVM_DEV_IRQ_GUEST_MSIX | KVM_DEV_IRQ_HOST_MSIX); } + +#define TYPE_X86_KVM_ACCEL TARGET_NAME "-kvm-accel" + +static const TypeInfo x86_kvm_accel_type = { + .name = TYPE_X86_KVM_ACCEL, + .parent = TYPE_KVM_ACCEL, + .interfaces = (InterfaceInfo[]) { + { TYPE_X86_ACCEL }, + { } + }, +}; + +static void x86_kvm_type_init(void) +{ + type_register_static(&x86_kvm_accel_type); +} + +type_init(x86_kvm_type_init); -- 1.9.3