From patchwork Sat Feb 12 22:41:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 82947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id EDD2FB711F for ; Sun, 13 Feb 2011 09:51:31 +1100 (EST) Received: from localhost ([127.0.0.1]:51695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoODV-0007QW-P4 for incoming@patchwork.ozlabs.org; Sat, 12 Feb 2011 17:45:25 -0500 Received: from [140.186.70.92] (port=37227 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoOAY-00064x-Ql for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoOAW-0008Gw-3Z for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:21 -0500 Received: from mail-vx0-f173.google.com ([209.85.220.173]:47992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoOAV-0008BU-Ut for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:20 -0500 Received: by mail-vx0-f173.google.com with SMTP id 40so1996543vxb.4 for ; Sat, 12 Feb 2011 14:42:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type; bh=kQ7X/24P8BMOtJCMSdN7bVNZcEUxwQcdITlzZUC7eAo=; b=PT9urdM+CQRDAFqvIBH+yQsAlf292JJAbxWwNPwLKqsESDORG6FoSmd6PuDCxRpp7Y qJlLiSwTbNspLmZbtKSBxCTtaR/tWqTfRkErVbmTk2i9eq8PZvNftejDknTfaYYhhE09 nroh+4UW3gKTKK5buEAHATQBD8TH3Lyfzb0/Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=mNHMG11CHe0Cvs0sDn1RO79YXAyM/LulcZs7zmJUyUiz5nA0yMfpXSQPz8GfrEIziU GtRuLNQtrLA9hdrWzAk1jng2Ua0Y8Q29ve6iXGoVrkpbN+dXS25XkwKdJQEaqbP9h66t HUsS3yt8YZMbPHU+j0fuzPl5eFlwySwG/PvE4= Received: by 10.220.201.2 with SMTP id ey2mr2729982vcb.29.1297550539719; Sat, 12 Feb 2011 14:42:19 -0800 (PST) MIME-Version: 1.0 Received: by 10.220.186.7 with HTTP; Sat, 12 Feb 2011 14:41:59 -0800 (PST) From: Blue Swirl Date: Sun, 13 Feb 2011 00:41:59 +0200 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Subject: [Qemu-devel] [PATCH 05/10] serial: refactor device creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Turn serial_init into an inline function. Signed-off-by: Blue Swirl --- hw/pc.h | 14 +++++++++++++- hw/serial.c | 12 ------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 50d9943..09f63f0 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -17,7 +17,19 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, CharDriverState *chr, int ioregister, int be); -SerialState *serial_isa_init(int index, CharDriverState *chr); +static inline bool serial_isa_init(int index, CharDriverState *chr) +{ + ISADevice *dev; + + dev = isa_create("isa-serial"); + qdev_prop_set_uint32(&dev->qdev, "index", index); + qdev_prop_set_chr(&dev->qdev, "chardev", chr); + if (qdev_init(&dev->qdev) < 0) { + return false; + } + return true; +} + void serial_set_frequency(SerialState *s, uint32_t frequency); /* parallel.c */ diff --git a/hw/serial.c b/hw/serial.c index 2c4af61..879237f 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -782,18 +782,6 @@ static int serial_isa_initfn(ISADevice *dev) return 0; } -SerialState *serial_isa_init(int index, CharDriverState *chr) -{ - ISADevice *dev; - - dev = isa_create("isa-serial"); - qdev_prop_set_uint32(&dev->qdev, "index", index); - qdev_prop_set_chr(&dev->qdev, "chardev", chr); - if (qdev_init(&dev->qdev) < 0) - return NULL; - return &DO_UPCAST(ISASerialState, dev, dev)->state; -} - static const VMStateDescription vmstate_isa_serial = { .name = "serial", .version_id = 3,