From patchwork Sat Feb 26 16:38:58 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Prasad Joshi <prasadjoshi124@gmail.com>
X-Patchwork-Id: 592591
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1QGd2Oo009975
	for <patchwork-kvm@patchwork.kernel.org>;
	Sat, 26 Feb 2011 16:39:03 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752011Ab1BZQi7 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Sat, 26 Feb 2011 11:38:59 -0500
Received: from mail-qy0-f174.google.com ([209.85.216.174]:37134 "EHLO
	mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751792Ab1BZQi7 convert rfc822-to-8bit (ORCPT
	<rfc822;kvm@vger.kernel.org>); Sat, 26 Feb 2011 11:38:59 -0500
Received: by qyk7 with SMTP id 7so1197043qyk.19
	for <kvm@vger.kernel.org>; Sat, 26 Feb 2011 08:38:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to
	:content-type:content-transfer-encoding;
	bh=kBnDNhv9hMLW5hrdxo/QDygfN1Pe5vz4qxWlNrvFJTY=;
	b=VuTNMfpQeJtdu3BNT+To7CZRZxs1i8pJBJ7etW229y7LLzZDj+qcvQvPDvXF/eq8JZ
	gmyGDGTXW/j+ZmdfxFgnJgdYK5yy14ARB39MrkOnOFxQ6VgBVJEGnNX5TdJOn8MQuAYw
	hXhtRov8PSaunljv/w68nTZ7vND1RsqHNjiy0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type
	:content-transfer-encoding;
	b=oqz0m/KJfxGSrv/ijMeSyOxNIXX24eM9ulv+pXMvmJBy6uH/lpEsDGkKMfGoEgHhpc
	tNcMp0evffCEErZPGhlgUHS6BUTM8cqkJdBQDqW+s4tgFJuppNUZg9PY6iPf87qyLKiF
	8A0QjYvEB/vOnQW7GxSvxLGoNXBK2I4tjxurM=
MIME-Version: 1.0
Received: by 10.229.189.14 with SMTP id dc14mr2832003qcb.58.1298738338087;
	Sat, 26 Feb 2011 08:38:58 -0800 (PST)
Received: by 10.229.99.68 with HTTP; Sat, 26 Feb 2011 08:38:58 -0800 (PST)
Date: Sat, 26 Feb 2011 16:38:58 +0000
Message-ID: <AANLkTik9tmnEL4q3jycRBQ0s+Jym7bE7z3kH-9y+s9Eg@mail.gmail.com>
Subject: [PATCH]: Fixes the qemu-kvm compilation failure when configured
	with disable-kvm
From: Prasad Joshi <prasadjoshi124@gmail.com>
To: kvm@vger.kernel.org
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Sat, 26 Feb 2011 16:39:03 +0000 (UTC)


diff --git a/kvm-stub.c b/kvm-stub.c
index caef9b4..fc2b810 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -137,7 +137,6 @@ int kvm_set_ioeventfd_mmio_long(int fd, uint32_t
adr, uint32_t val, bool assign)
     return -ENOSYS;
 }

-<<<<<<< HEAD
 int kvm_has_gsi_routing(void)
 {