From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoWbt-0000jh-MA for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoWbl-0004KD-Fs for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:19:57 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:58069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoWbl-0004Jp-9e for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:19:49 -0400 From: Markus Armbruster Date: Tue, 10 Jul 2012 11:12:51 +0200 Message-Id: <1341911575-7306-26-git-send-email-armbru@redhat.com> In-Reply-To: <1341911575-7306-1-git-send-email-armbru@redhat.com> References: <1341911575-7306-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 25/29] ide pc: Put hard disk info into CMOS only for hard disks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, blauwirbel@gmail.com, stefanha@linux.vnet.ibm.com, pbonzini@redhat.com In particular, don't set disk type and geometry when a CD-ROM on bus ide.0 has media during CMOS initialization. Signed-off-by: Markus Armbruster --- hw/ide/qdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index f191dd3..84097fd 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -117,7 +117,7 @@ int ide_get_geometry(BusState *bus, int unit, { IDEState *s = &DO_UPCAST(IDEBus, qbus, bus)->ifs[unit]; - if (!s->bs) { + if (s->drive_kind != IDE_HD || !s->bs) { return -1; } -- 1.7.6.5