From 5f3db971685235b5a8233d83ded217e59c1f6292 Mon Sep 17 00:00:00 2001 From: Luyao Huang Date: Sat, 28 Feb 2015 17:08:34 +0800 Subject: [PATCH] qemu: Remove unnecessary virReportError on networkGetNetworkAddress return Error messages are already set in all code paths returning -1 from networkGetNetworkAddress, so we don't want to overwrite them. Signed-off-by: Luyao Huang Signed-off-by: John Ferlan (cherry picked from commit 64595431cdf57f0a23351e8808f7c3c18e855f9f) --- src/qemu/qemu_command.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abfa943687..45ae7cf8c9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7294,12 +7294,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 element so it will * show up in status. */ @@ -7458,12 +7455,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 element so it will * show up in status. */