From: Jun Li <junmuzi@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, juli@redhat.com, famz@redhat.com,
Jun Li <junmuzi@gmail.com>,
stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v3] snapshot: fixed bdrv_get_full_backing_filename can not get correct full_backing_filename
Date: Sun, 11 May 2014 00:32:38 +0800 [thread overview]
Message-ID: <1399739558-2956-1-git-send-email-junmuzi@gmail.com> (raw)
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.
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 <junmuzi@gmail.com>
---
block.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index b749d31..6674719 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);
+ }
}
}
--
1.8.3.1
next reply other threads:[~2014-05-10 16:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-10 16:32 Jun Li [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-10 16:35 [Qemu-devel] [PATCH v3] snapshot: fixed bdrv_get_full_backing_filename can not get correct full_backing_filename Jun Li
2014-05-12 15:15 ` Eric Blake
2014-05-18 10:34 ` Jun Li
2014-05-25 13:37 ` Jun Li
2014-05-25 13:35 ` Jun Li
2014-05-14 12:40 ` Stefan Hajnoczi
2014-05-14 13:05 ` Fam Zheng
2014-05-17 12:37 ` Jun Li
2014-05-10 16:30 Jun Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399739558-2956-1-git-send-email-junmuzi@gmail.com \
--to=junmuzi@gmail.com \
--cc=famz@redhat.com \
--cc=juli@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).