From patchwork Thu Feb 17 14:30:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 570351 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 p1HEUbFO015718 for ; Thu, 17 Feb 2011 14:30:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753485Ab1BQOae (ORCPT ); Thu, 17 Feb 2011 09:30:34 -0500 Received: from david.siemens.de ([192.35.17.14]:31425 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751685Ab1BQOad (ORCPT ); Thu, 17 Feb 2011 09:30:33 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p1HEUJBJ011585; Thu, 17 Feb 2011 15:30:20 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p1HEUJod013696; Thu, 17 Feb 2011 15:30:19 +0100 Message-ID: <4D5D30FB.30305@siemens.com> Date: Thu, 17 Feb 2011 15:30:19 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Remove merge artifact 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 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Feb 2011 14:30:54 +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) { return 0;