diff options
| author | Daniel Henrique Barboza | 2021-03-01 13:41:33 +0100 |
|---|---|---|
| committer | David Gibson | 2021-03-09 23:07:09 +0100 |
| commit | 4515a5f786024fabf0bef4cf3d28adf5647e6e82 (patch) | |
| tree | 6499b4ee6bc825ac039be968ecf08a9d169d0170 /hw/ppc | |
| parent | spapr_pci.c: add 'unplug already in progress' message for PCI unplug (diff) | |
| download | qemu-4515a5f786024fabf0bef4cf3d28adf5647e6e82.tar.gz qemu-4515a5f786024fabf0bef4cf3d28adf5647e6e82.tar.xz qemu-4515a5f786024fabf0bef4cf3d28adf5647e6e82.zip | |
qemu_timer.c: add timer_deadline_ms() helper
The pSeries machine is using QEMUTimer internals to return the timeout
in seconds for a timer object, in hw/ppc/spapr.c, function
spapr_drc_unplug_timeout_remaining_sec().
Create a helper in qemu-timer.c to retrieve the deadline for a QEMUTimer
object, in ms, to avoid exposing timer internals to the PPC code.
CC: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20210301124133.23800-2-danielhb413@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr_drc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 8c4997d795..98b626acf9 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -421,9 +421,8 @@ void spapr_drc_unplug_request(SpaprDrc *drc) int spapr_drc_unplug_timeout_remaining_sec(SpaprDrc *drc) { - if (drc->unplug_requested && timer_pending(drc->unplug_timeout_timer)) { - return (qemu_timeout_ns_to_ms(drc->unplug_timeout_timer->expire_time) - - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)) / 1000; + if (drc->unplug_requested) { + return timer_deadline_ms(drc->unplug_timeout_timer) / 1000; } return 0; |