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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B480FC31E40 for ; Mon, 12 Aug 2019 12:59:53 +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 876EC20679 for ; Mon, 12 Aug 2019 12:59:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 876EC20679 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]:45308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx9vU-0003F3-Qf for qemu-devel@archiver.kernel.org; Mon, 12 Aug 2019 08:59:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47220) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx9v1-0002pY-Ej for qemu-devel@nongnu.org; Mon, 12 Aug 2019 08:59:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hx9v0-00005s-CA for qemu-devel@nongnu.org; Mon, 12 Aug 2019 08:59:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hx9v0-00004v-0d for qemu-devel@nongnu.org; Mon, 12 Aug 2019 08:59:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6CF68DA5B; Mon, 12 Aug 2019 12:59:20 +0000 (UTC) Received: from x1.home (ovpn-116-99.phx2.redhat.com [10.3.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02BA128DEF; Mon, 12 Aug 2019 12:59:15 +0000 (UTC) Date: Mon, 12 Aug 2019 06:59:15 -0600 From: Alex Williamson To: Gerd Hoffmann Message-ID: <20190812065915.271c43be@x1.home> In-Reply-To: <20190812065221.20907-2-kraxel@redhat.com> References: <20190812065221.20907-1-kraxel@redhat.com> <20190812065221.20907-2-kraxel@redhat.com> Organization: Red Hat MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 12 Aug 2019 12:59:20 +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: Re: [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: Peter Maydell , Prasad J Pandit , qemu-devel@nongnu.org, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 12 Aug 2019 08:52:21 +0200 Gerd Hoffmann wrote: > 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 > --- > hw/display/bochs-display.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Reviewed-by: Alex Williamson > 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, Error **errp) > } > > if (pci_bus_is_express(pci_get_bus(dev))) { > - dev->cap_present |= QEMU_PCI_CAP_EXPRESS; > ret = pcie_endpoint_cap_init(dev, 0x80); > assert(ret > 0); > + } else { > + dev->cap_present &= ~QEMU_PCI_CAP_EXPRESS; > } > > memory_region_set_log(&s->vram, true, DIRTY_MEMORY_VGA); > @@ -322,11 +323,15 @@ static void bochs_display_set_big_endian_fb(Object *obj, bool value, > > static void bochs_display_init(Object *obj) > { > + PCIDevice *dev = 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 |= QEMU_PCI_CAP_EXPRESS; > } > > static void bochs_display_exit(PCIDevice *dev)