From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NlnTc-0000yA-3T for qemu-devel@nongnu.org; Sun, 28 Feb 2010 13:02:48 -0500 Received: from [199.232.76.173] (port=55240 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NlnTb-0000xs-JY for qemu-devel@nongnu.org; Sun, 28 Feb 2010 13:02:47 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NlnTZ-0006Wy-B3 for qemu-devel@nongnu.org; Sun, 28 Feb 2010 13:02:47 -0500 Received: from hall.aurel32.net ([88.191.82.174]:38735) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NlnTY-0006WP-NZ for qemu-devel@nongnu.org; Sun, 28 Feb 2010 13:02:45 -0500 Date: Sun, 28 Feb 2010 19:02:36 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [FOR 0.12 RESEND PATCH] fdc: fix drive property handling. Message-ID: <20100228180236.GN10291@volta.aurel32.net> References: <1262787790-27764-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: <1262787790-27764-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, Jan 06, 2010 at 03:23:10PM +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. This patch looks good except for minor coding style issues (see below). As I prefer to apply it to head and then cherry-pick it to stable, could you please send a fixed patch? Then I'll apply it. > Signed-off-by: Gerd Hoffmann > --- > hw/fdc.c | 15 ++++++++++----- > 1 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/hw/fdc.c b/hw/fdc.c > index 0579b03..691374e 100644 > --- a/hw/fdc.c > +++ b/hw/fdc.c > @@ -1860,8 +1860,10 @@ fdctrl_t *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]); You should use curly brace around the previous line. > if (qdev_init(&dev->qdev) < 0) > return NULL; > return &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); > @@ -1879,8 +1881,10 @@ fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, > sys = DO_UPCAST(fdctrl_sysbus_t, 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]); ditto > qdev_init_nofail(dev); > sysbus_connect_irq(&sys->busdev, 0, irq); > sysbus_mmio_map(&sys->busdev, 0, mmio_base); > @@ -1896,7 +1900,8 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base, > fdctrl_t *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]); ditto > qdev_init_nofail(dev); > sys = DO_UPCAST(fdctrl_sysbus_t, busdev.qdev, dev); > fdctrl = &sys->state; > -- > 1.6.5.2 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net