From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0pzq-0000zM-OE for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V0pzp-0002jk-LE for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:32:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42529 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0pzp-0002ja-Cp for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:32:05 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 21 Jul 2013 11:31:57 +0200 Message-Id: <1374399117-17527-1-git-send-email-afaerber@suse.de> In-Reply-To: <555ec78d1db05435707ae68d4af4557aea0c3beb.1372673778.git.hutao@cn.fujitsu.com> References: <555ec78d1db05435707ae68d4af4557aea0c3beb.1372673778.git.hutao@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next] fdc: Improve error propagation for QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hu Tao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Rename fdctrl_init_common() to fdctrl_realize_common() and let fdctrl_connect_drives() propagate an Error through it. Signed-off-by: Andreas F=C3=A4rber --- hw/block/fdc.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 9a983fb..d32f6ba 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1997,7 +1997,7 @@ static const BlockDevOps fdctrl_block_ops =3D { }; =20 /* Init functions */ -static int fdctrl_connect_drives(FDCtrl *fdctrl) +static void fdctrl_connect_drives(FDCtrl *fdctrl, Error **errp) { unsigned int i; FDrive *drive; @@ -2008,12 +2008,12 @@ static int fdctrl_connect_drives(FDCtrl *fdctrl) =20 if (drive->bs) { if (bdrv_get_on_error(drive->bs, 0) !=3D BLOCKDEV_ON_ERROR_E= NOSPC) { - error_report("fdc doesn't support drive option werror"); - return -1; + error_setg(errp, "fdc doesn't support drive option werro= r"); + return; } if (bdrv_get_on_error(drive->bs, 1) !=3D BLOCKDEV_ON_ERROR_R= EPORT) { - error_report("fdc doesn't support drive option rerror"); - return -1; + error_setg(errp, "fdc doesn't support drive option rerro= r"); + return; } } =20 @@ -2023,7 +2023,6 @@ static int fdctrl_connect_drives(FDCtrl *fdctrl) bdrv_set_dev_ops(drive->bs, &fdctrl_block_ops, drive); } } - return 0; } =20 ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds) @@ -2089,7 +2088,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base= , *fdc_tc =3D qdev_get_gpio_in(dev, 0); } =20 -static int fdctrl_init_common(FDCtrl *fdctrl) +static void fdctrl_realize_common(FDCtrl *fdctrl, Error **errp) { int i, j; static int command_tables_inited =3D 0; @@ -2110,15 +2109,16 @@ static int fdctrl_init_common(FDCtrl *fdctrl) fdctrl->fifo =3D qemu_memalign(512, FD_SECTOR_LEN); fdctrl->fifo_size =3D 512; fdctrl->result_timer =3D qemu_new_timer_ns(vm_clock, - fdctrl_result_timer, fdctrl); + fdctrl_result_timer, fdctrl= ); =20 fdctrl->version =3D 0x90; /* Intel 82078 controller */ fdctrl->config =3D FD_CONFIG_EIS | FD_CONFIG_EFIFO; /* Implicit seek= , polling & FIFO enabled */ fdctrl->num_floppies =3D MAX_FD; =20 - if (fdctrl->dma_chann !=3D -1) + if (fdctrl->dma_chann !=3D -1) { DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler= , fdctrl); - return fdctrl_connect_drives(fdctrl); + } + fdctrl_connect_drives(fdctrl, errp); } =20 static const MemoryRegionPortio fdc_portio_list[] =3D { @@ -2132,7 +2132,7 @@ static void isabus_fdc_realize(DeviceState *dev, Er= ror **errp) ISADevice *isadev =3D ISA_DEVICE(dev); FDCtrlISABus *isa =3D ISA_FDC(dev); FDCtrl *fdctrl =3D &isa->state; - int ret; + Error *err =3D NULL; =20 isa_register_portio_list(isadev, isa->iobase, fdc_portio_list, fdctr= l, "fdc"); @@ -2141,9 +2141,9 @@ static void isabus_fdc_realize(DeviceState *dev, Er= ror **errp) fdctrl->dma_chann =3D isa->dma; =20 qdev_set_legacy_instance_id(dev, isa->iobase, 2); - ret =3D fdctrl_init_common(fdctrl); - if (ret < 0) { - error_setg(errp, "Floppy init failed."); + fdctrl_realize_common(fdctrl, &err); + if (err !=3D NULL) { + error_propagate(errp, err); return; } =20 @@ -2165,6 +2165,7 @@ static void sysbus_fdc_realize(DeviceState *dev, Er= ror **errp) FDCtrlSysBus *sys =3D SYSBUS_FDC(dev); FDCtrl *fdctrl =3D &sys->state; SysBusDevice *b =3D SYS_BUS_DEVICE(dev); + Error *err =3D NULL; =20 sysbus_init_mmio(b, &fdctrl->iomem); sysbus_init_irq(b, &fdctrl->irq); @@ -2172,8 +2173,9 @@ static void sysbus_fdc_realize(DeviceState *dev, Er= ror **errp) fdctrl->dma_chann =3D -1; =20 qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ - if (fdctrl_init_common(fdctrl) < 0) { - error_setg(errp, "Floppy init failed."); + fdctrl_realize_common(fdctrl, &err); + if (err !=3D NULL) { + error_propagate(errp, err); return; } } @@ -2192,6 +2194,7 @@ static void sun4m_fdc_realize(DeviceState *dev, Err= or **errp) FDCtrlSysBus *sys =3D SYSBUS_FDC(dev); FDCtrl *fdctrl =3D &sys->state; SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + Error *err =3D NULL; =20 sysbus_init_mmio(sbd, &fdctrl->iomem); sysbus_init_irq(sbd, &fdctrl->irq); @@ -2199,8 +2202,9 @@ static void sun4m_fdc_realize(DeviceState *dev, Err= or **errp) =20 fdctrl->sun4m =3D 1; qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ - if (fdctrl_init_common(fdctrl) < 0) { - error_setg(errp, "Floppy init failed."); + fdctrl_realize_common(fdctrl, &err); + if (err !=3D NULL) { + error_propagate(errp, err); return; } } --=20 1.8.1.4