aio / timers: Consistent treatment of disabled clocks for deadlines
Make treatment of disabled clocks consistent in deadline calculation Signed-off-by: Alex Bligh <alex@alex.org.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
		
							parent
							
								
									02a03a9f12
								
							
						
					
					
						commit
						043a7e1f8f
					
				| 
						 | 
					@ -264,7 +264,7 @@ int64_t qemu_clock_deadline(QEMUClock *clock)
 | 
				
			||||||
    /* To avoid problems with overflow limit this to 2^32.  */
 | 
					    /* To avoid problems with overflow limit this to 2^32.  */
 | 
				
			||||||
    int64_t delta = INT32_MAX;
 | 
					    int64_t delta = INT32_MAX;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (clock->active_timers) {
 | 
					    if (clock->enabled && clock->active_timers) {
 | 
				
			||||||
        delta = clock->active_timers->expire_time - qemu_get_clock_ns(clock);
 | 
					        delta = clock->active_timers->expire_time - qemu_get_clock_ns(clock);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (delta < 0) {
 | 
					    if (delta < 0) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue