diff options
| author | Alex Bligh | 2013-08-21 17:02:39 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2013-08-22 15:58:05 +0200 |
| commit | e93379b039030c68d85693a4bee2b76f814108d2 (patch) | |
| tree | 6c017b5105f09bb60c8319499a49c660647aaf0b /hw/usb | |
| parent | vmdk: support vmfs files (diff) | |
| download | qemu-e93379b039030c68d85693a4bee2b76f814108d2.tar.gz qemu-e93379b039030c68d85693a4bee2b76f814108d2.tar.xz qemu-e93379b039030c68d85693a4bee2b76f814108d2.zip | |
aio / timers: Rename qemu_timer_* functions
Rename four functions in preparation for new API.
Rename qemu_timer_expired to timer_expired
Rename qemu_timer_expire_time_ns to timer_expire_time_ns
Rename qemu_timer_pending to timer_pending
Rename qemu_timer_expired_ns to timer_expired_ns
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/redirect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index e3b9f324b3..8fee3d362b 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1493,7 +1493,7 @@ static void usbredir_device_connect(void *priv, USBRedirDevice *dev = priv; const char *speed; - if (qemu_timer_pending(dev->attach_timer) || dev->dev.attached) { + if (timer_pending(dev->attach_timer) || dev->dev.attached) { ERROR("Received device connect while already connected\n"); return; } @@ -1588,7 +1588,7 @@ static void usbredir_interface_info(void *priv, * If we receive interface info after the device has already been * connected (ie on a set_config), re-check interface dependent things. */ - if (qemu_timer_pending(dev->attach_timer) || dev->dev.attached) { + if (timer_pending(dev->attach_timer) || dev->dev.attached) { usbredir_check_bulk_receiving(dev); if (usbredir_check_filter(dev)) { ERROR("Device no longer matches filter after interface info " |