From nobody Tue Feb 10 15:46:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501070890098605.3278063926724; Wed, 26 Jul 2017 05:08:10 -0700 (PDT) Received: from localhost ([::1]:37830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daL6g-0004Hv-Ez for importer@patchew.org; Wed, 26 Jul 2017 08:08:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daL2q-0001QV-7F for qemu-devel@nongnu.org; Wed, 26 Jul 2017 08:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daL2o-0000E7-Ev for qemu-devel@nongnu.org; Wed, 26 Jul 2017 08:04:04 -0400 Received: from [59.151.112.132] (port=41027 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daL2e-0008PX-R6; Wed, 26 Jul 2017 08:03:53 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jul 2017 20:03:43 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 39495402BB71; Wed, 26 Jul 2017 20:03:41 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 26 Jul 2017 20:03:40 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="21843092" From: Mao Zhongyi To: , Date: Wed, 26 Jul 2017 20:02:50 +0800 Message-ID: <20170726120255.14292-2-maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170726120255.14292-1-maozy.fnst@cn.fujitsu.com> References: <20170726120255.14292-1-maozy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 39495402BB71.ACE5B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 1/6] hw/ide: Convert DeviceClass init to realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace init with realize in IDEDeviceClass, which has errp as a parameter. So all the implementations now use error_setg instead of error_report for reporting error. Cc: John Snow Cc: Markus Armbruster Signed-off-by: Mao Zhongyi --- hw/ide/core.c | 7 ++-- hw/ide/qdev.c | 86 +++++++++++++++++++++++--------------------= ---- include/hw/ide/internal.h | 5 +-- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 0b48b64..7c86fc7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -34,6 +34,7 @@ #include "hw/block/block.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" =20 #include "hw/ide/internal.h" =20 @@ -2398,7 +2399,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, ID= EDriveKind kind, const char *version, const char *serial, const char *mo= del, uint64_t wwn, uint32_t cylinders, uint32_t heads, uint32_t secs, - int chs_trans) + int chs_trans, Error **errp) { uint64_t nb_sectors; =20 @@ -2423,11 +2424,11 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, = IDEDriveKind kind, blk_set_guest_block_size(blk, 2048); } else { if (!blk_is_inserted(s->blk)) { - error_report("Device needs media, but drive is empty"); + error_setg(errp, "Device needs media, but drive is empty"); return -1; } if (blk_is_read_only(blk)) { - error_report("Can't use a read-only drive"); + error_setg(errp, "Can't use a read-only drive"); return -1; } blk_set_dev_ops(blk, &ide_hd_block_ops, s); diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index cc2f5bd..d60ac25 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -80,7 +80,7 @@ static char *idebus_get_fw_dev_path(DeviceState *dev) return g_strdup(path); } =20 -static int ide_qdev_init(DeviceState *qdev) +static void ide_qdev_realize(DeviceState *qdev, Error **errp) { IDEDevice *dev =3D IDE_DEVICE(qdev); IDEDeviceClass *dc =3D IDE_DEVICE_GET_CLASS(dev); @@ -91,34 +91,31 @@ static int ide_qdev_init(DeviceState *qdev) } =20 if (dev->unit >=3D bus->max_units) { - error_report("Can't create IDE unit %d, bus supports only %d units= ", + error_setg(errp, "Can't create IDE unit %d, bus supports only %d u= nits", dev->unit, bus->max_units); - goto err; + return; } =20 switch (dev->unit) { case 0: if (bus->master) { - error_report("IDE unit %d is in use", dev->unit); - goto err; + error_setg(errp, "IDE unit %d is in use", dev->unit); + return; } bus->master =3D dev; break; case 1: if (bus->slave) { - error_report("IDE unit %d is in use", dev->unit); - goto err; + error_setg(errp, "IDE unit %d is in use", dev->unit); + return; } bus->slave =3D dev; break; default: - error_report("Invalid IDE unit %d", dev->unit); - goto err; + error_setg(errp, "Invalid IDE unit %d", dev->unit); + return; } - return dc->init(dev); - -err: - return -1; + dc->realize(dev, errp); } =20 IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) @@ -159,7 +156,7 @@ typedef struct IDEDrive { IDEDevice dev; } IDEDrive; =20 -static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) +static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp) { IDEBus *bus =3D DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); IDEState *s =3D bus->ifs + dev->unit; @@ -168,8 +165,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind = kind) =20 if (!dev->conf.blk) { if (kind !=3D IDE_CD) { - error_report("No drive specified"); - return -1; + error_setg(errp, "No drive specified"); + return; } else { /* Anonymous BlockBackend for an empty drive */ dev->conf.blk =3D blk_new(0, BLK_PERM_ALL); @@ -182,36 +179,36 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKin= d kind) dev->conf.discard_granularity =3D 512; } else if (dev->conf.discard_granularity && dev->conf.discard_granularity !=3D 512) { - error_report("discard_granularity must be 512 for ide"); - return -1; + error_setg(errp, "discard_granularity must be 512 for ide"); + return; } =20 blkconf_blocksizes(&dev->conf); if (dev->conf.logical_block_size !=3D 512) { - error_report("logical_block_size must be 512 for IDE"); - return -1; + error_setg(errp, "logical_block_size must be 512 for IDE"); + return; } =20 blkconf_serial(&dev->conf, &dev->serial); if (kind !=3D IDE_CD) { blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255, &err= ); if (err) { - error_report_err(err); - return -1; + error_propagate(errp, err); + return; } } blkconf_apply_backend_options(&dev->conf, kind =3D=3D IDE_CD, kind != =3D IDE_CD, &err); if (err) { - error_report_err(err); - return -1; + error_propagate(errp, err); + return; } =20 if (ide_init_drive(s, dev->conf.blk, kind, dev->version, dev->serial, dev->model, dev->wwn, dev->conf.cyls, dev->conf.heads, dev->conf.secs, - dev->chs_trans) < 0) { - return -1; + dev->chs_trans, errp) < 0) { + return; } =20 if (!dev->version) { @@ -223,8 +220,6 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind = kind) =20 add_boot_device_path(dev->conf.bootindex, &dev->qdev, dev->unit ? "/disk@1" : "/disk@0"); - - return 0; } =20 static void ide_dev_get_bootindex(Object *obj, Visitor *v, const char *nam= e, @@ -270,17 +265,17 @@ static void ide_dev_instance_init(Object *obj) object_property_set_int(obj, -1, "bootindex", NULL); } =20 -static int ide_hd_initfn(IDEDevice *dev) +static void ide_hd_realize(IDEDevice *dev, Error **errp) { - return ide_dev_initfn(dev, IDE_HD); + ide_dev_initfn(dev, IDE_HD, errp); } =20 -static int ide_cd_initfn(IDEDevice *dev) +static void ide_cd_realize(IDEDevice *dev, Error **errp) { - return ide_dev_initfn(dev, IDE_CD); + ide_dev_initfn(dev, IDE_CD, errp); } =20 -static int ide_drive_initfn(IDEDevice *dev) +static void ide_drive_realize(IDEDevice *dev, Error **errp) { DriveInfo *dinfo =3D NULL; =20 @@ -288,7 +283,7 @@ static int ide_drive_initfn(IDEDevice *dev) dinfo =3D blk_legacy_dinfo(dev->conf.blk); } =20 - return ide_dev_initfn(dev, dinfo && dinfo->media_cd ? IDE_CD : IDE_HD); + ide_dev_initfn(dev, dinfo && dinfo->media_cd ? IDE_CD : IDE_HD, errp); } =20 #define DEFINE_IDE_DEV_PROPERTIES() \ @@ -311,10 +306,11 @@ static void ide_hd_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); IDEDeviceClass *k =3D IDE_DEVICE_CLASS(klass); - k->init =3D ide_hd_initfn; + + k->realize =3D ide_hd_realize; dc->fw_name =3D "drive"; - dc->desc =3D "virtual IDE disk"; - dc->props =3D ide_hd_properties; + dc->desc =3D "virtual IDE disk"; + dc->props =3D ide_hd_properties; } =20 static const TypeInfo ide_hd_info =3D { @@ -333,10 +329,11 @@ static void ide_cd_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); IDEDeviceClass *k =3D IDE_DEVICE_CLASS(klass); - k->init =3D ide_cd_initfn; + + k->realize =3D ide_cd_realize; dc->fw_name =3D "drive"; - dc->desc =3D "virtual IDE CD-ROM"; - dc->props =3D ide_cd_properties; + dc->desc =3D "virtual IDE CD-ROM"; + dc->props =3D ide_cd_properties; } =20 static const TypeInfo ide_cd_info =3D { @@ -355,10 +352,11 @@ static void ide_drive_class_init(ObjectClass *klass, = void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); IDEDeviceClass *k =3D IDE_DEVICE_CLASS(klass); - k->init =3D ide_drive_initfn; + + k->realize =3D ide_drive_realize; dc->fw_name =3D "drive"; - dc->desc =3D "virtual IDE disk or CD-ROM (legacy)"; - dc->props =3D ide_drive_properties; + dc->desc =3D "virtual IDE disk or CD-ROM (legacy)"; + dc->props =3D ide_drive_properties; } =20 static const TypeInfo ide_drive_info =3D { @@ -371,7 +369,7 @@ static const TypeInfo ide_drive_info =3D { static void ide_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); - k->init =3D ide_qdev_init; + k->realize =3D ide_qdev_realize; set_bit(DEVICE_CATEGORY_STORAGE, k->categories); k->bus_type =3D TYPE_IDE_BUS; k->props =3D ide_props; diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 482a951..5ebb4c9 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -12,6 +12,7 @@ #include "sysemu/sysemu.h" #include "hw/block/block.h" #include "block/scsi.h" +#include "qapi/error.h" =20 /* debug IDE devices */ //#define DEBUG_IDE @@ -495,7 +496,7 @@ struct IDEBus { =20 typedef struct IDEDeviceClass { DeviceClass parent_class; - int (*init)(IDEDevice *dev); + void (*realize)(IDEDevice *dev, Error **errp); } IDEDeviceClass; =20 struct IDEDevice { @@ -605,7 +606,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDED= riveKind kind, const char *version, const char *serial, const char *mo= del, uint64_t wwn, uint32_t cylinders, uint32_t heads, uint32_t secs, - int chs_trans); + int chs_trans, Error **errp); void ide_init2(IDEBus *bus, qemu_irq irq); void ide_exit(IDEState *s); void ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2); --=20 2.9.4