From patchwork Mon Nov 26 00:12:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 201616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 143052C007D for ; Mon, 26 Nov 2012 13:00:20 +1100 (EST) Received: from localhost ([::1]:40954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmL2-0008L6-NU for incoming@patchwork.ozlabs.org; Sun, 25 Nov 2012 19:14:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKX-0007QH-JV for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKT-0000Ie-Jk for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:45 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46234 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0000HD-C6 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:41 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1981DA39CE; Mon, 26 Nov 2012 01:13:20 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 01:12:35 +0100 Message-Id: <1353888766-6951-24-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353888766-6951-1-git-send-email-afaerber@suse.de> References: <1353888766-6951-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Subject: [Qemu-devel] [RFC 23/34] sga: QOM'ify 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 Introduce type constant and cast macro. Prepares for ISA realizefn. Signed-off-by: Andreas Färber --- hw/sga.c | 12 ++++++++---- 1 Datei geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/hw/sga.c b/hw/sga.c index a666349..d828f45 100644 --- a/hw/sga.c +++ b/hw/sga.c @@ -31,8 +31,11 @@ #define SGABIOS_FILENAME "sgabios.bin" -typedef struct ISAGAState { - ISADevice dev; +#define TYPE_SGA "sga" +#define SGA(obj) OBJECT_CHECK(ISASGAState, (obj), TYPE_SGA) + +typedef struct ISASGAState { + ISADevice parent_obj; } ISASGAState; static int sga_initfn(ISADevice *dev) @@ -40,6 +43,7 @@ static int sga_initfn(ISADevice *dev) rom_add_vga(SGABIOS_FILENAME); return 0; } + static void sga_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -48,8 +52,8 @@ static void sga_class_initfn(ObjectClass *klass, void *data) dc->desc = "Serial Graphics Adapter"; } -static TypeInfo sga_info = { - .name = "sga", +static const TypeInfo sga_info = { + .name = TYPE_SGA, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(ISASGAState), .class_init = sga_class_initfn,