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

qemu-char: Avoid unused variable warning in some configs 

Avoid unused variable warnings:
qemu-char.c: In function 'qmp_chardev_open_port':
qemu-char.c:3132: warning: unused variable 'fd'
qemu-char.c:3132: warning: unused variable 'flags'

in configurations with neither HAVE_CHARDEV_TTY nor
HAVE_CHARDEV_PARPORT set.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Peter Maydell 2013-01-24 16:14:39 +00:00 committed by Blue Swirl
parent 23bf49b5ec
commit 390999910b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu-char.c
View File

@ -3129,11 +3129,11 @@ static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp) static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
{ {
int flags, fd;
switch (port->type) { switch (port->type) {
#ifdef HAVE_CHARDEV_TTY #ifdef HAVE_CHARDEV_TTY
case CHARDEV_PORT_KIND_SERIAL: case CHARDEV_PORT_KIND_SERIAL:
{
int flags, fd;
flags = O_RDWR; flags = O_RDWR;
fd = qmp_chardev_open_file_source(port->device, flags, errp); fd = qmp_chardev_open_file_source(port->device, flags, errp);
if (error_is_set(errp)) { if (error_is_set(errp)) {
@ -3141,15 +3141,19 @@ static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
} }
socket_set_nonblock(fd); socket_set_nonblock(fd);
return qemu_chr_open_tty_fd(fd); return qemu_chr_open_tty_fd(fd);
}
#endif #endif
#ifdef HAVE_CHARDEV_PARPORT #ifdef HAVE_CHARDEV_PARPORT
case CHARDEV_PORT_KIND_PARALLEL: case CHARDEV_PORT_KIND_PARALLEL:
{
int flags, fd;
flags = O_RDWR; flags = O_RDWR;
fd = qmp_chardev_open_file_source(port->device, flags, errp); fd = qmp_chardev_open_file_source(port->device, flags, errp);
if (error_is_set(errp)) { if (error_is_set(errp)) {
return NULL; return NULL;
} }
return qemu_chr_open_pp_fd(fd); return qemu_chr_open_pp_fd(fd);
}
#endif #endif
default: default:
error_setg(errp, "unknown chardev port (%d)", port->type); error_setg(errp, "unknown chardev port (%d)", port->type);