From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerone Young Subject: [PATCH 18 of 27] Change name of post_kvm_run & pre_kvm_run in kvmctl.c Date: Wed, 31 Oct 2007 12:05:23 -0500 Message-ID: <93f50f2aeecde3b78c11.1193850323@thinkpad> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org # HG changeset patch # User Jerone Young # Date 1193849564 18000 # Node ID 93f50f2aeecde3b78c110712acecce60e47e8899 # Parent 278fbab64f4b40dd4c40a7b07cb92e9b19aedd71 Change name of post_kvm_run & pre_kvm_run in kvmctl.c This patch changes the name of: post_kvm_run --> kvm_post_run pre_kvm_run --> kvm_pre_run The reason for this change is to avoid a name conflict with the current qemu code. In this code qemu-kvm.c has fuctions of the same name causes a compilation error since these fuctions are no longer static. Signed-off-by: Jerone Young diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c --- a/libkvm/libkvm-x86.c +++ b/libkvm/libkvm-x86.c @@ -518,11 +518,11 @@ int kvm_run_abi10(kvm_context_t kvm, int again: run->request_interrupt_window = try_push_interrupts(kvm); - r = pre_kvm_run(kvm, vcpu); + r = kvm_pre_run(kvm, vcpu); if (r) return r; r = ioctl(fd, KVM_RUN, 0); - post_kvm_run(kvm, vcpu); + kvm_post_run(kvm, vcpu); run->io_completed = 0; if (r == -1 && errno != EINTR) { diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -858,12 +858,12 @@ int try_push_interrupts(kvm_context_t kv return kvm->callbacks->try_push_interrupts(kvm->opaque); } -void post_kvm_run(kvm_context_t kvm, int vcpu) +void kvm_post_run(kvm_context_t kvm, int vcpu) { kvm->callbacks->post_kvm_run(kvm->opaque, vcpu); } -int pre_kvm_run(kvm_context_t kvm, int vcpu) +int kvm_pre_run(kvm_context_t kvm, int vcpu) { return kvm->callbacks->pre_kvm_run(kvm->opaque, vcpu); } @@ -923,11 +923,11 @@ again: again: if (!kvm->irqchip_in_kernel) run->request_interrupt_window = try_push_interrupts(kvm); - r = pre_kvm_run(kvm, vcpu); + r = kvm_pre_run(kvm, vcpu); if (r) return r; r = ioctl(fd, KVM_RUN, 0); - post_kvm_run(kvm, vcpu); + kvm_post_run(kvm, vcpu); if (r == -1 && errno != EINTR && errno != EAGAIN) { r = -errno; diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -549,8 +549,8 @@ void *kvm_create_userspace_phys_mem(kvm_ int handle_halt(kvm_context_t kvm, int vcpu); int handle_shutdown(kvm_context_t kvm, int vcpu); -void post_kvm_run(kvm_context_t kvm, int vcpu); -int pre_kvm_run(kvm_context_t kvm, int vcpu); +void kvm_post_run(kvm_context_t kvm, int vcpu); +int kvm_pre_run(kvm_context_t kvm, int vcpu); int handle_io_window(kvm_context_t kvm); int handle_debug(kvm_context_t kvm, int vcpu); int try_push_interrupts(kvm_context_t kvm); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/