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

util/oslib-win32: Remove if conditional 

The original ready < nhandles - 1 can be re-written as ready + 1 <
nhandles.  The check was actually incorrect because
WAIT_OBJECT_0 was not subtracted from ready; it worked because
WAIT_OBJECT_0 is zero.  After subtracting WAIT_OBJECT_0,
the result is the same condition that we are checking on the first
itteration of the for loop. This means we can remove the if statement
and let the for loop check the code.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <a14083d681951f3999a0e9314605cb706381ae8d.1498756113.git.alistair.francis@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Alistair Francis 2017-06-29 10:16:35 -07:00 committed by Paolo Bonzini
parent 86a57621ce
commit 0ec7b53482
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/oslib-win32.c
View File

@ -438,10 +438,8 @@ static int poll_rest(gboolean poll_msgs, HANDLE *handles, gint nhandles,
if (timeout == 0 && nhandles > 1) { if (timeout == 0 && nhandles > 1) {
/* Remove the handle that fired */ /* Remove the handle that fired */
int i; int i;
if (ready < nhandles - 1) { for (i = ready - WAIT_OBJECT_0 + 1; i < nhandles; i++) {
for (i = ready - WAIT_OBJECT_0 + 1; i < nhandles; i++) { handles[i-1] = handles[i];
handles[i-1] = handles[i];
}
} }
nhandles--; nhandles--;
recursed_result = poll_rest(FALSE, handles, nhandles, fds, nfds, 0); recursed_result = poll_rest(FALSE, handles, nhandles, fds, nfds, 0);