From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerone Young Subject: [PATCH 02 of 20] Make static slot & kvm_memory region funcions public Date: Fri, 02 Nov 2007 05:36:38 -0500 Message-ID: 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 1193996153 18000 # Node ID dfe10a389c131e9cfdfd20765ec1a29cd403aeaf # Parent 5900e2b0ebdee721ae651070fcd325363691e25a Make static slot & kvm_memory region funcions public This patch changes static functions for manipulation of memory slots and regions public in kvmctl.c. This also makes a decleration for these functions in kvmctl.h. This allow for breaking out code into other files and still keep this functionality. These functions can later be broken up some to move there x86 specific stuff (ex. TSS). Signed-off-by: Jerone Young diff --git a/libkvm/kvm-x86.h b/libkvm/kvm-x86.h --- a/libkvm/kvm-x86.h +++ b/libkvm/kvm-x86.h @@ -14,4 +14,14 @@ #define PAGE_SIZE 4096ul #define PAGE_MASK (~(PAGE_SIZE - 1)) +void init_slots(); +int get_free_slot(kvm_context_t kvm); +void register_slot(int slot, unsigned long phys_addr); +int get_slot(unsigned long phys_addr); +void kvm_memory_region_save_params(kvm_context_t kvm, + struct kvm_memory_region *mem); +void kvm_userspace_memory_region_save_params(kvm_context_t kvm, + struct kvm_userspace_memory_region *mem); +void kvm_memory_region_clear_params(kvm_context_t kvm, int regnum); + #endif diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -48,7 +48,7 @@ int free_slots[KVM_MAX_NUM_MEM_REGIONS]; int free_slots[KVM_MAX_NUM_MEM_REGIONS]; unsigned long phys_addr_slots[KVM_MAX_NUM_MEM_REGIONS]; -static void init_slots() +void init_slots() { int i; @@ -56,7 +56,7 @@ static void init_slots() free_slots[i] = 0; } -static int get_free_slot(kvm_context_t kvm) +int get_free_slot(kvm_context_t kvm) { int i; int tss_ext; @@ -83,13 +83,13 @@ static int get_free_slot(kvm_context_t k return -1; } -static void register_slot(int slot, unsigned long phys_addr) +void register_slot(int slot, unsigned long phys_addr) { free_slots[slot] = 1; phys_addr_slots[slot] = phys_addr; } -static int get_slot(unsigned long phys_addr) +int get_slot(unsigned long phys_addr) { int i; @@ -102,7 +102,7 @@ static int get_slot(unsigned long phys_a /* * memory regions parameters */ -static void kvm_memory_region_save_params(kvm_context_t kvm, +void kvm_memory_region_save_params(kvm_context_t kvm, struct kvm_memory_region *mem) { if (!mem || (mem->slot >= KVM_MAX_NUM_MEM_REGIONS)) { @@ -114,7 +114,7 @@ static void kvm_memory_region_save_param #ifdef KVM_CAP_USER_MEMORY -static void kvm_userspace_memory_region_save_params(kvm_context_t kvm, +void kvm_userspace_memory_region_save_params(kvm_context_t kvm, struct kvm_userspace_memory_region *mem) { struct kvm_memory_region kvm_mem; @@ -128,7 +128,7 @@ static void kvm_userspace_memory_region_ #endif -static void kvm_memory_region_clear_params(kvm_context_t kvm, int regnum) +void kvm_memory_region_clear_params(kvm_context_t kvm, int regnum) { if (regnum >= KVM_MAX_NUM_MEM_REGIONS) { fprintf(stderr, "BUG: %s: invalid parameters\n", __FUNCTION__); ------------------------------------------------------------------------- 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/