From patchwork Tue Jun 1 18:32:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 54280 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 89219B7D29 for ; Wed, 2 Jun 2010 05:00:25 +1000 (EST) Received: from localhost ([127.0.0.1]:36544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJWhI-0001Aj-UA for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 15:00:20 -0400 Received: from [140.186.70.92] (port=50236 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJWVe-0001IZ-HQ for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:48:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJWGW-0006pI-Rv for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:43 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44342) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJWGW-0006oN-Er for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:40 -0400 Received: from blackfin.pond.sub.org (pD9E39C24.dip.t-dialin.net [217.227.156.36]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 512F4312880 for ; Tue, 1 Jun 2010 20:32:37 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 577413F6; Tue, 1 Jun 2010 20:32:36 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 1 Jun 2010 20:32:33 +0200 Message-Id: <1275417155-28244-13-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1275417155-28244-1-git-send-email-armbru@redhat.com> References: <1275417155-28244-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 12/14] ide: Fix info qtree for ide-drive.ver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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); }