From ac75bd1b1eedfa0740d6f3dcb9bd89852380ae8d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 16 Jun 2009 15:47:53 +0000 Subject: [PATCH] Fix FS volume creation with backing stores. This regressed when CreateXMLFrom was added: we should only perform the backing store comparison if an input volume was passed. --- ChangeLog | 4 ++++ src/storage_backend_fs.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ef6a4600f..8dd22edf9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 16 11:43:17 EDT 2009 Cole Robinson + + * src/storage_backend_fs.c: Fix FS volume creation with backing stores. + Tue Jun 16 11:33:54 EDT 2009 Cole Robinson * src/domain_conf.c src/domain_conf.h src/libvirt_private.syms diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index ac7c4240d4..0e93e54394 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -1251,8 +1251,9 @@ static int createQemuImg(virConnectPtr conn, * backing store, not really sure what use it serves though, and it * may cause issues with lvm. Untested essentially. */ - if (!inputBackingPath || - !STREQ(inputBackingPath, vol->backingStore.path)) { + if (inputvol && + (!inputBackingPath || + STRNEQ(inputBackingPath, vol->backingStore.path))) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("a different backing store can not " "be specified."));