From patchwork Mon Nov 26 00:12:45 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: 201599 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 12DAF2C0087 for ; Mon, 26 Nov 2012 11:52:46 +1100 (EST) Received: from localhost ([::1]:44263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmM0-0001ib-Nh for incoming@patchwork.ozlabs.org; Sun, 25 Nov 2012 19:15:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKa-0007ae-OW for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKU-0000Jw-Bl for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:48 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46244 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0000Im-TJ for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:42 -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 615F7A3BA5; Mon, 26 Nov 2012 01:13:30 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 01:12:45 +0100 Message-Id: <1353888766-6951-34-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 33/34] kvm/i8259: QOM'ify some more 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. Prepares for PIC realizefn. Signed-off-by: Andreas Färber --- hw/kvm/i8259.c | 8 +++++--- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c index 2aaf14a..973cc08 100644 --- a/hw/kvm/i8259.c +++ b/hw/kvm/i8259.c @@ -13,6 +13,8 @@ #include "hw/apic_internal.h" #include "kvm.h" +#define TYPE_KVM_I8259 "kvm-i8259" + static void kvm_pic_get(PICCommonState *s) { struct kvm_irqchip chip; @@ -106,8 +108,8 @@ static void kvm_pic_init(PICCommonState *s) qemu_irq *kvm_i8259_init(ISABus *bus) { - i8259_init_chip("kvm-i8259", bus, true); - i8259_init_chip("kvm-i8259", bus, false); + i8259_init_chip(TYPE_KVM_I8259, bus, true); + i8259_init_chip(TYPE_KVM_I8259, bus, false); return qemu_allocate_irqs(kvm_pic_set_irq, NULL, ISA_NUM_IRQS); } @@ -124,7 +126,7 @@ static void kvm_i8259_class_init(ObjectClass *klass, void *data) } static const TypeInfo kvm_i8259_info = { - .name = "kvm-i8259", + .name = TYPE_KVM_I8259, .parent = TYPE_PIC_COMMON, .instance_size = sizeof(PICCommonState), .class_init = kvm_i8259_class_init,