From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com
Subject: [PATCH 07/10] use env as parameter for functions that access kvm_run
Date: Fri, 9 Oct 2009 15:03:15 -0300 [thread overview]
Message-ID: <1255111398-15251-8-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1255111398-15251-7-git-send-email-glommer@redhat.com>
Convert header of public functions that access kvm_run, so they can
use CPUState version instead.
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
qemu-kvm-x86.c | 4 ++--
qemu-kvm.c | 8 ++++----
qemu-kvm.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 10bd530..c5455d7 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -1379,7 +1379,7 @@ void kvm_arch_post_kvm_run(void *opaque, CPUState *env)
{
cpu_single_env = env;
- env->eflags = kvm_get_interrupt_flag(env->kvm_cpu_state.vcpu_ctx)
+ env->eflags = kvm_get_interrupt_flag(env)
? env->eflags | IF_MASK : env->eflags & ~IF_MASK;
cpu_set_apic_tpr(env, kvm_get_cr8(env));
@@ -1400,7 +1400,7 @@ int kvm_arch_try_push_interrupts(void *opaque)
CPUState *env = cpu_single_env;
int r, irq;
- if (kvm_is_ready_for_interrupt_injection(env->kvm_cpu_state.vcpu_ctx) &&
+ if (kvm_is_ready_for_interrupt_injection(env) &&
(env->interrupt_request & CPU_INTERRUPT_HARD) &&
(env->eflags & IF_MASK)) {
env->interrupt_request &= ~CPU_INTERRUPT_HARD;
diff --git a/qemu-kvm.c b/qemu-kvm.c
index a7eda2d..bd1c0b5 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -924,14 +924,14 @@ int pre_kvm_run(kvm_context_t kvm, CPUState *env)
return 0;
}
-int kvm_get_interrupt_flag(kvm_vcpu_context_t vcpu)
+int kvm_get_interrupt_flag(CPUState *env)
{
- return vcpu->run->if_flag;
+ return env->kvm_run->if_flag;
}
-int kvm_is_ready_for_interrupt_injection(kvm_vcpu_context_t vcpu)
+int kvm_is_ready_for_interrupt_injection(CPUState *env)
{
- return vcpu->run->ready_for_interrupt_injection;
+ return env->kvm_run->ready_for_interrupt_injection;
}
int kvm_run(kvm_vcpu_context_t vcpu, void *env)
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 1f23fe4..28940dd 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -216,7 +216,7 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env);
* \param vcpu Which virtual CPU should get dumped
* \return interrupt flag value (0 or 1)
*/
-int kvm_get_interrupt_flag(kvm_vcpu_context_t vcpu);
+int kvm_get_interrupt_flag(CPUState *env);
/*!
* \brief Check if a vcpu is ready for interrupt injection
@@ -227,7 +227,7 @@ int kvm_get_interrupt_flag(kvm_vcpu_context_t vcpu);
* \param vcpu Which virtual CPU should get dumped
* \return boolean indicating interrupt injection readiness
*/
-int kvm_is_ready_for_interrupt_injection(kvm_vcpu_context_t vcpu);
+int kvm_is_ready_for_interrupt_injection(CPUState *env);
/*!
* \brief Read VCPU registers
--
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 ` Glauber Costa [this message]
2009-10-09 18:03 ` [PATCH 08/10] use env in kvm_arch_run Glauber Costa
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-8-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