From patchwork Thu Dec 10 18:11:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 40859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED784B6EF7 for ; Fri, 11 Dec 2009 05:32:11 +1100 (EST) Received: from localhost ([127.0.0.1]:52059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIno8-0008I6-PY for incoming@patchwork.ozlabs.org; Thu, 10 Dec 2009 13:32:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NInWS-000513-Mo for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:13:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NInWN-0004uG-VA for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:13:52 -0500 Received: from [199.232.76.173] (port=41847 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NInWN-0004u0-M8 for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:13:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64604) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NInWO-0003gl-5L for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:13:48 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBAIDjQh016988 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Dec 2009 13:13:45 -0500 Received: from redhat.com (vpn-6-118.tlv.redhat.com [10.35.6.118]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nBAIDhjF009378; Thu, 10 Dec 2009 13:13:44 -0500 Date: Thu, 10 Dec 2009 20:11:01 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: <20091210181101.GJ25707@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 09/17] vmware_vga: symbolic names for pci registers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org No functional changes. I verified that the generated binary does not change. Signed-off-by: Michael S. Tsirkin --- hw/vmware_vga.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 240731a..d63306c 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1171,16 +1171,18 @@ static int pci_vmsvga_initfn(PCIDevice *dev) pci_config_set_vendor_id(s->card.config, PCI_VENDOR_ID_VMWARE); pci_config_set_device_id(s->card.config, SVGA_PCI_DEVICE_ID); - s->card.config[PCI_COMMAND] = 0x07; /* I/O + Memory */ + s->card.config[PCI_COMMAND] = PCI_COMMAND_IO | + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER; /* I/O + Memory */ pci_config_set_class(s->card.config, PCI_CLASS_DISPLAY_VGA); - s->card.config[0x0c] = 0x08; /* Cache line size */ - s->card.config[0x0d] = 0x40; /* Latency timer */ - s->card.config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; - s->card.config[0x2c] = PCI_VENDOR_ID_VMWARE & 0xff; - s->card.config[0x2d] = PCI_VENDOR_ID_VMWARE >> 8; - s->card.config[0x2e] = SVGA_PCI_DEVICE_ID & 0xff; - s->card.config[0x2f] = SVGA_PCI_DEVICE_ID >> 8; - s->card.config[0x3c] = 0xff; /* End */ + s->card.config[PCI_CACHE_LINE_SIZE] = 0x08; /* Cache line size */ + s->card.config[PCI_LATENCY_TIMER] = 0x40; /* Latency timer */ + s->card.config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; + s->card.config[PCI_SUBSYSTEM_VENDOR_ID] = PCI_VENDOR_ID_VMWARE & 0xff; + s->card.config[PCI_SUBSYSTEM_VENDOR_ID + 1] = PCI_VENDOR_ID_VMWARE >> 8; + s->card.config[PCI_SUBSYSTEM_ID] = SVGA_PCI_DEVICE_ID & 0xff; + s->card.config[PCI_SUBSYSTEM_ID + 1] = SVGA_PCI_DEVICE_ID >> 8; + s->card.config[PCI_INTERRUPT_LINE] = 0xff; /* End */ pci_register_bar(&s->card, 0, 0x10, PCI_BASE_ADDRESS_SPACE_IO, pci_vmsvga_map_ioport);