From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4I6n-0006n8-Ot for qemu-devel@nongnu.org; Sun, 04 Mar 2012 15:32:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4I6l-0006MQ-17 for qemu-devel@nongnu.org; Sun, 04 Mar 2012 15:32:45 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40932 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4I6k-0006ME-QW for qemu-devel@nongnu.org; Sun, 04 Mar 2012 15:32:42 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 4 Mar 2012 21:32:34 +0100 Message-Id: <1330893156-26569-2-git-send-email-afaerber@suse.de> In-Reply-To: <1330893156-26569-1-git-send-email-afaerber@suse.de> References: <1330893156-26569-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 1/3] kvmclock: Always register type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, lcapitulino@redhat.com 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. Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Jan Kiszka Cc: Marcelo Tosatti --- hw/kvm/clock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c index 2157340..446bd62 100644 --- a/hw/kvm/clock.c +++ b/hw/kvm/clock.c @@ -121,9 +121,7 @@ void kvmclock_create(void) =20 static void kvmclock_register_types(void) { - if (kvm_enabled()) { type_register_static(&kvmclock_info); - } } =20 type_init(kvmclock_register_types) --=20 1.7.7