[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 02/13] rename qemu_event_{init,read}
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [RFC PATCH 02/13] rename qemu_event_{init,read} |
Date: |
Mon, 15 Aug 2011 14:08:29 -0700 |
qemu_event_init clashes with the next patch.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpus.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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;
}
--
1.7.6
- [Qemu-devel] [RFC PATCH 00/13] RCU implementation for QEMU, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 01/13] add smp_mb(), Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 02/13] rename qemu_event_{init,read},
Paolo Bonzini <=
- [Qemu-devel] [RFC PATCH 03/13] qemu-threads: add QemuEvent, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 04/13] qemu-threads: add QemuOnce, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 06/13] rcu: add rcutorture, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 05/13] add rcu library, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 08/13] add call_rcu support, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 10/13] rcu: report quiescent states, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 11/13] rcuify iohandlers, Paolo Bonzini, 2011/08/15
- [Qemu-devel] [RFC PATCH 09/13] rcu: avoid repeated system calls, Paolo Bonzini, 2011/08/15