From patchwork Wed Jun 2 11:31:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 54355 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 123D6B7D6E for ; Wed, 2 Jun 2010 21:33:22 +1000 (EST) Received: from localhost ([127.0.0.1]:47685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJmCE-0006xW-Lv for incoming@patchwork.ozlabs.org; Wed, 02 Jun 2010 07:33:18 -0400 Received: from [140.186.70.92] (port=48161 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJmB4-0006uo-IQ for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJmAz-0001et-IA for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:06 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:36637) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJmAz-0001eM-C2 for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:01 -0400 Received: from blackfin.pond.sub.org (pD9E39C24.dip.t-dialin.net [217.227.156.36]) by oxygen.pond.sub.org (Postfix) with ESMTPA id EC0EB2DD37E for ; Wed, 2 Jun 2010 13:31:58 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 2955570; Wed, 2 Jun 2010 13:31:58 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 2 Jun 2010 13:31:56 +0200 Message-Id: <1275478317-1989-3-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1275478317-1989-1-git-send-email-armbru@redhat.com> References: <1275478317-1989-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 2/3] qdev: Move declaration of qdev_init_bdrv() into qdev.h 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 Signed-off-by: Markus Armbruster --- hw/pl181.c | 1 - hw/qdev.h | 2 ++ hw/ssi-sd.c | 1 - sysemu.h | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pl181.c b/hw/pl181.c index 1924053..85cadc4 100644 --- a/hw/pl181.c +++ b/hw/pl181.c @@ -9,7 +9,6 @@ #include "sysbus.h" #include "sd.h" -#include "sysemu.h" //#define DEBUG_PL181 1 diff --git a/hw/qdev.h b/hw/qdev.h index 51a24e2..0ad6c95 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -125,6 +125,8 @@ void qdev_machine_creation_done(void); qemu_irq qdev_get_gpio_in(DeviceState *dev, int n); void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin); +BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type); + BusState *qdev_get_child_bus(DeviceState *dev, const char *name); /*** Device API. ***/ diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c index 5e74e5d..96b33ed 100644 --- a/hw/ssi-sd.c +++ b/hw/ssi-sd.c @@ -9,7 +9,6 @@ #include "ssi.h" #include "sd.h" -#include "sysemu.h" //#define DEBUG_SSI_SD 1 diff --git a/sysemu.h b/sysemu.h index 46a1b2f..dce13c1 100644 --- a/sysemu.h +++ b/sysemu.h @@ -188,8 +188,6 @@ extern const char *drive_get_serial(BlockDriverState *bdrv); extern BlockInterfaceErrorAction drive_get_on_error( BlockDriverState *bdrv, int is_read); -BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type); - extern QemuOpts *drive_add(const char *file, const char *fmt, ...); extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error);