From patchwork Thu May 31 17:15:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 137431 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp6862532lji; Thu, 31 May 2018 10:28:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLElUINyyJ6/gbkmHctSGNXCHvPzyBLYnWgoLipVKFlK7YwiqkBE3MWJIhJpBAd9anjIYnP X-Received: by 2002:aed:3d7d:: with SMTP id h58-v6mr7609543qtf.405.1527787720933; Thu, 31 May 2018 10:28:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527787720; cv=none; d=google.com; s=arc-20160816; b=GaQ2GTPL/1Rdgtw3B5hYINX/X4+Ny1eiQdl74RV++Iy30apA1m58euJTyPTvfEEPFB sewHYKUWVfcD31vU1mwXGXhUsZdO0PCQZ5DRHNYBB3qAalxKY/ne4AWFsA546Vi00tym uAMDZZ5fEG0qmbPULq+VG30elAyU3y54qZCPWInJaT2k5nV84B5MlQ/zahJOYyW+gLrb 0T2C+ALbUHFgs3fb85ABiRUbgcoECMRmFGkB8ySY9bRWr597x4Lt3T9YAfFWgoyaWIiU fICqHtr+CYCaKT2IShhzC8QmQtrJKN0zpzjEH7fnAOKzRTmdvUvJlw7Y1FAkGziWIjD+ VHwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=DmhnF+9W1TBS+rBNNoQu5lWCEsDSPk9y7ceGI1SZvco=; b=ucT3WyrO6EHODeGYBByA7FyHW0H3eCZWtq4jJFB9SnkMlCGBIfbYm6SgRIjuMCIeQe HeCm+awyQexfBxDl9D9JAAZozdpnk9nikUR2H9j8+I0ONda+P8geh67AoWXbn6SYpBq+ cGOq9OuXNjXU3osdnNtUgddYRDmXQMrrBywg2cHzx+WSvihBu9HdvajxIpOK44p1xXtk Dwh6cJhOPEv4C6DNfw+Wlxw0ZRb7ZrwaVdKHEy8eiFxQSG9X3bFjC7tyhzOWzlLscfSH PR088e2vslgmwZnaf4KBRUi447oybTYFhgYo2UpcMwhtSbB+dTbz00Ge2V8718t5XMF3 +N3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 21-v6si2126574qvr.240.2018.05.31.10.28.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 31 May 2018 10:28:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORNQ-0007V3-8D for patch@linaro.org; Thu, 31 May 2018 13:28:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORBS-0006J5-3o for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fORBR-00040R-4Y for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:18 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59758 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fORBQ-00040B-VV for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9FA1840201A0 for ; Thu, 31 May 2018 17:16:16 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-47.ams2.redhat.com [10.36.117.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FA0863F34 for ; Thu, 31 May 2018 17:16:16 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 31 May 2018 19:15:58 +0200 Message-Id: <20180531171606.21604-7-pbonzini@redhat.com> In-Reply-To: <20180531171606.21604-1-pbonzini@redhat.com> References: <20180531171253.21012-1-pbonzini@redhat.com> <20180531171606.21604-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 31 May 2018 17:16:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 31 May 2018 17:16:16 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 45/53] target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell In kernel header commit 633711e8287, the define KVM_HINTS_DEDICATED was renamed to KVM_HINTS_REALTIME. Work around this compatibility break by (a) using the new constant name, and (b) defining it if the headers don't. Part (b) can be removed once we've updated our copy of the kernel headers to a version that defines KVM_HINTS_REALTIME. Signed-off-by: Peter Maydell Message-Id: <20180525132755.21839-5-peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.17.0 diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9d8f80f4c0..8eae654991 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -47,6 +47,11 @@ #include "exec/memattrs.h" #include "trace.h" +/* Work around this kernel header constant changing its name */ +#ifndef KVM_HINTS_REALTIME +#define KVM_HINTS_REALTIME KVM_HINTS_DEDICATED +#endif + //#define DEBUG_KVM #ifdef DEBUG_KVM @@ -386,7 +391,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, ret &= ~(1U << KVM_FEATURE_PV_UNHALT); } } else if (function == KVM_CPUID_FEATURES && reg == R_EDX) { - ret |= 1U << KVM_HINTS_DEDICATED; + ret |= 1U << KVM_HINTS_REALTIME; found = 1; }