From nobody Thu May 2 11:53:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565092773; cv=none; d=zoho.com; s=zohoarc; b=QdSsgLTGhYNqwvHeVdOTP4JFYwrbPJk9KkYMEmefUEqnG5SVTT9XyXhiFQv7hd6o38kjLyPgHOo3L4XemFqmDH0VuNgqs85K9qJDKOba40wgFCamCx8g3KKmip/sxNKXu1qZ45scCGBwyTSD+0JF7lsxDVpqKxNLHOETE+ugqYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565092773; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=ifo/xiNDI1LydS6G+8gbNt7bBDE4ZBl9J9/Dby1NVWA=; b=ISoGDfZrAAs5GnOsyaI68sRVVudxJd1nm5CJIHru9tcgQS2NNyt8GpvPCrovNgQvp2FMTQ4fJLHTgacs14svMejkupDT1yxIsEoEpa6RVDqarLniHBTIJGd28D/IeAJEMAq3htOQaVzJ4flbe1GtWMR3XFR4p0QjZa/+1dptaUI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565092773182976.4264850538741; Tue, 6 Aug 2019 04:59:33 -0700 (PDT) Received: from localhost ([::1]:60530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huy7o-0008FD-0J for importer@patchew.org; Tue, 06 Aug 2019 07:59:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59665) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huy6o-00077l-3Q for qemu-devel@nongnu.org; Tue, 06 Aug 2019 07:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1huy6n-0000ym-2o for qemu-devel@nongnu.org; Tue, 06 Aug 2019 07:58:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46110) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1huy6m-0000yB-Tc for qemu-devel@nongnu.org; Tue, 06 Aug 2019 07:58:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED9D930BA070; Tue, 6 Aug 2019 11:58:27 +0000 (UTC) Received: from localhost (dhcp-192-181.str.redhat.com [10.33.192.181]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 469341001B02; Tue, 6 Aug 2019 11:58:22 +0000 (UTC) From: Cornelia Huck To: Gerd Hoffmann Date: Tue, 6 Aug 2019 13:58:19 +0200 Message-Id: <20190806115819.16026-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 06 Aug 2019 11:58:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 for-4.1?] compat: disable edid on virtio-gpu base device 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 , "Michael S . Tsirkin" , Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 'edid' is a property of the virtio-gpu base device, so turning it off on virtio-gpu-pci is not enough (it misses -ccw). Turn it off on the base device instead. Fixes: 0a71966253c8 ("edid: flip the default to enabled") Signed-off-by: Cornelia Huck Reviewed-by: Gerd Hoffmann --- Only just noticed this... should we still shove this into 4.1? Or do we need a compat 4.1.1 dance for this? --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 28a475ad97a3..32d1ca9abc5a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -32,7 +32,7 @@ GlobalProperty hw_compat_4_0[] =3D { { "secondary-vga", "edid", "false" }, { "bochs-display", "edid", "false" }, { "virtio-vga", "edid", "false" }, - { "virtio-gpu-pci", "edid", "false" }, + { "virtio-gpu", "edid", "false" }, { "virtio-device", "use-started", "false" }, { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, { "pl031", "migrate-tick-offset", "false" }, --=20 2.20.1