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: Remove kvm_set_boot_cpu_id
Date: Fri, 03 Jun 2011 16:39:55 +0200 [thread overview]
Message-ID: <4DE8F23B.1030508@siemens.com> (raw)
Upstream just as well as qemu-kvm only support CPU 0 as boot CPU. And
that is also the KVM ABI default if the user does not issue any
KVM_SET_BOOT_CPU_ID.
So let's drop this redundancy. It can be re-introduced via upstream once
we support something more sophisticated.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
qemu-kvm.c | 11 -----------
qemu-kvm.h | 2 --
target-i386/kvm.c | 5 -----
3 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 649af9c..80cc077 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -655,14 +655,3 @@ int kvm_update_ioport_access(CPUState *env)
#endif /* CONFIG_KVM_DEVICE_ASSIGNMENT */
return 0;
}
-
-int kvm_set_boot_cpu_id(KVMState *s, uint32_t id)
-{
-#ifdef KVM_CAP_SET_BOOT_CPU_ID
- int r = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_SET_BOOT_CPU_ID);
- if (r > 0) {
- return kvm_vm_ioctl(s, KVM_SET_BOOT_CPU_ID, id);
- }
-#endif
- return -ENOSYS;
-}
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 942baf2..09d07d0 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -291,8 +291,6 @@ 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
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 74a9960..de26646 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -662,11 +662,6 @@ int kvm_arch_init(KVMState *s)
}
}
- ret = kvm_set_boot_cpu_id(s, 0);
- if (ret < 0 && ret != -ENOSYS) {
- return ret;
- }
-
return 0;
}
--
1.7.1
next reply other threads:[~2011-06-03 14:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-03 14:39 Jan Kiszka [this message]
2011-06-20 14:56 ` [PATCH] qemu-kvm: Remove kvm_set_boot_cpu_id 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=4DE8F23B.1030508@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