From patchwork Wed Sep 14 10:01:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 9331099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3A2FA6077F for ; Wed, 14 Sep 2016 10:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B32E29C36 for ; Wed, 14 Sep 2016 10:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F72329C3B; Wed, 14 Sep 2016 10:07:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A48E029C36 for ; Wed, 14 Sep 2016 10:07:36 +0000 (UTC) Received: from localhost ([::1]:54834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk76N-0003LR-Nq for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Sep 2016 06:07:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk70y-0007eN-Bp for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:02:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bk70x-0001Nf-Ej for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:02:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk70x-0001NU-9J for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:01:59 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D20954E4EF; Wed, 14 Sep 2016 10:01:58 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8EA1q0h006427; Wed, 14 Sep 2016 06:01:56 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 14 Sep 2016 12:01:50 +0200 Message-Id: <1473847310-129729-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1473847310-129729-1-git-send-email-imammedo@redhat.com> References: <1473847310-129729-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 14 Sep 2016 10:01:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] target-i386: turn off CPU.l3-cache only for 2.7 and older machine types 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: , Cc: marcel@redhat.com, longpeng2@huawei.com, ehabkost@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP commit (14c985cff target-i386: present virtual L3 cache info for vcpus) misplaced compat property putting it in new 2.8 machine type which would effectively to disable feature until 2.9 is released. Intent of commit probably should be to disable feature for 2.7 and older while allowing not yet released 2.8 to have feature enabled by default. Signed-off-by: Igor Mammedov Reviewed-by: Marcel Apfelbaum --- include/hw/i386/pc.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d5654ab..1c5fd08 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -369,17 +369,16 @@ int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_8 \ + +#define PC_COMPAT_2_7 \ + PC_COMPAT_2_8 \ + HW_COMPAT_2_7 \ {\ .driver = TYPE_X86_CPU,\ .property = "l3-cache",\ .value = "off",\ }, - -#define PC_COMPAT_2_7 \ - PC_COMPAT_2_8 \ - HW_COMPAT_2_7 - #define PC_COMPAT_2_6 \ PC_COMPAT_2_7 \ HW_COMPAT_2_6 \