alsaaudio: Remove unused error handling of qemu_set_fd_handler
The function cannot fail, so the check is superfluous. Signed-off-by: Fam Zheng <famz@redhat.com> Message-id: 1433400324-7358-10-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
6484e42247
commit
be93f21627
@ -266,31 +266,19 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
|
|||||||
|
|
||||||
for (i = 0; i < count; ++i) {
|
for (i = 0; i < count; ++i) {
|
||||||
if (pfds[i].events & POLLIN) {
|
if (pfds[i].events & POLLIN) {
|
||||||
err = qemu_set_fd_handler (pfds[i].fd, alsa_poll_handler,
|
qemu_set_fd_handler (pfds[i].fd, alsa_poll_handler, NULL, hlp);
|
||||||
NULL, hlp);
|
|
||||||
}
|
}
|
||||||
if (pfds[i].events & POLLOUT) {
|
if (pfds[i].events & POLLOUT) {
|
||||||
if (conf.verbose) {
|
if (conf.verbose) {
|
||||||
dolog ("POLLOUT %d %d\n", i, pfds[i].fd);
|
dolog ("POLLOUT %d %d\n", i, pfds[i].fd);
|
||||||
}
|
}
|
||||||
err = qemu_set_fd_handler (pfds[i].fd, NULL,
|
qemu_set_fd_handler (pfds[i].fd, NULL, alsa_poll_handler, hlp);
|
||||||
alsa_poll_handler, hlp);
|
|
||||||
}
|
}
|
||||||
if (conf.verbose) {
|
if (conf.verbose) {
|
||||||
dolog ("Set handler events=%#x index=%d fd=%d err=%d\n",
|
dolog ("Set handler events=%#x index=%d fd=%d err=%d\n",
|
||||||
pfds[i].events, i, pfds[i].fd, err);
|
pfds[i].events, i, pfds[i].fd, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (err) {
|
|
||||||
dolog ("Failed to set handler events=%#x index=%d fd=%d err=%d\n",
|
|
||||||
pfds[i].events, i, pfds[i].fd, err);
|
|
||||||
|
|
||||||
while (i--) {
|
|
||||||
qemu_set_fd_handler (pfds[i].fd, NULL, NULL, NULL);
|
|
||||||
}
|
|
||||||
g_free (pfds);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
hlp->pfds = pfds;
|
hlp->pfds = pfds;
|
||||||
hlp->count = count;
|
hlp->count = count;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user