All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
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	[thread overview]
Message-ID: <1281626968-5607-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1281626968-5607-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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



WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com>
To: kvm@vger.kernel.org
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c
Date: Thu, 12 Aug 2010 11:29:26 -0400	[thread overview]
Message-ID: <1281626968-5607-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1281626968-5607-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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

  reply	other threads:[~2010-08-12 15:29 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-12 15:29 [qemu-kvm PATCH 0/3] small qemu-kvm cleanups Paolo Bonzini
2010-08-12 15:29 ` [Qemu-devel] " Paolo Bonzini
2010-08-12 15:29 ` Paolo Bonzini [this message]
2010-08-12 15:29   ` [Qemu-devel] [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c Paolo Bonzini
2010-08-12 15:29 ` [qemu-kvm PATCH 2/3] remove unused function Paolo Bonzini
2010-08-12 15:29   ` [Qemu-devel] " Paolo Bonzini
2010-08-12 15:29 ` [qemu-kvm PATCH 3/3] make kvm_mutex_*lock static Paolo Bonzini
2010-08-12 15:29   ` [Qemu-devel] " Paolo Bonzini
2010-08-17 11:29 ` [qemu-kvm PATCH 0/3] small qemu-kvm cleanups Avi Kivity
2010-08-17 11:29   ` [Qemu-devel] " Avi Kivity
2010-08-23  6:45   ` Paolo Bonzini
2010-08-23  6:45     ` [Qemu-devel] " Paolo Bonzini
2010-08-23  6:49     ` Avi Kivity
2010-08-23  6:49       ` [Qemu-devel] " Avi Kivity
2010-08-23 16:10       ` Cam Macdonell
2010-08-23 16:10         ` [Qemu-devel] " Cam Macdonell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1281626968-5607-2-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.