Commit f3d6027e authored by Stefano Stabellini's avatar Stefano Stabellini Committed by David Vrabel

xen: introduce XENPF_settime64

Rename the current XENPF_settime hypercall and related struct to
XENPF_settime32.
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 72d39c69
...@@ -134,10 +134,10 @@ static int xen_pvclock_gtod_notify(struct notifier_block *nb, ...@@ -134,10 +134,10 @@ static int xen_pvclock_gtod_notify(struct notifier_block *nb,
if (!was_set && timespec_compare(&now, &next_sync) < 0) if (!was_set && timespec_compare(&now, &next_sync) < 0)
return NOTIFY_OK; return NOTIFY_OK;
op.cmd = XENPF_settime; op.cmd = XENPF_settime32;
op.u.settime.secs = now.tv_sec; op.u.settime32.secs = now.tv_sec;
op.u.settime.nsecs = now.tv_nsec; op.u.settime32.nsecs = now.tv_nsec;
op.u.settime.system_time = xen_clocksource_read(); op.u.settime32.system_time = xen_clocksource_read();
(void)HYPERVISOR_platform_op(&op); (void)HYPERVISOR_platform_op(&op);
......
...@@ -35,14 +35,23 @@ ...@@ -35,14 +35,23 @@
* Set clock such that it would read <secs,nsecs> after 00:00:00 UTC, * 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>. * 1 January, 1970 if the current system time was <system_time>.
*/ */
#define XENPF_settime 17 #define XENPF_settime32 17
struct xenpf_settime { struct xenpf_settime32 {
/* IN variables. */ /* IN variables. */
uint32_t secs; uint32_t secs;
uint32_t nsecs; uint32_t nsecs;
uint64_t system_time; 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. * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type.
...@@ -495,7 +504,8 @@ struct xen_platform_op { ...@@ -495,7 +504,8 @@ struct xen_platform_op {
uint32_t cmd; uint32_t cmd;
uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
union { union {
struct xenpf_settime settime; struct xenpf_settime32 settime32;
struct xenpf_settime64 settime64;
struct xenpf_add_memtype add_memtype; struct xenpf_add_memtype add_memtype;
struct xenpf_del_memtype del_memtype; struct xenpf_del_memtype del_memtype;
struct xenpf_read_memtype read_memtype; struct xenpf_read_memtype read_memtype;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment