From patchwork Wed Sep 14 10:01:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 9331095 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 D4917608A0 for ; Wed, 14 Sep 2016 10:05:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C697F29BF3 for ; Wed, 14 Sep 2016 10:05:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB60629C39; Wed, 14 Sep 2016 10:05:50 +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 7319829C36 for ; Wed, 14 Sep 2016 10:05:46 +0000 (UTC) Received: from localhost ([::1]:54820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk74b-0001kt-6p for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Sep 2016 06:05:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk70x-0007dd-J9 for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bk70v-0001Mm-8k for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:01:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk70v-0001MV-39 for qemu-devel@nongnu.org; Wed, 14 Sep 2016 06:01:57 -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 88C5519B775; Wed, 14 Sep 2016 10:01:56 +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 u8EA1q0g006427; Wed, 14 Sep 2016 06:01:55 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 14 Sep 2016 12:01:49 +0200 Message-Id: <1473847310-129729-2-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.26]); Wed, 14 Sep 2016 10:01:56 +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 1/2] pc: fix regression introduced by adding 2.8 machine 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 (a4d3c834 pc: Add 2.8 machine) didn't ammend PC_COMPAT_2_6 to include PC_COMPAT_2_7 which results in {\ .driver = "virtio-pci",\ .property = "page-per-vq",\ .value = "on",\ }, and {\ .driver = TYPE_X86_CPU,\ .property = "l3-cache",\ .value = "off",\ }, being ignored and as result change PC_COMPAT_2_6 behaviour. Signed-off-by: Igor Mammedov Reviewed-by: Marcel Apfelbaum --- include/hw/i386/pc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ebba151..d5654ab 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -381,6 +381,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); HW_COMPAT_2_7 #define PC_COMPAT_2_6 \ + PC_COMPAT_2_7 \ HW_COMPAT_2_6 \ {\ .driver = "fw_cfg_io",\