Patchwork [12/14] char: rename qemu_chr_get_msgfd() -> qemu_chr_fe_get_msgfd()

login
register
mail settings
Submitter Anthony Liguori
Date Aug. 15, 2011, 4:17 p.m.
Message ID <1313425061-12854-13-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/110072/
State New
Headers show

Comments

Anthony Liguori - Aug. 15, 2011, 4:17 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/ivshmem.c |    2 +-
 monitor.c    |    2 +-
 qemu-char.c  |    2 +-
 qemu-char.h  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 42a5877..1176387 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 */
diff --git a/monitor.c b/monitor.c
index e7f41eb..7d5dd6f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2758,7 +2758,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 70349fd..9af6c58 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);