From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com
Subject: [PATCH v3 3/5] kvm finalize
Date: Mon, 6 Jul 2009 16:12:50 -0400 [thread overview]
Message-ID: <1246911172-5869-4-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1246911172-5869-3-git-send-email-glommer@redhat.com>
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
qemu-kvm.c | 11 +++--------
qemu-kvm.h | 1 -
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/qemu-kvm.c b/qemu-kvm.c
index e4af96e..3b5326e 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -2262,12 +2262,12 @@ int kvm_qemu_create_context(void)
kvm_disable_pit_creation(kvm_context);
}
if (kvm_create(kvm_context, 0, NULL) < 0) {
- kvm_qemu_destroy();
- return -1;
+ kvm_finalize(kvm_context);
+ return -1;
}
r = kvm_arch_qemu_create_context();
if(r <0)
- kvm_qemu_destroy();
+ kvm_finalize(kvm_context);
if (kvm_pit && !kvm_pit_reinject) {
if (kvm_reinject_control(kvm_context, 0)) {
fprintf(stderr, "failure to disable in-kernel PIT reinjection\n");
@@ -2286,11 +2286,6 @@ int kvm_qemu_create_context(void)
return 0;
}
-void kvm_qemu_destroy(void)
-{
- kvm_finalize(kvm_context);
-}
-
#ifdef TARGET_I386
static int must_use_aliases_source(target_phys_addr_t addr)
{
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 0322feb..10f0a80 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -19,7 +19,6 @@ int kvm_qemu_init(void);
int kvm_qemu_create_context(void);
int kvm_init_ap(void);
int kvm_vcpu_inited(CPUState *env);
-void kvm_qemu_destroy(void);
void kvm_load_registers(CPUState *env);
void kvm_save_registers(CPUState *env);
void kvm_load_mpstate(CPUState *env);
--
1.6.2.2
next prev parent reply other threads:[~2009-07-06 20:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 20:12 [PATCH v3 0/5] Further qemu-kvm cleanups Glauber Costa
2009-07-06 20:12 ` [PATCH v3 1/5] qemu-kvm.c memory cleanup Glauber Costa
2009-07-06 20:12 ` [PATCH v3 2/5] cleanup mmio coalescing functions Glauber Costa
2009-07-06 20:12 ` Glauber Costa [this message]
2009-07-06 20:12 ` [PATCH v3 4/5] remove callbacks structure Glauber Costa
2009-07-06 20:12 ` [PATCH v3 5/5] remove wrappers around ex-libkvm functions Glauber Costa
2009-07-07 9:52 ` [PATCH v3 0/5] Further qemu-kvm cleanups 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=1246911172-5869-4-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