[libvirt] [PATCH] snapshot: fix regression with system checkpoints
Regression introduced in commit d6f6b2d194c. * src/conf/domain_conf.c (virDomainSnapshotDefParseString): Only give error about no disk support when <disk> was found. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..560c773 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11622,7 +11622,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, goto cleanup; } VIR_FREE(nodes); - } else { + } else if (i) { virDomainReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("unable to handle disk requests in snapshot")); goto cleanup; -- 1.7.4.4
On Thu, Sep 08, 2011 at 02:17:10PM +0100, Eric Blake wrote:
Regression introduced in commit d6f6b2d194c.
* src/conf/domain_conf.c (virDomainSnapshotDefParseString): Only give error about no disk support when <disk> was found. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..560c773 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11622,7 +11622,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, goto cleanup; } VIR_FREE(nodes); - } else { + } else if (i) { virDomainReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("unable to handle disk requests in snapshot")); goto cleanup;
Okay, ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On 09/08/2011 02:25 PM, Daniel Veillard wrote:
On Thu, Sep 08, 2011 at 02:17:10PM +0100, Eric Blake wrote:
Regression introduced in commit d6f6b2d194c.
* src/conf/domain_conf.c (virDomainSnapshotDefParseString): Only give error about no disk support when<disk> was found. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..560c773 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11622,7 +11622,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, goto cleanup; } VIR_FREE(nodes); - } else { + } else if (i) { virDomainReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("unable to handle disk requests in snapshot")); goto cleanup;
Okay, ACK,
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Daniel Veillard -
Eric Blake