From: Wen Congyang Date: Wed, 12 Jan 2011 06:12:29 +0000 (+0800) Subject: report error when specifying wrong desturi X-Git-Tag: v0.8.8~226 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d13aae329ce7d4153e5f8a7d7ec94b779a610b;p=thirdparty%2Flibvirt.git report error when specifying wrong desturi When we do peer2peer migration, the dest uri is an address of the target host as seen from the source machine. So we must specify the ip or hostname of target host in dest uri. If we do not specify it, report an error to the user. Signed-off-by: Wen Congyang --- diff --git a/src/libvirt.c b/src/libvirt.c index a4789bc7e1..52d327802f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3571,12 +3571,29 @@ virDomainMigratePeer2Peer (virDomainPtr domain, const char *uri, unsigned long bandwidth) { + xmlURIPtr tempuri = NULL; + if (!domain->conn->driver->domainMigratePerform) { virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); virDispatchError(domain->conn); return -1; } + tempuri = xmlParseURI(uri); + if (!tempuri) { + virLibConnError (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virDispatchError(domain->conn); + return -1; + } + + if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { + virLibConnError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virDispatchError(domain->conn); + xmlFreeURI(tempuri); + return -1; + } + xmlFreeURI(tempuri); + /* Perform the migration. The driver isn't supposed to return * until the migration is complete. */