Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefano Stabellini and committed by
David Vrabel
f3d6027e 72d39c69

+18 -8
+4 -4
arch/x86/xen/time.c
··· 134 134 if (!was_set && timespec_compare(&now, &next_sync) < 0) 135 135 return NOTIFY_OK; 136 136 137 - op.cmd = XENPF_settime; 138 - op.u.settime.secs = now.tv_sec; 139 - op.u.settime.nsecs = now.tv_nsec; 140 - op.u.settime.system_time = xen_clocksource_read(); 137 + op.cmd = XENPF_settime32; 138 + op.u.settime32.secs = now.tv_sec; 139 + op.u.settime32.nsecs = now.tv_nsec; 140 + op.u.settime32.system_time = xen_clocksource_read(); 141 141 142 142 (void)HYPERVISOR_platform_op(&op); 143 143
+14 -4
include/xen/interface/platform.h
··· 35 35 * Set clock such that it would read <secs,nsecs> after 00:00:00 UTC, 36 36 * 1 January, 1970 if the current system time was <system_time>. 37 37 */ 38 - #define XENPF_settime 17 39 - struct xenpf_settime { 38 + #define XENPF_settime32 17 39 + struct xenpf_settime32 { 40 40 /* IN variables. */ 41 41 uint32_t secs; 42 42 uint32_t nsecs; 43 43 uint64_t system_time; 44 44 }; 45 - DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime_t); 45 + DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime32_t); 46 + #define XENPF_settime64 62 47 + struct xenpf_settime64 { 48 + /* IN variables. */ 49 + uint64_t secs; 50 + uint32_t nsecs; 51 + uint32_t mbz; 52 + uint64_t system_time; 53 + }; 54 + DEFINE_GUEST_HANDLE_STRUCT(xenpf_settime64_t); 46 55 47 56 /* 48 57 * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type. ··· 504 495 uint32_t cmd; 505 496 uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ 506 497 union { 507 - struct xenpf_settime settime; 498 + struct xenpf_settime32 settime32; 499 + struct xenpf_settime64 settime64; 508 500 struct xenpf_add_memtype add_memtype; 509 501 struct xenpf_del_memtype del_memtype; 510 502 struct xenpf_read_memtype read_memtype;