From: Mark McLoughlin <markmc@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org, Mark McLoughlin <markmc@redhat.com>
Subject: [PATCH 07/18] kvm: libkvm: make get_slot() and co. static
Date: Thu, 15 Jan 2009 13:47:31 +0000 [thread overview]
Message-ID: <1232027262-21487-7-git-send-email-markmc@redhat.com> (raw)
In-Reply-To: <1232027262-21487-6-git-send-email-markmc@redhat.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
libkvm/kvm-common.h | 8 --------
libkvm/libkvm.c | 12 ++++++------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h
index c5beacc..00fb16d 100644
--- a/libkvm/kvm-common.h
+++ b/libkvm/kvm-common.h
@@ -63,14 +63,6 @@ struct kvm_context {
int coalesced_mmio;
};
-void init_slots(void);
-int get_free_slot(kvm_context_t kvm);
-void register_slot(int slot, unsigned long phys_addr, unsigned long len,
- unsigned long userspace_addr, unsigned flags);
-
-void free_slot(int slot);
-int get_slot(unsigned long phys_addr);
-
int kvm_alloc_kernel_memory(kvm_context_t kvm, unsigned long memory,
void **vm_mem);
int kvm_alloc_userspace_memory(kvm_context_t kvm, unsigned long memory,
diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c
index 0408fdb..a0c7be2 100644
--- a/libkvm/libkvm.c
+++ b/libkvm/libkvm.c
@@ -75,7 +75,7 @@ struct slot_info {
struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS];
-void init_slots(void)
+static void init_slots(void)
{
int i;
@@ -83,7 +83,7 @@ void init_slots(void)
slots[i].len = 0;
}
-int get_free_slot(kvm_context_t kvm)
+static int get_free_slot(kvm_context_t kvm)
{
int i;
int tss_ext;
@@ -110,7 +110,7 @@ int get_free_slot(kvm_context_t kvm)
return -1;
}
-void register_slot(int slot, unsigned long phys_addr, unsigned long len,
+static void register_slot(int slot, unsigned long phys_addr, unsigned long len,
unsigned long userspace_addr, unsigned flags)
{
slots[slot].phys_addr = phys_addr;
@@ -119,13 +119,13 @@ void register_slot(int slot, unsigned long phys_addr, unsigned long len,
slots[slot].flags = flags;
}
-void free_slot(int slot)
+static void free_slot(int slot)
{
slots[slot].len = 0;
slots[slot].logging_count = 0;
}
-int get_slot(unsigned long phys_addr)
+static int get_slot(unsigned long phys_addr)
{
int i;
@@ -139,7 +139,7 @@ int get_slot(unsigned long phys_addr)
/* Returns -1 if this slot is not totally contained on any other,
* and the number of the slot otherwise */
-int get_container_slot(uint64_t phys_addr, unsigned long size)
+static int get_container_slot(uint64_t phys_addr, unsigned long size)
{
int i;
--
1.6.0.6
next prev parent reply other threads:[~2009-01-15 13:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 13:47 [PATCH 01/18] kvm: qemu: fix the prototype of virtio_net_init() Mark McLoughlin
2009-01-15 13:47 ` [PATCH 02/18] kvm: qemu: make qemu_alloc_physram() and alloc_mem_area() static Mark McLoughlin
2009-01-15 13:47 ` [PATCH 03/18] kvm: qemu: kill some redundant declarations Mark McLoughlin
2009-01-15 13:47 ` [PATCH 04/18] kvm: qemu: make lsi_scsi_uninit() static Mark McLoughlin
2009-01-15 13:47 ` [PATCH 05/18] kvm: qemu: Fix virtio_blk_init() calls Mark McLoughlin
2009-01-15 13:47 ` [PATCH 06/18] kvm: qemu: device-assignment: don't use libkvm's private get_slot() Mark McLoughlin
2009-01-15 13:47 ` Mark McLoughlin [this message]
2009-01-15 13:47 ` [PATCH 08/18] kvm: qemu: device-assignment: add kvm_add_ioperm_data() prototype Mark McLoughlin
2009-01-15 13:47 ` [PATCH 09/18] kvm: qemu: device-assignment: add assigned_dev_update_irq() prototype Mark McLoughlin
2009-01-15 13:47 ` [PATCH 10/18] kvm: qemu: device-assignment: fix ROM writing Mark McLoughlin
2009-01-15 13:47 ` [PATCH 11/18] kvm: qemu: kill unused variable Mark McLoughlin
2009-01-15 13:47 ` [PATCH 12/18] kvm: qemu: kill redundant declarion of perror() Mark McLoughlin
2009-01-15 13:47 ` [PATCH 13/18] kvm: qemu: kill redundant declaration of smp_cpus and vm_running Mark McLoughlin
2009-01-15 13:47 ` [PATCH 14/18] kvm: qemu: make qemu_kvm_system_reset() static Mark McLoughlin
2009-01-15 13:47 ` [PATCH 15/18] kvm: qemu: kill unused variable in kvm_init_vcpu() Mark McLoughlin
2009-01-15 13:47 ` [PATCH 16/18] kvm: qemu: make another couple of functions static Mark McLoughlin
2009-01-15 13:47 ` [PATCH 17/18] kvm: qemu: fix update_vbios_real_tpr declaration Mark McLoughlin
2009-01-15 13:47 ` [PATCH 18/18] kvm: qemu: kill unused variable in enable_vapic() Mark McLoughlin
2009-01-15 13:54 ` [PATCH 10/18] kvm: qemu: device-assignment: fix ROM writing Avi Kivity
2009-01-15 14:24 ` Mark McLoughlin
2009-01-15 14:35 ` Avi Kivity
2009-01-15 13:58 ` [PATCH 01/18] kvm: qemu: fix the prototype of virtio_net_init() Avi Kivity
2009-01-15 14:28 ` Mark McLoughlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1232027262-21487-7-git-send-email-markmc@redhat.com \
--to=markmc@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox