Commit-ID: f31a88cf063e050d71cce08a20762f1c3c205524
Gitweb: http://git.kernel.org/tip/f31a88cf063e050d71cce08a20762f1c3c205524
Author: Sasha Levin <levinsasha928@xxxxxxxxx>
AuthorDate: Thu, 15 Dec 2011 08:02:55 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Thu, 15 Dec 2011 08:31:27 +0200
Revert "kvm tools: Add kvm__has_cap() to check whether a cap is available on the host"
We already had kvm__has_extension, no need for two functions that do the
same.
This reverts commit 42efb1abf4ebebeedd14af34c073e673923e2898.
Conflicts:
tools/kvm/include/kvm/kvm.h
Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/include/kvm/kvm.h | 1 -
tools/kvm/kvm.c | 5 -----
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index 7996dfd..4927caa 100644
--- a/tools/kvm/include/kvm/kvm.h
+++ b/tools/kvm/include/kvm/kvm.h
@@ -81,7 +81,6 @@ static inline void *guest_flat_to_host(struct kvm *kvm, unsigned long offset)
return kvm->ram_start + offset;
}
-bool kvm__has_cap(struct kvm *kvm, u32 cap);
bool kvm__supports_extension(struct kvm *kvm, unsigned int extension);
#endif /* KVM__KVM_H */
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 008170a..7a745fb 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -520,8 +520,3 @@ void kvm__notify_paused(void)
mutex_lock(&pause_lock);
mutex_unlock(&pause_lock);
}
-
-bool kvm__has_cap(struct kvm *kvm, u32 cap)
-{
- return ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, cap) == 0;
-}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|