From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BD0CC33C99 for ; Tue, 7 Jan 2020 08:36:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6491A2073D for ; Tue, 7 Jan 2020 08:36:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="A4ytv43V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6491A2073D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iokLT-0003zg-J8 for qemu-devel@archiver.kernel.org; Tue, 07 Jan 2020 03:36:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52127) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iojQb-0006tu-50 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:37:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iojQZ-0000A7-U7 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:37:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28432 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iojQZ-00009x-Pz for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:37:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578382643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=piqn6mX5WQ96VESO5T0tIJ0XhrZt2DhdjHLkZukt+8U=; b=A4ytv43VKnsoMaR69viToAq9TcBgNE6YRpxB+xb8I5hkzItI09eYdQuEvV4TROAmRJLs2F cJ4YKfulmsk93d0KJa5DmCb6V8UmuQo/xFrBdXMmVNERj9QkcQFTNnFJr6EvNImuXvgOTr IpUTdmjrOAHIpBP74l1zONsk6VIiwJQ= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-O6-u6SRnOEC0QFpTZ2qvAQ-1; Tue, 07 Jan 2020 02:37:22 -0500 Received: by mail-qk1-f200.google.com with SMTP id s9so17954995qkg.21 for ; Mon, 06 Jan 2020 23:37:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tN9j8nC8UNjEIUbDqAKywg3EszM5OfgJu5L0vZrOdtE=; b=eaNSplboNvez4aQoLhHgXGiPh4Wtbh/0AYvK/21tZoSJGxqJPT5L28hdasEZcA6Cf0 x8D2stClMKptc03QcGh+7ghKguwbWr/4PKNnECE0da41sdbZnFbpnY5TsSIAfupuOgR+ RbhLJMJZ00BojRUg3dvN1S7qxeA/UAtlPT9FkeW58tZl/+iEIE4a2n0Szcc9OT2sOMFT 2Hm5Oa6HFvBQAHBxgUcY1gwvcJDfRd2b544RmnxB/NYtWqugpEGEfXTzwgpFMXEJoXm5 NiTThNh5vNebmSKBwiRSY1FK8OgUm5lSPPjrk0ljko+pDBEN6MDRhHg/n6LF+fJceeEp v6Kg== X-Gm-Message-State: APjAAAVlRZc2u+jh78P+bkxl3rw14VfhWhRRUQCEW5NPW09bSBQGGkWU t59t6b+UWOUBWi9Ed41kdZN2BiXDYPdC7F66BsQwBWrvJp3g1p7HoIFBk0vy6lXkfdVWIRRjOGj h1EegvlE10TgQibU= X-Received: by 2002:ac8:4306:: with SMTP id z6mr77900317qtm.178.1578382641201; Mon, 06 Jan 2020 23:37:21 -0800 (PST) X-Google-Smtp-Source: APXvYqxG3hPL0OzKLLPNAeMXfVNwymQXzp2t7vdkRIRXEQDi+v6DXYUsrmIysbRJQAXG66+RW7NPsw== X-Received: by 2002:ac8:4306:: with SMTP id z6mr77900306qtm.178.1578382641015; Mon, 06 Jan 2020 23:37:21 -0800 (PST) Received: from redhat.com (bzq-79-183-34-164.red.bezeqint.net. [79.183.34.164]) by smtp.gmail.com with ESMTPSA id s11sm22092051qkg.99.2020.01.06.23.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 23:37:20 -0800 (PST) Date: Tue, 7 Jan 2020 02:37:16 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 25/32] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35 Message-ID: <20200107073451.298261-26-mst@redhat.com> References: <20200107073451.298261-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200107073451.298261-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: O6-u6SRnOEC0QFpTZ2qvAQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Denis Plotnikov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Denis Plotnikov 5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase. Signed-off-by: Denis Plotnikov Message-Id: <20191223072856.5369-1-dplotnikov@virtuozzo.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 721c7aa64e..fa12203079 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -425,7 +425,6 @@ static void pc_i440fx_5_0_machine_options(MachineClass = *m) m->alias =3D "pc"; m->is_default =3D 1; pcmc->default_cpu_version =3D 1; - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } =20 DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 52f45735e4..84cf925cf4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -354,7 +354,6 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pc_q35_machine_options(m); m->alias =3D "q35"; pcmc->default_cpu_version =3D 1; - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } =20 DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, --=20 MST