From patchwork Thu Aug 12 15:29:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 61624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F0922B70D3 for ; Fri, 13 Aug 2010 01:51:38 +1000 (EST) Received: from localhost ([127.0.0.1]:46888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oja47-0005Zv-Rs for incoming@patchwork.ozlabs.org; Thu, 12 Aug 2010 11:51:35 -0400 Received: from [140.186.70.92] (port=50796 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjZxy-0001b0-PW for qemu-devel@nongnu.org; Thu, 12 Aug 2010 11:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjZiw-0005nA-5G for qemu-devel@nongnu.org; Thu, 12 Aug 2010 11:29:43 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:49058) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjZiw-0005mi-39 for qemu-devel@nongnu.org; Thu, 12 Aug 2010 11:29:42 -0400 Received: by mail-qw0-f45.google.com with SMTP id 5so1705211qwh.4 for ; Thu, 12 Aug 2010 08:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=7XPz1VnN8zlah/NJ8DDfgVQ1ZkacGSMwFc2x8MSsu6M=; b=MBKFcjHaTbO6lqVGAM9Z1vHRSeusYe3wp99wlsg4ApzLb5HwuYFYaQjA4YwVzXuEWV kF8iqw/n1OHDzp20yrrRrfUwlQSgoWJJytaEqBQeAZg1+Q/uLYwIPRA4/Jm/kMz3aYfG Aeez6NEXSLLeXxDGZt+VLubbKTppC5CCdi7AE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=FUDkPOhuPjVGuFKuH5wCxZh0n2HG4EnjIghlqlqzKWbs3ud0RaKV00aKv6FrRP35++ 8CRMxmsKxJ8GaHX5HdKKPpOFlknf92S0/96ko7dCM5C/WLJ/9uXTBnuYmtDEyz+Ww9vE e72cLi8quHAHkDl0eOjmN86Ao0K7/jjlnWI8w= Received: by 10.229.52.32 with SMTP id f32mr186681qcg.265.1281626981375; Thu, 12 Aug 2010 08:29:41 -0700 (PDT) Received: from localhost.localdomain ([12.198.177.3]) by mx.google.com with ESMTPS id f15sm1988571qcr.37.2010.08.12.08.29.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 12 Aug 2010 08:29:40 -0700 (PDT) From: Paolo Bonzini To: kvm@vger.kernel.org Date: Thu, 12 Aug 2010 11:29:26 -0400 Message-Id: <1281626968-5607-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> References: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- kvm-all.c | 5 +++++ kvm-stub.c | 6 ++++++ kvm.h | 9 --------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 47f58a6..78983ee 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1298,6 +1298,11 @@ int kvm_set_irqfd(int gsi, int fd, bool assigned) return r; return 0; } +#else +int kvm_set_irqfd(int gsi, int fd, bool assigned) +{ + return -ENOSYS; +} #endif #undef PAGE_SIZE diff --git a/kvm-stub.c b/kvm-stub.c index 7be5f5d..dd5ca66 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -135,3 +135,9 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign) { return -ENOSYS; } + +int +kvm_set_irqfd(int gsi, int fd, bool assigned) +{ + return -ENOSYS; +} diff --git a/kvm.h b/kvm.h index aab5118..e937995 100644 --- a/kvm.h +++ b/kvm.h @@ -182,15 +182,6 @@ static inline void cpu_synchronize_post_init(CPUState *env) #endif -#if defined(KVM_IRQFD) && defined(CONFIG_KVM) int kvm_set_irqfd(int gsi, int fd, bool assigned); -#else -static inline -int kvm_set_irqfd(int gsi, int fd, bool assigned) -{ - return -ENOSYS; -} -#endif - int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); #endif