From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com
Subject: [PATCH 08/10] use env in kvm_arch_run
Date: Fri, 9 Oct 2009 15:03:16 -0300 [thread overview]
Message-ID: <1255111398-15251-9-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1255111398-15251-8-git-send-email-glommer@redhat.com>
kvm_arch_run() takes a vcpu context parameter, but CPUState should
do. Convert it, as well as the functions that it end up calling
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
qemu-kvm-x86.c | 12 ++++++------
qemu-kvm.c | 2 +-
qemu-kvm.h | 3 ++-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index c5455d7..fffcfd8 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -162,10 +162,10 @@ int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes,
#ifdef KVM_EXIT_TPR_ACCESS
-static int kvm_handle_tpr_access(kvm_vcpu_context_t vcpu)
+static int kvm_handle_tpr_access(CPUState *env)
{
- struct kvm_run *run = vcpu->run;
- kvm_tpr_access_report(cpu_single_env,
+ struct kvm_run *run = env->kvm_run;
+ kvm_tpr_access_report(env,
run->tpr_access.rip,
run->tpr_access.is_write);
return 0;
@@ -190,10 +190,10 @@ int kvm_enable_vapic(kvm_vcpu_context_t vcpu, uint64_t vapic)
#endif
-int kvm_arch_run(kvm_vcpu_context_t vcpu)
+int kvm_arch_run(CPUState *env)
{
int r = 0;
- struct kvm_run *run = vcpu->run;
+ struct kvm_run *run = env->kvm_run;
switch (run->exit_reason) {
@@ -203,7 +203,7 @@ int kvm_arch_run(kvm_vcpu_context_t vcpu)
#endif
#ifdef KVM_EXIT_TPR_ACCESS
case KVM_EXIT_TPR_ACCESS:
- r = kvm_handle_tpr_access(vcpu);
+ r = kvm_handle_tpr_access(env);
break;
#endif
default:
diff --git a/qemu-kvm.c b/qemu-kvm.c
index bd1c0b5..fb50bb4 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1037,7 +1037,7 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env)
abort();
break;
default:
- if (kvm_arch_run(vcpu)) {
+ if (kvm_arch_run(env)) {
fprintf(stderr, "unhandled vm exit: 0x%x\n", run->exit_reason);
kvm_show_regs(vcpu);
abort();
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 28940dd..adb2970 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -93,7 +93,8 @@ int kvm_alloc_userspace_memory(kvm_context_t kvm, unsigned long memory,
int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes,
void **vm_mem);
-int kvm_arch_run(kvm_vcpu_context_t vcpu);
+
+int kvm_arch_run(CPUState *env);
void kvm_show_code(kvm_vcpu_context_t vcpu);
--
1.6.2.5
next prev parent reply other threads:[~2009-10-09 18:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 18:03 [PATCH 00/10] Clean up vcpu context structure Glauber Costa
2009-10-09 18:03 ` [PATCH 01/10] use a more upstream friendly version of irqchip-in-kernel test Glauber Costa
2009-10-09 18:03 ` [PATCH 02/10] drop kvm_mmio_read and write Glauber Costa
2009-10-09 18:03 ` [PATCH 03/10] remove unneded opaque Glauber Costa
2009-10-09 18:03 ` [PATCH 04/10] remove kvm_context from vpcu structure Glauber Costa
2009-10-09 18:03 ` [PATCH 05/10] Use kvm_run inside CPUState Glauber Costa
2009-10-09 18:03 ` [PATCH 06/10] make some functions static Glauber Costa
2009-10-09 18:03 ` [PATCH 07/10] use env as parameter for functions that access kvm_run Glauber Costa
2009-10-09 18:03 ` Glauber Costa [this message]
2009-10-09 18:03 ` [PATCH 09/10] remove kvm_run from vcpu_context Glauber Costa
2009-10-09 18:03 ` [PATCH 10/10] remove id field from vcpu context structure Glauber Costa
2009-10-12 9:24 ` [PATCH 00/10] Clean up " Avi Kivity
2009-10-13 17:04 ` Marcelo Tosatti
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=1255111398-15251-9-git-send-email-glommer@redhat.com \
--to=glommer@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