Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 316931 Details for
Bug 278931
Invalid config files and ordinary text files in /etc/xen cause libvirt error messages
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
libvirt-0.3.3-xm-conf-errors.patch
libvirt-0.3.3-xm-conf-errors.patch (text/plain), 9.44 KB, created by
Richard W.M. Jones
on 2008-09-17 09:30:14 UTC
(
hide
)
Description:
libvirt-0.3.3-xm-conf-errors.patch
Filename:
MIME Type:
Creator:
Richard W.M. Jones
Created:
2008-09-17 09:30:14 UTC
Size:
9.44 KB
patch
obsolete
>--- libvirt-0.3.3.orig/src/conf.c 2008-09-15 15:08:11.000000000 +0100 >+++ libvirt-0.3.3.new/src/conf.c 2008-09-15 15:40:05.000000000 +0100 >@@ -57,25 +57,34 @@ > > /** > * virConfError: >- * @conf: the configuration if available >+ * @ctxt: the parser context if available or NULL > * @error: the error number > * @info: extra information string >- * @line: line for the error > * > * Handle an error at the xend daemon interface > */ > static void >-virConfError(virConfPtr conf ATTRIBUTE_UNUSED, >- virErrorNumber error, const char *info, int line) >+virConfError(virConfParserCtxtPtr ctxt, >+ virErrorNumber error, const char *info) > { >- const char *errmsg; >+ const char *format; > > if (error == VIR_ERR_OK) > return; > >- errmsg = __virErrorMsg(error, info); >- __virRaiseError(NULL, NULL, NULL, VIR_FROM_CONF, error, VIR_ERR_ERROR, >- errmsg, info, NULL, line, 0, errmsg, info, line); >+ /* Construct the string 'filename:line: info' if we have that. */ >+ if (ctxt && ctxt->filename) { >+ __virRaiseError(NULL, NULL, NULL, VIR_FROM_CONF, error, VIR_ERR_ERROR, >+ info, ctxt->filename, NULL, >+ ctxt->line, 0, >+ "%s:%d: %s", ctxt->filename, ctxt->line, info); >+ } else { >+ format = __virErrorMsg(error, info); >+ __virRaiseError(NULL, NULL, NULL, VIR_FROM_CONF, error, VIR_ERR_ERROR, >+ info, NULL, NULL, >+ ctxt ? ctxt->line : 0, 0, >+ format, info); >+ } > } > > >@@ -132,7 +141,7 @@ > > ret = (virConfPtr) calloc(1, sizeof(virConf)); > if (ret == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); >+ virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration")); > return(NULL); > } > ret->filename = NULL; >@@ -181,7 +190,7 @@ > > ret = (virConfEntryPtr) calloc(1, sizeof(virConfEntry)); > if (ret == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); >+ virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration")); > return(NULL); > } > >@@ -316,8 +325,7 @@ > NEXT; > } > if ((ctxt->cur >= ctxt->end) || (!IS_DIGIT(CUR))) { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("unterminated number"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated number")); > return(-1); > } > while ((ctxt->cur < ctxt->end) && (IS_DIGIT(CUR))) { >@@ -350,8 +358,7 @@ > while ((ctxt->cur < ctxt->end) && (CUR != '\'') && (!IS_EOL(CUR))) > NEXT; > if (CUR != '\'') { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("unterminated string"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); > return(NULL); > } > ret = strndup(base, ctxt->cur - base); >@@ -367,8 +374,7 @@ > } > if ((ctxt->cur[0] != '"') || (ctxt->cur[1] != '"') || > (ctxt->cur[2] != '"')) { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("unterminated string"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); > return(NULL); > } > ret = strndup(base, ctxt->cur - base); >@@ -379,8 +385,7 @@ > while ((ctxt->cur < ctxt->end) && (CUR != '"') && (!IS_EOL(CUR))) > NEXT; > if (CUR != '"') { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("unterminated string"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); > return(NULL); > } > ret = strndup(base, ctxt->cur - base); >@@ -407,8 +412,7 @@ > > SKIP_SPACES; > if (ctxt->cur >= ctxt->end) { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("expecting a value"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a value")); > return(NULL); > } > if ((CUR == '"') || (CUR == '\'')) { >@@ -426,8 +430,8 @@ > } > while ((ctxt->cur < ctxt->end) && (CUR != ']')) { > if (CUR != ',') { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, >- _("expecting a separator in list"), ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, >+ _("expecting a separator in list")); > virConfFreeList(lst); > return(NULL); > } >@@ -449,8 +453,8 @@ > if (CUR == ']') { > NEXT; > } else { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, >- _("list is not closed with ] "), ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, >+ _("list is not closed with ] ")); > virConfFreeList(lst); > return(NULL); > } >@@ -460,13 +464,12 @@ > } > type = VIR_CONF_LONG; > } else { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("expecting a value"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a value")); > return(NULL); > } > ret = (virConfValuePtr) calloc(1, sizeof(virConfValue)); > if (ret == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); >+ virConfError(ctxt, VIR_ERR_NO_MEMORY, _("allocating configuration")); > if (str != NULL) > free(str); > return(NULL); >@@ -496,15 +499,14 @@ > base = ctxt->cur; > /* TODO: probably need encoding support and UTF-8 parsing ! */ > if (!IS_CHAR(CUR)) { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("expecting a name"), ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a name")); > return(NULL); > } > while ((ctxt->cur < ctxt->end) && ((IS_CHAR(CUR)) || (IS_DIGIT(CUR)) || (CUR == '_'))) > NEXT; > ret = strndup(base, ctxt->cur - base); > if (ret == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_NO_MEMORY, _("allocating configuration")); > return(NULL); > } > return(ret); >@@ -531,8 +533,7 @@ > while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; > comm = strndup(base, ctxt->cur - base); > if (comm == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_NO_MEMORY, _("allocating configuration")); > return(-1); > } > virConfAddEntry(ctxt->conf, NULL, NULL, comm); >@@ -559,8 +560,7 @@ > NEXT; > SKIP_BLANKS; > } else { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("expecting a separator"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a separator")); > return(-1); > } > return(0); >@@ -591,8 +591,7 @@ > return(-1); > SKIP_SPACES; > if (CUR != '=') { >- virConfError(NULL, VIR_ERR_CONF_SYNTAX, _("expecting an assignment"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting an assignment")); > return(-1); > } > NEXT; >@@ -609,8 +608,7 @@ > while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; > comm = strndup(base, ctxt->cur - base); > if (comm == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), >- ctxt->line); >+ virConfError(ctxt, VIR_ERR_NO_MEMORY, _("allocating configuration")); > free(name); > virConfFreeValue(value); > return(-1); >@@ -688,18 +686,18 @@ > int len; > > if (filename == NULL) { >- virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__, 0); >+ virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); > return(NULL); > } > fd = open(filename, O_RDONLY); > if (fd < 0) { >- virConfError(NULL, VIR_ERR_OPEN_FAILED, filename, 0); >+ virConfError(NULL, VIR_ERR_OPEN_FAILED, filename); > return(NULL); > } > len = read(fd, content, sizeof(content)); > close(fd); > if (len <= 0) { >- virConfError(NULL, VIR_ERR_READ_FAILED, filename, 0); >+ virConfError(NULL, VIR_ERR_READ_FAILED, filename); > return(NULL); > } > return(virConfParse(filename, content, len)); >@@ -720,7 +718,7 @@ > __virConfReadMem(const char *memory, int len) > { > if ((memory == NULL) || (len < 0)) { >- virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__, 0); >+ virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); > return(NULL); > } > if (len == 0) >@@ -742,7 +740,7 @@ > { > virConfEntryPtr tmp; > if (conf == NULL) { >- virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__, 0); >+ virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); > return(-1); > } > >@@ -865,7 +863,7 @@ > > buf = virBufferNew(500); > if (buf == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer"), 0); >+ virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer")); > return(-1); > } > >@@ -877,7 +875,7 @@ > > fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR ); > if (fd < 0) { >- virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to open file"), 0); >+ virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to open file")); > ret = -1; > goto error; > } >@@ -885,7 +883,7 @@ > ret = write(fd, buf->content, buf->use); > close(fd); > if (ret != (int) buf->use) { >- virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content"), 0); >+ virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content")); > ret = -1; > goto error; > } >@@ -919,7 +917,7 @@ > > buf = virBufferNew(500); > if (buf == NULL) { >- virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer"), 0); >+ virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer")); > return(-1); > } >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=316931">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 278931
: 316931