From patchwork Sun May 18 09:24:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lijun X-Patchwork-Id: 349986 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 9C1541400D3 for ; Sun, 18 May 2014 19:25:04 +1000 (EST) Received: from localhost ([::1]:42890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlxL4-0007z3-IQ for incoming@patchwork.ozlabs.org; Sun, 18 May 2014 05:25:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlxKg-0007hM-5o for qemu-devel@nongnu.org; Sun, 18 May 2014 05:24:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlxKX-0008S8-3W for qemu-devel@nongnu.org; Sun, 18 May 2014 05:24:38 -0400 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:63349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlxKW-0008S0-SC for qemu-devel@nongnu.org; Sun, 18 May 2014 05:24:29 -0400 Received: by mail-pa0-f48.google.com with SMTP id rd3so4447221pab.35 for ; Sun, 18 May 2014 02:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZQg6BEHGMVriqQ9+Uv4ibI0JLy1hmyiyoBKOdjvpUbE=; b=V3zC84Nlkh70eyVXwUwKphPWiTmjW1+khiweINVW6ja75n50UTse33ONjGrPRlwx7i bIkPkU8Z/vX/PI1vfkLAA7iQ5Pwj36wyTRypqUzBHgbOAoCGxBmGBUZ78AcItYCDWgPs eJ36p/ehLZl1JwSRLVZnabNLSq9TRWNgazFPtJ5Gs4W0WUvB6Vxm8Mbq+6D18D7Mofs2 QADvBkPXVjKrn3j/+vya1bABchZDkKpfcKTLk3a2Y8rKY5s7DpjXAyemPl3DPG/kH82A 8cJoDqAktqNtSSdyZTTyAYhPMN0OcMDJPvjoWGAyOLJBjrMDgmUM5nam6npNeb+tJ9T5 r2Kg== X-Received: by 10.66.119.136 with SMTP id ku8mr34499605pab.121.1400405068008; Sun, 18 May 2014 02:24:28 -0700 (PDT) Received: from localhost ([125.39.9.139]) by mx.google.com with ESMTPSA id tg9sm23871032pbc.29.2014.05.18.02.24.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 May 2014 02:24:27 -0700 (PDT) From: Jun Li To: kwolf@redhat.com, stefanha@redhat.com, famz@redhat.com, juli@redhat.com, junmuzi@gmail.com Date: Sun, 18 May 2014 17:24:08 +0800 Message-Id: <1400405048-13148-1-git-send-email-junmuzi@gmail.com> X-Mailer: git-send-email 1.9.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::230 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v4] 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 bdrv_get_full_backing_filename can not calculate the correct full path name for backing_file via path_combine. Such as: create a snapshot chain: $BASE_IMG<-sn1<-sn2 backing file is : ./img.qcow2 sn1 : ./tmp/sn1 sn2 : ./tmp/sn2 when create sn2, path_combine can not got a correct path for $BASE_IMG. In this patch, will check the backing_filename is a symlink or not firstly, then return the full(absolute) path via realpath. Signed-off-by: Jun Li --- This is v4 of the patch. This version is the same with v3. Only difference is the commit description. What does this patch has fixed, please ref following bug(it gives the detailed description): https://bugzilla.redhat.com/show_bug.cgi?id=1084302 --- block.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index c90c71a..d163a8c 100644 --- a/block.c +++ b/block.c @@ -304,10 +304,26 @@ void path_combine(char *dest, int dest_size, void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz) { + struct stat sb; + char *linkname; + 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); + if (lstat(bs->backing_file, &sb) == -1) { + perror("lstat"); + exit(EXIT_FAILURE); + } + + /* Check linkname is a link or not */ + if (S_ISLNK(sb.st_mode)) { + linkname = malloc(sb.st_size + 1); + readlink(bs->backing_file, linkname, sb.st_size + 1); + linkname[sb.st_size] = '\0'; + realpath(linkname, dest); + } else { + realpath(bs->backing_file, dest); + } } }