From patchwork Tue May 3 20:28:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 751632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p43KSbpJ028049 for ; Tue, 3 May 2011 20:28:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754543Ab1ECU2f (ORCPT ); Tue, 3 May 2011 16:28:35 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:61228 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753875Ab1ECU2e (ORCPT ); Tue, 3 May 2011 16:28:34 -0400 Received: by wwa36 with SMTP id 36so489017wwa.1 for ; Tue, 03 May 2011 13:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=bn3jDMYWbM+H9O3Q0g6J25jxklKHVJmS5Qd4blzuKcE=; b=vv6OlYUKgSUx7Jlywujs4yPEIAtRyejke10mrE5dVUwxQgBxE2GH5B7yf3yM4iqZ0U oT3gcVzkkS3pqeqlU/n5Bb0EemxbWP+I+bi6Ch9R57Kll17aSHNS9IEHob9dI1zmNebs egUI90en2YCqI2g/B8Z84o4It9KyHJ+99rm/E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=GMeGaySoF3DyeG7ytfDodTVtTeo2ToPRIH48CoempSdPfGWKu3bOcWhnl6GoO66eHO dHeHwkovFHGGn1MEBbZqYt2ORpFmegu7lHfayyNoxuTtWF1sY6jWYBTu4NhZb20Le87v 47bxT2A2l4uaaOVIfKHsPJ329y5mj6mLAPL8A= Received: by 10.216.236.28 with SMTP id v28mr3899059weq.12.1304454513541; Tue, 03 May 2011 13:28:33 -0700 (PDT) Received: from localhost.localdomain (bzq-79-179-202-103.red.bezeqint.net [79.179.202.103]) by mx.google.com with ESMTPS id f30sm239002wef.7.2011.05.03.13.28.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 May 2011 13:28:33 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, kvm@vger.kernel.org, Sasha Levin Subject: [PATCH 1/2 V2] kvm tools: Drop ALIGN from bios.h Date: Tue, 3 May 2011 23:28:06 +0300 Message-Id: <1304454487-2539-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 03 May 2011 20:28:38 +0000 (UTC) Drops align from bios.h, fixes related code to use instead. Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/bios.h | 13 ------------- tools/kvm/mptable.c | 1 + 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/tools/kvm/include/kvm/bios.h b/tools/kvm/include/kvm/bios.h index 914720b..7586e2a 100644 --- a/tools/kvm/include/kvm/bios.h +++ b/tools/kvm/include/kvm/bios.h @@ -51,19 +51,6 @@ #define MB_BIOS_SS 0xfff7 #define MB_BIOS_SP 0x40 -#ifndef ALIGN -#define ALIGN(x, a) \ - (((x) + ((a) - 1)) & ~((a) - 1)) -#endif - -/* - * note we use 16 bytes alignment which makes segment based - * addressing easy to compute, dont change it otherwise you - * may break local variables offsets in BIOS irq routines - */ -#define BIOS_NEXT_IRQ_ADDR(addr, size) \ - ALIGN((addr + size + 1), 16) - /* * When interfere with assembler code we need to be sure how * arguments are passed in real mode. diff --git a/tools/kvm/mptable.c b/tools/kvm/mptable.c index 5bbe7ea..b74c491 100644 --- a/tools/kvm/mptable.c +++ b/tools/kvm/mptable.c @@ -4,6 +4,7 @@ #include "kvm/mptable.h" #include "kvm/util.h" +#include #include /*