From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47926 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHzmF-0006VT-9M for qemu-devel@nongnu.org; Fri, 28 May 2010 09:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHzm9-0000yP-NE for qemu-devel@nongnu.org; Fri, 28 May 2010 09:39:06 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:54777) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHzm9-0000xa-I9 for qemu-devel@nongnu.org; Fri, 28 May 2010 09:39:01 -0400 Received: from blackfin.pond.sub.org (pD9E3AB3B.dip.t-dialin.net [217.227.171.59]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 53D252E2B4B for ; Fri, 28 May 2010 15:38:58 +0200 (CEST) From: Markus Armbruster Date: Fri, 28 May 2010 15:38:53 +0200 Message-Id: <1275053935-10627-13-git-send-email-armbru@redhat.com> In-Reply-To: <1275053935-10627-1-git-send-email-armbru@redhat.com> References: <1275053935-10627-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 12/14] ide: Fix info qtree for ide-drive.ver List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com Show the actual default value instead of when the property has not been set. Signed-off-by: Markus Armbruster --- hw/ide/qdev.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 5f301bc..9b2aa21 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -110,6 +110,9 @@ static int ide_drive_initfn(IDEDevice *dev) ide_init_drive(s, dev->conf.dinfo, dev->version, serial); + if (!dev->version) { + dev->version = qemu_strdup(s->version); + } if (!dev->serial) { dev->serial = qemu_strdup(s->drive_serial_str); } -- 1.6.6.1