From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: x86: Fix KVM_GET_CLOCK Date: Tue, 03 Nov 2009 12:49:05 +0100 Message-ID: <4AF018B1.5080801@siemens.com> References: <4AEEFDC2.4010808@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm , Glauber Costa To: Avi Kivity , Marcelo Tosatti Return-path: Received: from thoth.sbs.de ([192.35.17.2]:24538 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbZKCLtP (ORCPT ); Tue, 3 Nov 2009 06:49:15 -0500 In-Reply-To: <4AEEFDC2.4010808@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: The flags field of kvm_clock_data is supposed to indicate the availability of additional fields one day. There are none yet, so clear it. Moreover, drop the bogus check of this field and return 0 on success. Signed-off-by: Jan Kiszka --- Note: This replaces "Clear flags field on return from KVM_GET_CLOCK". arch/x86/kvm/x86.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1f68798..7344405 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2577,14 +2577,12 @@ long kvm_arch_vm_ioctl(struct file *filp, ktime_get_ts(&now); now_ns = timespec_to_ns(&now); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; + user_ns.flags = 0; + r = -EFAULT; if (copy_to_user(argp, &user_ns, sizeof(user_ns))) - r = -EFAULT; - - r = -EINVAL; - if (user_ns.flags) goto out; - + r = 0; break; }