From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45303 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKZu0-0008D8-Gc for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:37:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKZtv-0002rY-MM for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:37:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15512) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKZtv-0002rQ-ED for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:37:43 -0400 From: Kevin Wolf Date: Fri, 4 Jun 2010 18:33:05 +0200 Message-Id: <1275669195-28312-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1275669195-28312-1-git-send-email-kwolf@redhat.com> References: <1275669195-28312-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/27] 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: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Show the actual default value instead of when the property has not been set. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- 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 5e549d9..6231d77 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