openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: fix build with musl libc 

On musl libc "stderr" is a preprocessor macro whose expansion leads to
compilation errors:

In file included from qemu/qemu_process.c:66:
qemu/qemu_process.c: In function 'qemuProcessQMPFree':
qemu/qemu_process.c:8418:21: error: expected identifier before '(' token
     VIR_FREE((proc->stderr));
                     ^~~~~~

Prevent this by renaming the homonymous field in the _qemuProcessQMP
struct to "stdErr".

Signed-off-by: Carlos Santos <casantos@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Carlos Santos 2019-10-16 08:22:13 -03:00 committed by Michal Privoznik
parent be2d71f325
commit 44d63ad997
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_process.c
View File

@ -8445,7 +8445,7 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc)
VIR_FREE(proc->monpath); VIR_FREE(proc->monpath);
VIR_FREE(proc->monarg); VIR_FREE(proc->monarg);
VIR_FREE(proc->pidfile); VIR_FREE(proc->pidfile);
VIR_FREE(proc->stderr); VIR_FREE(proc->stdErr);
VIR_FREE(proc); VIR_FREE(proc);
} }
@ -8598,7 +8598,7 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc)
virCommandSetGID(proc->cmd, proc->runGid); virCommandSetGID(proc->cmd, proc->runGid);
virCommandSetUID(proc->cmd, proc->runUid); virCommandSetUID(proc->cmd, proc->runUid);
virCommandSetErrorBuffer(proc->cmd, &(proc->stderr)); virCommandSetErrorBuffer(proc->cmd, &(proc->stdErr));
if (virCommandRun(proc->cmd, &status) < 0) if (virCommandRun(proc->cmd, &status) < 0)
goto cleanup; goto cleanup;
@ -8608,7 +8608,7 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc)
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to start QEMU binary %s for probing: %s"), _("Failed to start QEMU binary %s for probing: %s"),
proc->binary, proc->binary,
proc->stderr ? proc->stderr : _("unknown error")); proc->stdErr ? proc->stdErr : _("unknown error"));
goto cleanup; goto cleanup;
} }
@ -8687,7 +8687,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc)
* ** Send QMP Queries to QEMU using monitor (proc->mon) ** * ** Send QMP Queries to QEMU using monitor (proc->mon) **
* qemuProcessQMPFree(proc); * qemuProcessQMPFree(proc);
* *
* Process error output (proc->stderr) remains available in qemuProcessQMP * Process error output (proc->stdErr) remains available in qemuProcessQMP
* struct until qemuProcessQMPFree is called. * struct until qemuProcessQMPFree is called.
*/ */
int int

2
src/qemu/qemu_process.h
View File

@ -212,7 +212,7 @@ struct _qemuProcessQMP {
char *libDir; char *libDir;
uid_t runUid; uid_t runUid;
gid_t runGid; gid_t runGid;
char *stderr; char *stdErr;
char *monarg; char *monarg;
char *monpath; char *monpath;
char *pidfile; char *pidfile;