diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2015-11-23 10:38:12 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-12-21 14:40:57 +0000 |
| commit | f3d6027ee0568b5442077120beeb5d9d17c2d0da (patch) | |
| tree | 576019b9823a1b0492e7e0acb79dee78d1644ea9 | |
| parent | 72d39c691b4269c95547245562bfde8504432407 (diff) | |
| download | linux-stable-f3d6027ee0568b5442077120beeb5d9d17c2d0da.tar.gz linux-stable-f3d6027ee0568b5442077120beeb5d9d17c2d0da.tar.bz2 linux-stable-f3d6027ee0568b5442077120beeb5d9d17c2d0da.zip | |
xen: introduce XENPF_settime64
Rename the current XENPF_settime hypercall and related struct to
XENPF_settime32.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
| -rw-r--r-- | arch/x86/xen/time.c | 8 | ||||
| -rw-r--r-- | include/xen/interface/platform.h | 18 |
2 files changed, 18 insertions, 8 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 663c2ea449c7..3bbd377e1657 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -134,10 +134,10 @@ static int xen_pvclock_gtod_notify(struct notifier_block *nb, if (!was_set && timespec_compare(&now, &next_sync) < 0) return NOTIFY_OK; - op.cmd = XENPF_settime; - op.u.settime.secs = now.tv_sec; - op.u.settime.nsecs = now.tv_nsec; - op.u.settime.system_time = xen_clocksource_read(); + op.cmd = XENPF_settime32; + op.u.settime32.secs = now.tv_sec; + op.u.settime32.nsecs = now.tv_nsec; + op.u.settime32.system_time = xen_clocksource_read(); (void)HYPERVISOR_platform_op(&op); diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h index 8e035871360e..732efb08c3e1 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -35,14 +35,23 @@ * Set clock such that it would read <secs,nsecs> after 00:00:00 UTC, * 1 January, 1970 if the current system time was <system_time>. */ -#define XENPF_settime 17 -struct xenpf_settime { +#define XENPF_settime32 17 +struct xenpf_settime32 { /* IN variables. */ uint32_t secs; uint32_t nsecs; uint64_t system_time; }; -DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime_t); +DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime32_t); +#define XENPF_settime64 62 +struct xenpf_settime64 { + /* IN variables. */ + uint64_t secs; + uint32_t nsecs; + uint32_t mbz; + uint64_t system_time; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime64_t); /* * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type. @@ -495,7 +504,8 @@ struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ union { - struct xenpf_settime settime; + struct xenpf_settime32 settime32; + struct xenpf_settime64 settime64; struct xenpf_add_memtype add_memtype; struct xenpf_del_memtype del_memtype; struct xenpf_read_memtype read_memtype; |