From nobody Thu Apr 25 08:48: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=1565592776; cv=none; d=zoho.com; s=zohoarc; b=af8Cb2yS3NDbiQpX8zC9n/8q6UhVpSDrb+1gqqb4N8W1ue2ry2DbckGB9GeJaK7fdKsXqBvqoG8AARJy9/leYBtJORy3bmqrbb/BiEmraU7kX9SaU5hyuTFVk7sxqwYLzGacJp755BUkj3SoTAzDMO7f5QHN9zlmCA9KxQKPHZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565592776; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=J4dz+B4pEKfYzlYvUaNxk6cG0narS90x3dymnDOVm70=; b=cN6PP3r1+hAuuoLp/1+OWN2iim63e9S8MOVQV2NvdM9tXzg5NiDzqRti9Tg77dWj8C+uFxM+RZ/WS861VEwssPPU3gvi43l6ALGtKRgTDqJ+E/Zmk4rr6wPv1ojGO3jaNgRzhZg/IU4pxU0lbPTVrqI1/JWK3yKwNkSTL/Vx6a0= 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 1565592776959539.3439009226249; Sun, 11 Aug 2019 23:52:56 -0700 (PDT) Received: from localhost ([::1]:43358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx4CL-00078b-5p for importer@patchew.org; Mon, 12 Aug 2019 02:52:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43505) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx4Bx-0006jx-1E for qemu-devel@nongnu.org; Mon, 12 Aug 2019 02:52:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hx4Bw-0007bB-63 for qemu-devel@nongnu.org; Mon, 12 Aug 2019 02:52:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hx4Bw-0007av-1B for qemu-devel@nongnu.org; Mon, 12 Aug 2019 02:52:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF4DB300501F; Mon, 12 Aug 2019 06:52:26 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-144.ams2.redhat.com [10.36.116.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F1435D9CA; Mon, 12 Aug 2019 06:52:22 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 23B3317444; Mon, 12 Aug 2019 08:52:21 +0200 (CEST) From: Gerd Hoffmann To: "Michael S. Tsirkin" , Peter Maydell , Prasad J Pandit Date: Mon, 12 Aug 2019 08:52:21 +0200 Message-Id: <20190812065221.20907-2-kraxel@redhat.com> In-Reply-To: <20190812065221.20907-1-kraxel@redhat.com> References: <20190812065221.20907-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 12 Aug 2019 06:52:26 +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/1] display/bochs: fix pcie support 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: Gerd Hoffmann , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Set QEMU_PCI_CAP_EXPRESS unconditionally in init(), then clear it in realize() in case the device is not connected to a PCIe bus. This makes sure the pci config space allocation is big enough, so accessing the PCIe extended config space doesn't overflow the pci config space buffer. Signed-off-by: Gerd Hoffmann Reviewed-by: Alex Williamson Reviewed-by: Paolo Bonzini --- hw/display/bochs-display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 582133dd719c..8e83b5164b67 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -297,9 +297,10 @@ static void bochs_display_realize(PCIDevice *dev, Erro= r **errp) } =20 if (pci_bus_is_express(pci_get_bus(dev))) { - dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; ret =3D pcie_endpoint_cap_init(dev, 0x80); assert(ret > 0); + } else { + dev->cap_present &=3D ~QEMU_PCI_CAP_EXPRESS; } =20 memory_region_set_log(&s->vram, true, DIRTY_MEMORY_VGA); @@ -322,11 +323,15 @@ static void bochs_display_set_big_endian_fb(Object *o= bj, bool value, =20 static void bochs_display_init(Object *obj) { + PCIDevice *dev =3D PCI_DEVICE(obj); + /* Expose framebuffer byteorder via QOM */ object_property_add_bool(obj, "big-endian-framebuffer", bochs_display_get_big_endian_fb, bochs_display_set_big_endian_fb, NULL); + + dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 static void bochs_display_exit(PCIDevice *dev) --=20 2.18.1