aboutsummaryrefslogtreecommitdiffstats
path: root/android/hw-qemud.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-08-25 08:06:26 -0700
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-08-25 08:06:26 -0700
commitfd16505ce923202f0abe74bfe7c3ba110d325ebe (patch)
treee7db685afc43702513f520c689e267987321d24e /android/hw-qemud.c
parent6c13702fee11a40c72e71432c5438fc65602bd5d (diff)
downloadexternal_qemu-fd16505ce923202f0abe74bfe7c3ba110d325ebe.zip
external_qemu-fd16505ce923202f0abe74bfe7c3ba110d325ebe.tar.gz
external_qemu-fd16505ce923202f0abe74bfe7c3ba110d325ebe.tar.bz2
Fix qemu pipe's 'poll' callbacks
Throughout emulator's code pipe's 'poll' callback was returning PIPE_WAKE_XXX, instead of PIPE_POLL_XXX flags. This created whole sort of issues with the qemu pipe service <-> client communications. This is also a fix for http://b/issue?id=5196348 Change-Id: I92202cf4ef4554559eb022c4410ee93923edec1b
Diffstat (limited to 'android/hw-qemud.c')
-rw-r--r--android/hw-qemud.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/hw-qemud.c b/android/hw-qemud.c
index 7de66e0..44d9dd7 100644
--- a/android/hw-qemud.c
+++ b/android/hw-qemud.c
@@ -1965,9 +1965,9 @@ _qemudPipe_poll(void* opaque)
unsigned ret = 0;
if (client != NULL) {
- ret |= PIPE_WAKE_WRITE;
+ ret |= PIPE_POLL_OUT;
if (client->ProtocolSelector.Pipe.messages != NULL) {
- ret |= PIPE_WAKE_READ;
+ ret |= PIPE_POLL_IN;
}
} else {
D("%s: Unexpected NULL client", __FUNCTION__);