From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [patch 2/7] kvm-tpr-opt: use device_init Date: Mon, 08 Mar 2010 21:47:06 -0300 Message-ID: <20100309004834.598287175@redhat.com> References: <20100309004704.049355766@redhat.com> Cc: Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:64519 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756255Ab0CIAtd (ORCPT ); Mon, 8 Mar 2010 19:49:33 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o290nWCx023329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Mar 2010 19:49:32 -0500 Content-Disposition: inline; filename=kvm-tpr-device-init Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Marcelo Tosatti Index: qemu-kvm-tpr/kvm-tpr-opt.c =================================================================== --- qemu-kvm-tpr.orig/kvm-tpr-opt.c +++ qemu-kvm-tpr/kvm-tpr-opt.c @@ -401,10 +401,12 @@ static void vtpr_ioport_write(void *opaq kvm_tpr_enable_vapic(env); } -void kvm_tpr_opt_setup(void) +static void kvm_tpr_opt_setup(void) { register_savevm("kvm-tpr-opt", 0, 1, tpr_save, tpr_load, NULL); register_ioport_write(0x7e, 1, 1, vtpr_ioport_write, NULL); register_ioport_write(0x7e, 2, 2, vtpr_ioport_write16, NULL); } +device_init(kvm_tpr_opt_setup); + Index: qemu-kvm-tpr/qemu-kvm-x86.c =================================================================== --- qemu-kvm-tpr.orig/qemu-kvm-x86.c +++ qemu-kvm-tpr/qemu-kvm-x86.c @@ -157,10 +157,6 @@ int kvm_arch_create(kvm_context_t kvm, u if (r < 0) return r; -#ifdef KVM_EXIT_TPR_ACCESS - kvm_tpr_opt_setup(); -#endif - return 0; } Index: qemu-kvm-tpr/qemu-kvm.h =================================================================== --- qemu-kvm-tpr.orig/qemu-kvm.h +++ qemu-kvm-tpr/qemu-kvm.h @@ -894,7 +894,6 @@ void qemu_kvm_aio_wait_end(void); void qemu_kvm_notify_work(void); -void kvm_tpr_opt_setup(void); void kvm_tpr_access_report(CPUState *env, uint64_t rip, int is_write); void kvm_tpr_vcpu_start(CPUState *env);