From patchwork Wed Jun 30 11:55:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 57402 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 D991BB6F0C for ; Wed, 30 Jun 2010 22:09:46 +1000 (EST) Received: from localhost ([127.0.0.1]:53016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTw6o-0000hM-F1 for incoming@patchwork.ozlabs.org; Wed, 30 Jun 2010 08:09:42 -0400 Received: from [140.186.70.92] (port=56935 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTvtR-0000np-3b for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTvtM-0000aN-Cn for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:52 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:57050) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTvtM-0000Zb-4x for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:48 -0400 Received: from blackfin.pond.sub.org (pD951BCA6.dip.t-dialin.net [217.81.188.166]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 448092E2B4A; Wed, 30 Jun 2010 13:55:45 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 4AC39423; Wed, 30 Jun 2010 13:55:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 30 Jun 2010 13:55:40 +0200 Message-Id: <1277898942-6501-10-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1277898942-6501-1-git-send-email-armbru@redhat.com> References: <1277898942-6501-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, kraxel@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH 09/11] ide: Make ide_init_drive() return success 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 It still always succeeds. The next commits will add failures. Signed-off-by: Markus Armbruster --- hw/ide/core.c | 13 +++++++++---- hw/ide/internal.h | 4 ++-- hw/ide/qdev.c | 4 +++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index c37897b..a0eb1fa 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -26,6 +26,7 @@ #include #include #include +#include "qemu-error.h" #include "qemu-timer.h" #include "sysemu.h" #include "dma.h" @@ -2594,8 +2595,8 @@ void ide_bus_reset(IDEBus *bus) ide_clear_hob(bus); } -void ide_init_drive(IDEState *s, BlockDriverState *bs, - const char *version, const char *serial) +int ide_init_drive(IDEState *s, BlockDriverState *bs, + const char *version, const char *serial) { int cylinders, heads, secs; uint64_t nb_sectors; @@ -2630,6 +2631,7 @@ void ide_init_drive(IDEState *s, BlockDriverState *bs, } ide_reset(s); bdrv_set_removable(bs, s->drive_kind == IDE_CD); + return 0; } static void ide_init1(IDEBus *bus, int unit) @@ -2669,8 +2671,11 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, dinfo = i == 0 ? hd0 : hd1; ide_init1(bus, i); if (dinfo) { - ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL, - *dinfo->serial ? dinfo->serial : NULL); + if (ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL, + *dinfo->serial ? dinfo->serial : NULL) < 0) { + error_report("Can't set up IDE drive %s", dinfo->id); + exit(1); + } } else { ide_reset(&bus->ifs[i]); } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 14b0035..921856e 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -556,8 +556,8 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr); void ide_data_writel(void *opaque, uint32_t addr, uint32_t val); uint32_t ide_data_readl(void *opaque, uint32_t addr); -void ide_init_drive(IDEState *s, BlockDriverState *bs, - const char *version, const char *serial); +int ide_init_drive(IDEState *s, BlockDriverState *bs, + const char *version, const char *serial); void ide_init2(IDEBus *bus, qemu_irq irq); void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq); diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 221f387..53468ed 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -118,7 +118,9 @@ static int ide_drive_initfn(IDEDevice *dev) } } - ide_init_drive(s, dev->conf.bs, dev->version, serial); + if (ide_init_drive(s, dev->conf.bs, dev->version, serial) < 0) { + return -1; + } if (!dev->version) { dev->version = qemu_strdup(s->version);