openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ccid-card-emulated: use EventNotifier 

Shut up Coverity's complaint about unchecked fcntl return values,
and especially make the code simpler and more efficient.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-23 12:30:36 +02:00 committed by Gerd Hoffmann
parent 3ce2144538
commit c1129f6bff
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/usb/ccid-card-emulated.c
View File

@ -126,7 +126,7 @@ struct EmulatedState {
QemuMutex vreader_mutex; /* and guest_apdu_list mutex */ QemuMutex vreader_mutex; /* and guest_apdu_list mutex */
QemuMutex handle_apdu_mutex; QemuMutex handle_apdu_mutex;
QemuCond handle_apdu_cond; QemuCond handle_apdu_cond;
int pipe[2]; EventNotifier notifier;
int quit_apdu_thread; int quit_apdu_thread;
QemuThread apdu_thread_id; QemuThread apdu_thread_id;
}; };
@ -162,9 +162,7 @@ static void emulated_push_event(EmulatedState *card, EmulEvent *event)
qemu_mutex_lock(&card->event_list_mutex); qemu_mutex_lock(&card->event_list_mutex);
QSIMPLEQ_INSERT_TAIL(&(card->event_list), event, entry); QSIMPLEQ_INSERT_TAIL(&(card->event_list), event, entry);
qemu_mutex_unlock(&card->event_list_mutex); qemu_mutex_unlock(&card->event_list_mutex);
if (write(card->pipe[1], card, 1) != 1) { event_notifier_set(&card->notifier);
DPRINTF(card, 1, "write to pipe failed\n");
}
} }
static void emulated_push_type(EmulatedState *card, uint32_t type) static void emulated_push_type(EmulatedState *card, uint32_t type)
@ -358,16 +356,12 @@ static void *event_thread(void *arg)
return NULL; return NULL;
} }
static void pipe_read(void *opaque) static void card_event_handler(EventNotifier *notifier)
{ {
EmulatedState *card = opaque; EmulatedState *card = container_of(notifier, EmulatedState, notifier);
EmulEvent *event, *next; EmulEvent *event, *next;
char dummy;
int len;
do { event_notifier_test_and_clear(&card->notifier);
len = read(card->pipe[0], &dummy, sizeof(dummy));
} while (len == sizeof(dummy));
qemu_mutex_lock(&card->event_list_mutex); qemu_mutex_lock(&card->event_list_mutex);
QSIMPLEQ_FOREACH_SAFE(event, &card->event_list, entry, next) { QSIMPLEQ_FOREACH_SAFE(event, &card->event_list, entry, next) {
DPRINTF(card, 2, "event %s\n", emul_event_to_string(event->p.gen.type)); DPRINTF(card, 2, "event %s\n", emul_event_to_string(event->p.gen.type));
@ -404,16 +398,13 @@ static void pipe_read(void *opaque)
qemu_mutex_unlock(&card->event_list_mutex); qemu_mutex_unlock(&card->event_list_mutex);
} }
static int init_pipe_signaling(EmulatedState *card) static int init_event_notifier(EmulatedState *card)
{ {
if (pipe(card->pipe) < 0) { if (event_notifier_init(&card->notifier, false) < 0) {
DPRINTF(card, 2, "pipe creation failed\n"); DPRINTF(card, 2, "event notifier creation failed\n");
return -1; return -1;
} }
fcntl(card->pipe[0], F_SETFL, O_NONBLOCK); event_notifier_set_handler(&card->notifier, card_event_handler);
fcntl(card->pipe[1], F_SETFL, O_NONBLOCK);
fcntl(card->pipe[0], F_SETOWN, getpid());
qemu_set_fd_handler(card->pipe[0], pipe_read, NULL, card);
return 0; return 0;
} }
@ -500,7 +491,7 @@ static int emulated_initfn(CCIDCardState *base)
qemu_cond_init(&card->handle_apdu_cond); qemu_cond_init(&card->handle_apdu_cond);
card->reader = NULL; card->reader = NULL;
card->quit_apdu_thread = 0; card->quit_apdu_thread = 0;
if (init_pipe_signaling(card) < 0) { if (init_event_notifier(card) < 0) {
return -1; return -1;
} }