From nobody Sun Feb 8 17:37:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575896000; cv=none; d=zohomail.com; s=zohoarc; b=ZkTdx82991xyOIp8d5rivQRdt+9oIpu5E3EQ0ydnvvZJCOHc5frmccdo3GUTpghmlPJYbfS7ReUUQVtyQ3gG0KkzZCTOIsCxVfMfLXXZPAhDtzktnTxPqv2dtuuOjkVo4gJWkPUYJngGdubQU1xFLNcaODikQnF9Tegg0oHGLY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575896000; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H5pvhLFMACTPOTaGios/KIjgNkI2moWfcZsquunJqAg=; b=URP+b+Kmx2zkB3sUGgpZOPho1qKhnCIhC4KTcERH3YP9ahcXonmLMAIce8m0fMA8I/m5NULCuUhmjgNfSprc4OBHyjc6OZYI/1lyYxHCZ2ncoHBL4yYHzLnOArmQ353m7jANslZ6w8WP3aLNc9oD7zMv4BzvAnfuyTHhkv5SrKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1575896000435125.362431656019; Mon, 9 Dec 2019 04:53:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-262-uX0p7BHkMeqB4wH2QRoHcg-1; Mon, 09 Dec 2019 07:53:17 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5978D1005512; Mon, 9 Dec 2019 12:53:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A8B48185; Mon, 9 Dec 2019 12:53:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DF86118089CE; Mon, 9 Dec 2019 12:53:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9CrAg4023081 for ; Mon, 9 Dec 2019 07:53:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 94DA36BF9B; Mon, 9 Dec 2019 12:53:10 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FC496E3FD; Mon, 9 Dec 2019 12:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575895999; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=H5pvhLFMACTPOTaGios/KIjgNkI2moWfcZsquunJqAg=; b=I/Nc3Go28dBfkiUEqRypasnwcEdB2AcCteeiftbSGQSwCtgarNTDYQsgukWihLAgs0G+jX Mn8IENG2KvQoOn1jZRVNInKcpAgNmOBeGXscl5LpKHaCxZY2pFJ2a1aPc4M1Vw3r15Ninn BzXMx5m3kTcO67hd69tlpZyfXdPhK/g= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Mon, 9 Dec 2019 13:52:48 +0100 Message-Id: <20191209125248.5849-5-thuth@redhat.com> In-Reply-To: <20191209125248.5849-1-thuth@redhat.com> References: <20191209125248.5849-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Gerd Hoffmann , Marcel Apfelbaum Subject: [libvirt] [PATCH v2 4/4] hw/display: Remove "rombar" hack from vga-pci and vmware_vga X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: uX0p7BHkMeqB4wH2QRoHcg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that the old pc-0.x machine types have been removed, we do not need the old "rombar" hacks anymore. Signed-off-by: Thomas Huth Suggested-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga-pci.c | 5 ----- hw/display/vga.c | 4 +--- hw/display/vmware_vga.c | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index a27b88122d..cfe095713e 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -264,11 +264,6 @@ static void pci_std_vga_realize(PCIDevice *dev, Error = **errp) =20 pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mm= io); } - - if (!dev->rom_bar) { - /* compatibility with pc-0.13 and older */ - vga_init_vbe(s, OBJECT(dev), pci_address_space(dev)); - } } =20 static void pci_std_vga_init(Object *obj) diff --git a/hw/display/vga.c b/hw/display/vga.c index 82ebe53610..636586a476 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2304,9 +2304,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryR= egion *address_space, =20 void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *system_mem= ory) { - /* With pc-0.12 and below we map both the PCI BAR and the fixed VBE re= gion, - * so use an alias to avoid double-mapping the same region. - */ + /* Use an alias to avoid double-mapping the same region */ memory_region_init_alias(&s->vram_vbe, obj, "vram.vbe", &s->vram, 0, memory_region_size(&s->vram)); /* XXX: use optimized standard vga accesses */ diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 23dc8910cc..ead754eccf 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1312,11 +1312,6 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error= **errp) &s->chip.vga.vram); pci_register_bar(dev, 2, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->chip.fifo_ram); - - if (!dev->rom_bar) { - /* compatibility with pc-0.13 and older */ - vga_init_vbe(&s->chip.vga, OBJECT(dev), pci_address_space(dev)); - } } =20 static Property vga_vmware_properties[] =3D { --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list