From patchwork Sun Jan 20 18:12:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 213973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8CEFC2C0089 for ; Mon, 21 Jan 2013 06:08:44 +1100 (EST) Received: from localhost ([::1]:56304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx0G2-0005QO-Fk for incoming@patchwork.ozlabs.org; Sun, 20 Jan 2013 14:08:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx0Ft-0005Q6-QE for qemu-devel@nongnu.org; Sun, 20 Jan 2013 14:08:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tx0Fs-0003HQ-BQ for qemu-devel@nongnu.org; Sun, 20 Jan 2013 14:08:33 -0500 Received: from merlin.infradead.org ([205.233.59.134]:50426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx0Fp-0003GY-Hz; Sun, 20 Jan 2013 14:08:29 -0500 Received: from [12.97.186.65] (helo=[172.20.11.69]) by merlin.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1TwzNP-00081n-E3; Sun, 20 Jan 2013 18:12:15 +0000 Message-ID: <1358705534.20334.53.camel@shinybook.infradead.org> From: David Woodhouse To: info@vruppert.de Date: Sun, 20 Jan 2013 12:12:14 -0600 X-Mailer: Evolution 3.6.2 (3.6.2-3.fc18) Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 205.233.59.134 Cc: vgabios-developers@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] Ensure PCIR is aligned to 4 bytes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The PCI Firmware Specification apparently requires that the PCI Data Structure be DWORD-aligned. The implementation in OVMF also requires this, so vgabios ROMs don't work there. With this fixed, I can now initialise the VGA ROM from EFI, and EFI can display using INT 10h services. --- vgabios-0.6c/vgabios.c.orig 2013-01-20 11:33:36.138548472 -0600 +++ vgabios-0.6c/vgabios.c 2013-01-20 11:36:26.060270163 -0600 @@ -204,6 +204,7 @@ vgabios_website: .byte 0x00 #ifdef PCIBIOS +.align 4 // DWORD alignment required by PCI Firmware Specification vgabios_pci_data: .ascii "PCIR" #ifdef CIRRUS