From patchwork Sun Jun 14 10:52:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 30139 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5EAqV47017489 for ; Sun, 14 Jun 2009 10:52:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756449AbZFNKwY (ORCPT ); Sun, 14 Jun 2009 06:52:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756376AbZFNKwY (ORCPT ); Sun, 14 Jun 2009 06:52:24 -0400 Received: from mx2.redhat.com ([66.187.237.31]:33921 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754913AbZFNKwX (ORCPT ); Sun, 14 Jun 2009 06:52:23 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5EAqPrm023665 for ; Sun, 14 Jun 2009 06:52:25 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5EAqOsN020591; Sun, 14 Jun 2009 06:52:24 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5EAqNeu003119; Sun, 14 Jun 2009 06:52:23 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id D0A7C18D47D; Sun, 14 Jun 2009 13:52:22 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH 5/6] Rename kvm_(load|save)_mpstate to kvm_arch_(load|save)_mpstate Date: Sun, 14 Jun 2009 13:52:21 +0300 Message-Id: <1244976742-22926-5-git-send-email-gleb@redhat.com> In-Reply-To: <1244976742-22926-1-git-send-email-gleb@redhat.com> References: <1244976742-22926-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org To be consistent with other function naming. Signed-off-by: Gleb Natapov --- qemu-kvm-ia64.c | 4 ++-- qemu-kvm-x86.c | 4 ++-- qemu-kvm.h | 2 ++ target-i386/machine.c | 6 +++--- target-ia64/machine.c | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c index d33c1c3..234602c 100644 --- a/qemu-kvm-ia64.c +++ b/qemu-kvm-ia64.c @@ -98,7 +98,7 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) { } -void kvm_save_mpstate(CPUState *env) +void kvm_arch_save_mpstate(CPUState *env) { #ifdef KVM_CAP_MP_STATE int r; @@ -112,7 +112,7 @@ void kvm_save_mpstate(CPUState *env) #endif } -void kvm_load_mpstate(CPUState *env) +void kvm_arch_load_mpstate(CPUState *env) { #ifdef KVM_CAP_MP_STATE struct kvm_mp_state mp_state = { .mp_state = env->mp_state }; diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 729d600..8e6fb75 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -295,7 +295,7 @@ void kvm_load_tsc(CPUState *env) perror("kvm_set_tsc FAILED.\n"); } -void kvm_save_mpstate(CPUState *env) +void kvm_arch_save_mpstate(CPUState *env) { #ifdef KVM_CAP_MP_STATE int r; @@ -309,7 +309,7 @@ void kvm_save_mpstate(CPUState *env) #endif } -void kvm_load_mpstate(CPUState *env) +void kvm_arch_load_mpstate(CPUState *env) { #ifdef KVM_CAP_MP_STATE struct kvm_mp_state mp_state = { .mp_state = env->mp_state }; diff --git a/qemu-kvm.h b/qemu-kvm.h index fa40542..3b73fe9 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -69,6 +69,8 @@ int kvm_arch_qemu_create_context(void); void kvm_arch_save_regs(CPUState *env); void kvm_arch_load_regs(CPUState *env); +void kvm_arch_load_mpstate(CPUState *env); +void kvm_arch_save_mpstate(CPUState *env); int kvm_arch_qemu_init_env(CPUState *cenv); void kvm_arch_pre_kvm_run(void *opaque, CPUState *env); void kvm_arch_post_kvm_run(void *opaque, CPUState *env); diff --git a/target-i386/machine.c b/target-i386/machine.c index 07df1e1..14942c0 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -34,7 +34,7 @@ void cpu_save(QEMUFile *f, void *opaque) if (kvm_enabled()) { kvm_save_registers(env); - kvm_save_mpstate(env); + kvm_arch_save_mpstate(env); } for(i = 0; i < CPU_NB_REGS; i++) @@ -369,12 +369,12 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) kvm_load_tsc(env); if (version_id >= 5) { qemu_get_be32s(f, &env->mp_state); - kvm_load_mpstate(env); + kvm_arch_load_mpstate(env); } } else { kvm_load_registers(env); kvm_load_tsc(env); - kvm_load_mpstate(env); + kvm_arch_load_mpstate(env); } } return 0; diff --git a/target-ia64/machine.c b/target-ia64/machine.c index dd205c5..70ef379 100644 --- a/target-ia64/machine.c +++ b/target-ia64/machine.c @@ -10,7 +10,7 @@ void cpu_save(QEMUFile *f, void *opaque) if (kvm_enabled()) { kvm_save_registers(env); - kvm_save_mpstate(env); + kvm_arch_save_mpstate(env); } } @@ -20,7 +20,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) if (kvm_enabled()) { kvm_load_registers(env); - kvm_load_mpstate(env); + kvm_arch_load_mpstate(env); } return 0; }