From patchwork Sat Apr 5 16:43:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lijun X-Patchwork-Id: 337213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8C69D1400BE for ; Sun, 6 Apr 2014 02:44:02 +1000 (EST) Received: from localhost ([::1]:55328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWThH-00024g-B3 for incoming@patchwork.ozlabs.org; Sat, 05 Apr 2014 12:43:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWTgv-00024N-8x for qemu-devel@nongnu.org; Sat, 05 Apr 2014 12:43:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWTgp-0005Fq-4w for qemu-devel@nongnu.org; Sat, 05 Apr 2014 12:43:37 -0400 Received: from [111.204.254.3] (port=13110 helo=localhost.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWTgo-0005FW-74 for qemu-devel@nongnu.org; Sat, 05 Apr 2014 12:43:31 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost.localdomain (8.14.7/8.14.7) with ESMTP id s35GhHvJ012600; Sun, 6 Apr 2014 00:43:17 +0800 Received: (from root@localhost) by localhost.localdomain (8.14.7/8.14.7/Submit) id s35GhGF5012599; Sun, 6 Apr 2014 00:43:16 +0800 From: Jun Li To: kwolf@redhat.com, stefanha@redhat.com, juli@redhat.com Date: Sun, 6 Apr 2014 00:43:15 +0800 Message-Id: <1396716195-12563-1-git-send-email-junmuzi@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 111.204.254.3 Cc: Jun Li , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] snapshot: fixed bdrv_get_full_backing_filename can not get correct full_backing_filename X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch fixed the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1084302 . path_combine can not calculate the correct full path name for backing_file. Such as: create a snapshot chain: sn2->sn1->$BASE_IMG backing file is : /home/wookpecker/img.qcow2 sn1 : /home/woodpecker/tmp/sn1 sn2 : /home/woodpecker/tmp/sn2 when create sn2, path_combine can not got a correct path for $BASE_IMG. Signed-off-by: Jun Li --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 990a754..2519f68 100644 --- a/block.c +++ b/block.c @@ -307,7 +307,7 @@ void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz) if (bs->backing_file[0] == '\0' || path_has_protocol(bs->backing_file)) { pstrcpy(dest, sz, bs->backing_file); } else { - path_combine(dest, sz, bs->filename, bs->backing_file); + realpath(bs->backing_file, dest); } }