diff options
| author | Peter Maydell | 2015-07-02 11:44:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-02 11:44:34 +0200 |
| commit | 6686ce3f1628f045035d58db8890d20705fd5c34 (patch) | |
| tree | acbc34609f422f0f2bb0f9cb39ad8d4c8c39bf96 /hw/timer/mc146818rtc.c | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/pull-m68k-20150629' into st... (diff) | |
| parent | block: remove redundant check before g_slist_find() (diff) | |
| download | qemu-6686ce3f1628f045035d58db8890d20705fd5c34.tar.gz qemu-6686ce3f1628f045035d58db8890d20705fd5c34.tar.xz qemu-6686ce3f1628f045035d58db8890d20705fd5c34.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu Jul 2 10:10:39 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
block: remove redundant check before g_slist_find()
block/nfs: limit maximum readahead size to 1MB
block/iscsi: restore compatiblity with libiscsi 1.9.0
iotests: Use event_wait in wait_ready
qemu-iotests: Add test case for mirror with unmap
qemu-iotests: Make block job methods common
block: Remove bdrv_reset_dirty
block: Fix dirty bitmap in bdrv_co_discard
mirror: Do zero write on target if sectors not allocated
qmp: Add optional bool "unmap" to drive-mirror
block: Add bdrv_get_block_status_above
timer: Use a single definition of NSEC_PER_SEC for the whole codebase
timer: Move NANOSECONDS_PER_SECONDS to timer.h
blockdev: no need to drain+flush in hmp_drive_del
qapi: Rename 'dirty-bitmap' mode to 'incremental'
qcow2: Handle EAGAIN returned from update_refcount
block/iscsi: add support for request timeouts
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/mc146818rtc.c')
| -rw-r--r-- | hw/timer/mc146818rtc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 2e3ffc8c07..954c34d6cc 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -48,7 +48,6 @@ # define DPRINTF_C(format, ...) do { } while (0) #endif -#define NSEC_PER_SEC 1000000000LL #define SEC_PER_MIN 60 #define MIN_PER_HOUR 60 #define SEC_PER_HOUR 3600 |