Patchwork [RFC,02/13] rename qemu_event_{init,read}

login
register
mail settings
Submitter Paolo Bonzini
Date Aug. 15, 2011, 9:08 p.m.
Message ID <1313442520-12062-3-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/110092/
State New
Headers show

Comments

Paolo Bonzini - Aug. 15, 2011, 9:08 p.m.
qemu_event_init clashes with the next patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpus.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/cpus.c b/cpus.c
index 6bf4e3f..73e17a1 100644
--- a/cpus.c
+++ b/cpus.c
@@ -305,7 +305,7 @@  static void qemu_event_increment(void)
     }
 }
 
-static void qemu_event_read(void *opaque)
+static void qemu_eventfd_read(void *opaque)
 {
     int fd = (intptr_t)opaque;
     ssize_t len;
@@ -317,7 +317,7 @@  static void qemu_event_read(void *opaque)
     } while ((len == -1 && errno == EINTR) || len == sizeof(buffer));
 }
 
-static int qemu_event_init(void)
+static int qemu_eventfd_init(void)
 {
     int err;
     int fds[2];
@@ -334,7 +334,7 @@  static int qemu_event_init(void)
     if (err < 0) {
         goto fail;
     }
-    qemu_set_fd_handler2(fds[0], NULL, qemu_event_read, NULL,
+    qemu_set_fd_handler2(fds[0], NULL, qemu_eventfd_read, NULL,
                          (void *)(intptr_t)fds[0]);
 
     io_thread_fd = fds[1];
@@ -500,7 +500,7 @@  static void dummy_event_handler(void *opaque)
 {
 }
 
-static int qemu_event_init(void)
+static int qemu_eventfd_init(void)
 {
     qemu_event_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
     if (!qemu_event_handle) {
@@ -547,7 +547,7 @@  int qemu_init_main_loop(void)
 
     qemu_init_sigbus();
 
-    return qemu_event_init();
+    return qemu_eventfd_init();
 }
 
 void qemu_main_loop_start(void)
@@ -664,7 +664,7 @@  int qemu_init_main_loop(void)
     }
 
     /* Note eventfd must be drained before signalfd handlers run */
-    ret = qemu_event_init();
+    ret = qemu_eventfd_init();
     if (ret) {
         return ret;
     }