From c5ecc66658f02e2198614b52bcd00a2c9d0b1dba Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 25 Jul 2008 16:25:11 +0000 Subject: [PATCH] Fix misc typos in domain XML handling --- ChangeLog | 5 +++++ src/domain_conf.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ebfe099ab..6ca9ba7230 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 25 17:21:27 BST 2008 Daniel P. Berrange + + * src/domain_conf.c: Fix typos in comments, and the dummy + filename passed to xmlReadDoc (patch from Chris Lalancette) + Fri Jul 25 17:17:27 BST 2008 Daniel P. Berrange * src/xml.c: Remove now unused c-ctype.h include diff --git a/src/domain_conf.c b/src/domain_conf.c index 9e9bc9a87d..8ddfb6e7bf 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -1396,7 +1396,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, } def->id = -1; - /* Find out what type of QEMU virtualization to use */ + /* Find out what type of virtualization to use */ if (!(tmp = virXPathString(conn, "string(./@type)", ctxt))) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("missing domain type attribute")); @@ -1762,7 +1762,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, } VIR_FREE(nodes); - /* analysis of the input devices */ + /* analysis of the graphics devices */ if ((n = virXPathNodeSet(conn, "./devices/graphics", ctxt, &nodes)) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("cannot extract graphics devices")); @@ -1847,7 +1847,7 @@ virDomainDefPtr virDomainDefParseString(virConnectPtr conn, xmlNodePtr root; virDomainDefPtr def = NULL; - if (!(xml = xmlReadDoc(BAD_CAST xmlStr, "network.xml", NULL, + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { virDomainReportError(conn, VIR_ERR_XML_ERROR, NULL);