From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 12 Aug 2010 11:29:26 -0400 Message-Id: <1281626968-5607-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> References: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: qemu-devel@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 -- 1.7.1