[Qemu-devel] [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Qemu-devel] [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Paolo Bonzini]

Nothing earth shattering. :)

Paolo Bonzini (3):
  move kvm_set_irqfd to kvm-stub.c
  remove unused function
  make kvm_mutex_*lock static

 kvm-all.c  |    5 +++++
 kvm-stub.c |    6 ++++++
 kvm.h      |    9 ---------
 qemu-kvm.c |    4 ++--
 qemu-kvm.h |    8 --------
 5 files changed, 13 insertions(+), 19 deletions(-)

[Qemu-devel] [qemu-kvm PATCH 1/3] move kvm_set_irqfd to kvm-stub.c

[Paolo Bonzini]

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

[Qemu-devel] [qemu-kvm PATCH 2/3] remove unused function

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-kvm.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/qemu-kvm.h b/qemu-kvm.h
index 6f6c6d8..c08e9b8 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -896,11 +896,6 @@ int handle_tpr_access(void *opaque, CPUState *env, uint64_t rip,
 void kvm_mutex_unlock(void);
 void kvm_mutex_lock(void);
 
-static inline int kvm_sync_vcpus(void)
-{
-    return 0;
-}
-
 #ifdef CONFIG_KVM
 
 typedef struct KVMSlot {
-- 
1.7.1

[Qemu-devel] [qemu-kvm PATCH 3/3] make kvm_mutex_*lock static

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-kvm.c |    4 ++--
 qemu-kvm.h |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/qemu-kvm.c b/qemu-kvm.c
index 96d458c..f46c394 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1798,13 +1798,13 @@ int kvm_set_irq(int irq, int level, int *status)
 
 #endif
 
-void kvm_mutex_unlock(void)
+static void kvm_mutex_unlock(void)
 {
     assert(!cpu_single_env);
     pthread_mutex_unlock(&qemu_mutex);
 }
 
-void kvm_mutex_lock(void)
+static void kvm_mutex_lock(void)
 {
     pthread_mutex_lock(&qemu_mutex);
     cpu_single_env = NULL;
diff --git a/qemu-kvm.h b/qemu-kvm.h
index c08e9b8..6b26daa 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -893,9 +893,6 @@ int handle_tpr_access(void *opaque, CPUState *env, uint64_t rip,
 #define qemu_kvm_cpu_stop(env) do {} while(0)
 #endif
 
-void kvm_mutex_unlock(void);
-void kvm_mutex_lock(void);
-
 #ifdef CONFIG_KVM
 
 typedef struct KVMSlot {
-- 
1.7.1

[Qemu-devel] Re: [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Avi Kivity]

  On 08/12/2010 06:29 PM, Paolo Bonzini wrote:
> Nothing earth shattering. :)
>
> Paolo Bonzini (3):
>    move kvm_set_irqfd to kvm-stub.c

This touches kvm-all.c, so should be against uq/master.

>    remove unused function
>    make kvm_mutex_*lock static

Those two applied.  Thanks.

-- 
error compiling committee.c: too many arguments to function

[Qemu-devel] Re: [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Paolo Bonzini]

On 08/17/2010 01:29 PM, Avi Kivity wrote:
> On 08/12/2010 06:29 PM, Paolo Bonzini wrote:
>> Nothing earth shattering. :)
>>
>> Paolo Bonzini (3):
>> move kvm_set_irqfd to kvm-stub.c
>
> This touches kvm-all.c, so should be against uq/master.

kvm_set_irqfd is not in upstream qemu, should I add it there even though 
it is unused?

Thanks,

Paolo

[Qemu-devel] Re: [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Avi Kivity]

  On 08/23/2010 09:45 AM, Paolo Bonzini wrote:
> On 08/17/2010 01:29 PM, Avi Kivity wrote:
>> On 08/12/2010 06:29 PM, Paolo Bonzini wrote:
>>> Nothing earth shattering. :)
>>>
>>> Paolo Bonzini (3):
>>> move kvm_set_irqfd to kvm-stub.c
>>
>> This touches kvm-all.c, so should be against uq/master.
>
> kvm_set_irqfd is not in upstream qemu, should I add it there even 
> though it is unused?

I think Cam (copied) wants it for nahanni devices, so it's a good 
opportunity.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

[Qemu-devel] Re: [qemu-kvm PATCH 0/3] small qemu-kvm cleanups

[Cam Macdonell]

On Mon, Aug 23, 2010 at 12:49 AM, Avi Kivity <avi@redhat.com> wrote:
>  On 08/23/2010 09:45 AM, Paolo Bonzini wrote:
>>
>> On 08/17/2010 01:29 PM, Avi Kivity wrote:
>>>
>>> On 08/12/2010 06:29 PM, Paolo Bonzini wrote:
>>>>
>>>> Nothing earth shattering. :)
>>>>
>>>> Paolo Bonzini (3):
>>>> move kvm_set_irqfd to kvm-stub.c
>>>
>>> This touches kvm-all.c, so should be against uq/master.
>>
>> kvm_set_irqfd is not in upstream qemu, should I add it there even though
>> it is unused?
>
> I think Cam (copied) wants it for nahanni devices, so it's a good
> opportunity.

Yes, I have a patch to make use of kvm_set_irqfd in nahanni, so it
would be great to have kvm_set_irqfd in qemu.

Cam

>
> --
> I have a truly marvellous patch that fixes the bug which this
> signature is too narrow to contain.
>
>