From patchwork Sun Feb 5 12:39:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 139641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 54083B723A for ; Mon, 6 Feb 2012 00:10:09 +1100 (EST) Received: from localhost ([::1]:54504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ru1OE-0007Tc-7V for incoming@patchwork.ozlabs.org; Sun, 05 Feb 2012 07:40:18 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ru1Nf-0006IS-Q4 for qemu-devel@nongnu.org; Sun, 05 Feb 2012 07:39:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ru1NZ-0005tE-LB for qemu-devel@nongnu.org; Sun, 05 Feb 2012 07:39:43 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:49919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ru1NZ-0005sw-Fi for qemu-devel@nongnu.org; Sun, 05 Feb 2012 07:39:37 -0500 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate01.web.de (Postfix) with ESMTP id DBF991A9E2900 for ; Sun, 5 Feb 2012 13:39:36 +0100 (CET) Received: from localhost.localdomain ([95.157.56.37]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0MCIYT-1RlSo52FCD-008ohl; Sun, 05 Feb 2012 13:39:36 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Sun, 5 Feb 2012 13:39:12 +0100 Message-Id: <3eb4150930ce469a11cf3c7a464c6eb385be694a.1328445531.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V02:K0:le01lLWaH8kQ1DJ/v1kT1sGu+LdVtCjJfMzYm9H28xK DOgJWBsGQtzEnhb6Svr1qmR8WRKoL7t3P+6oi/iqLnEsdUwH5g ir+7fXqgnMcXjB2s1Sx2d+c7vMbeBtDlGP7URC83WV5n5gYvL7 StS74YFBhsrA2ZdtpNIULl70yrLc8cTEXtyb24vNTif8dgEH0G vEMsXxVg2hlCffUm5iy4g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: Anthony Liguori , qemu-devel , kvm@vger.kernel.org, Gleb Natapov Subject: [Qemu-devel] [PATCH 6/6] kvmvapic: Use optionrom helpers 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 From: Jan Kiszka Use OPTION_ROM_START/END from the common header file, add comment to init code. Signed-off-by: Jan Kiszka --- pc-bios/optionrom/kvmvapic.S | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pc-bios/optionrom/kvmvapic.S b/pc-bios/optionrom/kvmvapic.S index 856c1e5..aa17a40 100644 --- a/pc-bios/optionrom/kvmvapic.S +++ b/pc-bios/optionrom/kvmvapic.S @@ -9,12 +9,10 @@ # option) any later version. See the COPYING file in the top-level directory. # - .text 0 - .code16 -.global _start -_start: - .short 0xaa55 - .byte (_end - _start) / 512 +#include "optionrom.h" + +OPTION_ROM_START + # clear vapic area: firmware load using rep insb may cause # stale tpr/isr/irr data to corrupt the vapic area. push %es @@ -26,8 +24,11 @@ _start: cld rep stosw pop %es + + # announce presence to the hypervisor mov $vapic_base, %ax out %ax, $0x7e + lret .code32 @@ -331,7 +332,4 @@ up_set_tpr_poll_irq: vapic: . = . + vapic_size -.byte 0 # reserve space for signature -.align 512, 0 - -_end: +OPTION_ROM_END