From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StFUs-0000zW-Dh for qemu-devel@nongnu.org; Mon, 23 Jul 2012 06:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StFUg-00051Y-AH for qemu-devel@nongnu.org; Mon, 23 Jul 2012 06:04:14 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:48273) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StFUg-00051U-6Q for qemu-devel@nongnu.org; Mon, 23 Jul 2012 06:04:02 -0400 Received: by yenl1 with SMTP id l1so5386951yen.4 for ; Mon, 23 Jul 2012 03:04:01 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <500D218B.7000809@redhat.com> Date: Mon, 23 Jul 2012 12:03:55 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1342111951-27930-1-git-send-email-armbru@redhat.com> <87629fos67.fsf@blackfin.pond.sub.org> In-Reply-To: <87629fos67.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, qemu-devel@nongnu.org Il 23/07/2012 09:25, Markus Armbruster ha scritto: > Ping? > > Markus Armbruster writes: > >> Legacy -drive cyls=... are now ignored completely when the drive >> doesn't back a hard disk device. Before, they were first checked >> against a hard disk's limits, then ignored. >> >> Signed-off-by: Markus Armbruster >> --- >> hw/ide/qdev.c | 3 ++- >> hw/scsi-disk.c | 3 ++- >> 2 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c >> index 22e58df..5ea9b8f 100644 >> --- a/hw/ide/qdev.c >> +++ b/hw/ide/qdev.c >> @@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) >> } >> >> blkconf_serial(&dev->conf, &dev->serial); >> - if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) { >> + if (kind != IDE_CD >> + && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) { >> return -1; >> } >> >> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c >> index 525816c..318318c 100644 >> --- a/hw/scsi-disk.c >> +++ b/hw/scsi-disk.c >> @@ -1750,7 +1750,8 @@ static int scsi_initfn(SCSIDevice *dev) >> } >> >> blkconf_serial(&s->qdev.conf, &s->serial); >> - if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) { >> + if (dev->type == TYPE_DISK >> + && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) { >> return -1; >> } > > Acked-by: Paolo Bonzini Kevin, are you taking this patch? Paolo