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: 119276 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7CFTner011012 for ; Thu, 12 Aug 2010 15:29:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760212Ab0HLP3q (ORCPT ); Thu, 12 Aug 2010 11:29:46 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:55275 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182Ab0HLP3n (ORCPT ); Thu, 12 Aug 2010 11:29:43 -0400 Received: by qyk9 with SMTP id 9so52812qyk.19 for ; Thu, 12 Aug 2010 08:29:42 -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 Cc: qemu-devel@nongnu.org Subject: [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c 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> 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 12 Aug 2010 15:29:50 +0000 (UTC) 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