From: Andreas Färber <afaerber@suse.de>
Date: Sun, 4 Mar 2012 20:32:34 +0000 (+0100)
Subject: kvmclock: Always register type
X-Git-Tag: v1.1-rc0~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03f48b0797c9904301ee91e0081e89b3a3250f91;p=thirdparty%2Fqemu.git

kvmclock: Always register type

Currently, the "kvmclock" type is only registered when kvm_enabled().

This breaks when moving type registration to before command line
parsing (so that QOM types can be used for CPU and machine).

Since the QOM classes are lazy-initialized anyway and kvmclock_create()
has another kvm_enabled() check, simply drop the KVM check in
kvmclock_register_types().

kvm-i8259, kvm-apic and kvm-ioapic do not suffer from such a check.

Reviewed-by: please.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c
index 2157340326f..446bd621767 100644
--- a/hw/kvm/clock.c
+++ b/hw/kvm/clock.c
@@ -121,9 +121,7 @@ void kvmclock_create(void)
 
 static void kvmclock_register_types(void)
 {
-    if (kvm_enabled()) {
     type_register_static(&kvmclock_info);
-    }
 }
 
 type_init(kvmclock_register_types)