From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: [PATCH] qemu-kvm: Fix kvm-disabled build
Date: Fri, 03 Jun 2011 16:38:40 +0200 [thread overview]
Message-ID: <4DE8F1F0.9080703@siemens.com> (raw)
Minor fallout from recent refactorings.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kvm-stub.c | 11 +++--------
qemu-kvm.h | 4 ++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/kvm-stub.c b/kvm-stub.c
index 90fed66..aa2238f 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -156,22 +156,17 @@ int kvm_get_irq_route_gsi(void)
return -ENOSYS;
}
-int kvm_add_msix(uint32_t gsi, uint32_t addr_lo,
- uint32_t addr_hi, uint32_t data)
+int kvm_msi_message_add(KVMMsiMessage *msg)
{
return -ENOSYS;
}
-int kvm_del_msix(uint32_t gsi, uint32_t addr_lo,
- uint32_t addr_hi, uint32_t data)
+int kvm_msi_message_del(KVMMsiMessage *msg)
{
return -ENOSYS;
}
-int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo,
- uint32_t old_addr_hi, uint32_t old_data,
- uint32_t new_gsi, uint32_t new_addr_lo,
- uint32_t new_addr_hi, uint32_t new_data)
+int kvm_msi_message_update(KVMMsiMessage *old, KVMMsiMessage *new)
{
return -ENOSYS;
}
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 0f833f1..942baf2 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -271,8 +271,6 @@ void kvm_load_lapic(CPUState *env);
void kvm_hpet_enable_kpit(void);
void kvm_hpet_disable_kpit(void);
-int kvm_set_boot_cpu_id(KVMState *s, uint32_t id);
-
void kvm_tpr_access_report(CPUState *env, uint64_t rip, int is_write);
int kvm_arch_init_irq_routing(void);
@@ -293,6 +291,8 @@ extern unsigned int kvm_shadow_memory;
int kvm_handle_tpr_access(CPUState *env);
+int kvm_set_boot_cpu_id(KVMState *s, uint32_t id);
+
#else
#define kvm_nested 0
#endif
--
1.7.1
next reply other threads:[~2011-06-03 14:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-03 14:38 Jan Kiszka [this message]
2011-06-20 14:56 ` [PATCH] qemu-kvm: Fix kvm-disabled build Marcelo Tosatti
-- strict thread matches above, loose matches on Subject: below --
2009-07-04 9:03 Jan Kiszka
2009-07-06 7:41 ` Avi Kivity
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=4DE8F1F0.9080703@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/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