On 02/25/2015 02:52 AM, John Ferlan wrote:
On 02/13/2015 02:17 AM, Luyao Huang wrote:
we already set a more clearly error in networkGetNetworkAddress, so this error will cover our error in networkGetNetworkAddress.
Signed-off-by: Luyao Huang <lhuang@redhat.com> --- src/qemu/qemu_command.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
I didn't check every exit patch from networkGetNetworkAddress, but perhaps these should change to :
if (ret < 0) { if (virGetLastError() == NULL) virReportError(VIR_ERR_XML_ERROR,...); goto error; }
Just to be sure we don't leave without setting some sort of error.
Okay, thanks for your advise, i will change them in next version.
John
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6bd8f69..b42e0f4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7284,12 +7284,9 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, "network driver not present")); goto error; } - if (ret < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("listen network '%s' had no usable address"), - listenNetwork); + if (ret < 0) goto error; - } + listenAddr = netAddr; /* store the address we found in the <graphics> element so it will * show up in status. */ @@ -7448,12 +7445,9 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, "network driver not present")); goto error; } - if (ret < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("listen network '%s' had no usable address"), - listenNetwork); + if (ret < 0) goto error; - } + listenAddr = netAddr; /* store the address we found in the <graphics> element so it will * show up in status. */
Luyao