From patchwork Tue Mar 11 15:35:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 329135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 170822C00A4 for ; Wed, 12 Mar 2014 02:37:16 +1100 (EST) Received: from localhost ([::1]:55853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOjy-0006oQ-Ck for incoming@patchwork.ozlabs.org; Tue, 11 Mar 2014 11:37:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOic-0005Cb-0j for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:35:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNOiW-0004WZ-2M for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:35:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOiV-0004WS-I8 for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:35:43 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFZedS001324 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Mar 2014 11:35:41 -0400 Received: from localhost.localdomain.com (vpn1-6-194.ams2.redhat.com [10.36.6.194]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFZXdp012273; Tue, 11 Mar 2014 11:35:37 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Tue, 11 Mar 2014 17:35:54 +0200 Message-Id: <1394552156-18901-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1394552156-18901-1-git-send-email-marcel.a@redhat.com> References: <1394552156-18901-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, ehabkost@redhat.com, mst@redhat.com, stefanha@redhat.com, armbru@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 1/3] hw/machine: move QEMUMachine assignment into the core machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The QemuMachine assignment into the QOM machine it is common to all machines until the conversion is over. It is not specific to vl.c . Signed-off-by: Marcel Apfelbaum --- hw/core/machine.c | 8 ++++++++ vl.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index d3ffef7..4b49a7d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -12,12 +12,20 @@ #include "hw/boards.h" +static void machine_base_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->qemu_machine = data; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, .abstract = true, .class_size = sizeof(MachineClass), .instance_size = sizeof(MachineState), + .class_base_init = machine_base_class_init, }; static void machine_register_types(void) diff --git a/vl.c b/vl.c index d75ca55..6a380d9 100644 --- a/vl.c +++ b/vl.c @@ -1531,19 +1531,11 @@ void pcmcia_info(Monitor *mon, const QDict *qdict) MachineState *current_machine; -static void machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - - mc->qemu_machine = data; -} - int qemu_register_machine(QEMUMachine *m) { TypeInfo ti = { .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL), .parent = TYPE_MACHINE, - .class_init = machine_class_init, .class_data = (void *)m, };