From: Ján Tomko Date: Fri, 14 Jun 2019 19:40:19 +0000 (+0200) Subject: qemu: monitor: s/ret/rc/ in UpdateVideoSize functions X-Git-Tag: v5.5.0-rc1~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63427110b6ad8f993874aa3c0c3bfb7245ce7676;p=thirdparty%2Flibvirt.git qemu: monitor: s/ret/rc/ in UpdateVideoSize functions Use 'rc' to temporarily store the subfunction return values, instead of ret. Signed-off-by: Ján Tomko Acked-by: Peter Krempa --- diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a292455d4b..731be2e5a6 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1204,15 +1204,15 @@ qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, const char *videoName) { - int ret = -1; + int rc = -1; VIR_AUTOFREE(char *) path = NULL; QEMU_CHECK_MONITOR(mon); - ret = qemuMonitorJSONFindLinkPath(mon, videoName, - video->info.alias, &path); - if (ret < 0) { - if (ret == -2) + rc = qemuMonitorJSONFindLinkPath(mon, videoName, + video->info.alias, &path); + if (rc < 0) { + if (rc == -2) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to find QOM Object path for " "device '%s'"), videoName); @@ -1234,15 +1234,15 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon, virDomainVideoDefPtr video, const char *videoName) { - int ret = -1; + int rc = -1; VIR_AUTOFREE(char *) path = NULL; QEMU_CHECK_MONITOR(mon); - ret = qemuMonitorJSONFindLinkPath(mon, videoName, - video->info.alias, &path); - if (ret < 0) { - if (ret == -2) + rc = qemuMonitorJSONFindLinkPath(mon, videoName, + video->info.alias, &path); + if (rc < 0) { + if (rc == -2) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to find QOM Object path for " "device '%s'"), videoName);