From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NqPKj-0000Zf-KZ for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:16:41 -0500 Received: from [199.232.76.173] (port=42640 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NqPKi-0000Yc-6X for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:16:40 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NqPKg-00010L-N4 for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:16:40 -0500 Received: from hall.aurel32.net ([88.191.82.174]:54019) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NqPKg-0000zz-BP for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:16:38 -0500 Date: Sat, 13 Mar 2010 12:16:35 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] fdc: fix drive property handling. Message-ID: <20100313111635.GA26705@volta.aurel32.net> References: <1268238629-23164-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1268238629-23164-1-git-send-email-kraxel@redhat.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org On Wed, Mar 10, 2010 at 05:30:29PM +0100, Gerd Hoffmann wrote: > Fix the floppy controller init wrappers to set the drive properties > only in case the DriveInfo pointers passed in are non NULL. This allows > to set the properties using -global. > > [ v2: fix code style issues pointed out by Aurelien Jarno ] > > Signed-off-by: Gerd Hoffmann Thanks, applied. > --- > hw/fdc.c | 20 +++++++++++++++----- > 1 files changed, 15 insertions(+), 5 deletions(-) > > diff --git a/hw/fdc.c b/hw/fdc.c > index eb39e30..42b6d7d 100644 > --- a/hw/fdc.c > +++ b/hw/fdc.c > @@ -1860,8 +1860,12 @@ FDCtrl *fdctrl_init_isa(DriveInfo **fds) > ISADevice *dev; > > dev = isa_create("isa-fdc"); > - qdev_prop_set_drive(&dev->qdev, "driveA", fds[0]); > - qdev_prop_set_drive(&dev->qdev, "driveB", fds[1]); > + if (fds[0]) { > + qdev_prop_set_drive(&dev->qdev, "driveA", fds[0]); > + } > + if (fds[1]) { > + qdev_prop_set_drive(&dev->qdev, "driveB", fds[1]); > + } > if (qdev_init(&dev->qdev) < 0) > return NULL; > return &(DO_UPCAST(FDCtrlISABus, busdev, dev)->state); > @@ -1878,8 +1882,12 @@ FDCtrl *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, > sys = DO_UPCAST(FDCtrlSysBus, busdev.qdev, dev); > fdctrl = &sys->state; > fdctrl->dma_chann = dma_chann; /* FIXME */ > - qdev_prop_set_drive(dev, "driveA", fds[0]); > - qdev_prop_set_drive(dev, "driveB", fds[1]); > + if (fds[0]) { > + qdev_prop_set_drive(dev, "driveA", fds[0]); > + } > + if (fds[1]) { > + qdev_prop_set_drive(dev, "driveB", fds[1]); > + } > qdev_init_nofail(dev); > sysbus_connect_irq(&sys->busdev, 0, irq); > sysbus_mmio_map(&sys->busdev, 0, mmio_base); > @@ -1895,7 +1903,9 @@ FDCtrl *sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base, > FDCtrl *fdctrl; > > dev = qdev_create(NULL, "SUNW,fdtwo"); > - qdev_prop_set_drive(dev, "drive", fds[0]); > + if (fds[0]) { > + qdev_prop_set_drive(dev, "drive", fds[0]); > + } > qdev_init_nofail(dev); > sys = DO_UPCAST(FDCtrlSysBus, busdev.qdev, dev); > fdctrl = &sys->state; > -- > 1.6.6.1 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net