diff options
| -rw-r--r-- | hw/ivshmem.c | 2 | ||||
| -rw-r--r-- | monitor.c | 2 | ||||
| -rw-r--r-- | qemu-char.c | 2 | ||||
| -rw-r--r-- | qemu-char.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hw/ivshmem.c b/hw/ivshmem.c index f4ae0d2..242fbea 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -401,7 +401,7 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags) memcpy(&incoming_posn, buf, sizeof(long)); /* pick off s->server_chr->msgfd and store it, posn should accompany msg */ - tmp_fd = qemu_chr_get_msgfd(s->server_chr); + tmp_fd = qemu_chr_fe_get_msgfd(s->server_chr); IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, tmp_fd); /* make sure we have enough space for this guest */ @@ -2770,7 +2770,7 @@ static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) mon_fd_t *monfd; int fd; - fd = qemu_chr_get_msgfd(mon->chr); + fd = qemu_chr_fe_get_msgfd(mon->chr); if (fd == -1) { qerror_report(QERR_FD_NOT_SUPPLIED); return -1; diff --git a/qemu-char.c b/qemu-char.c index c0af8f3..2075118 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -163,7 +163,7 @@ void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len) s->chr_read(s->handler_opaque, buf, len); } -int qemu_chr_get_msgfd(CharDriverState *s) +int qemu_chr_fe_get_msgfd(CharDriverState *s) { return s->get_msgfd ? s->get_msgfd(s) : -1; } diff --git a/qemu-char.h b/qemu-char.h index 555b5f1..abd9cbd 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -98,7 +98,7 @@ int qemu_chr_fe_ioctl(CharDriverState *s, int cmd, void *arg); void qemu_chr_generic_open(CharDriverState *s); int qemu_chr_be_can_write(CharDriverState *s); void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len); -int qemu_chr_get_msgfd(CharDriverState *s); +int qemu_chr_fe_get_msgfd(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); int qemu_chr_add_client(CharDriverState *s, int fd); void qemu_chr_info_print(Monitor *mon, const QObject *ret_data); |