Re: [Qemu-devel] [PULL 0/8] KVM changes for 2014-05-08

[Cornelia Huck]

On Sat, 10 May 2014 08:50:44 +0200
Paolo Bonzini <address@hidden> wrote:

> The following changes since commit 3a87f8b6859e6221b827ab4737779dddb37553ec:
> 
>   Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into 
> staging (2014-03-20 11:45:38 +0000)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

I rebased to qemu/master, where compilation fails with

/home/cohuck/git/qemu/target-s390x/kvm.c:132: error: static declaration of 
‘kvm_set_one_reg’ follows non-static declaration
/home/cohuck/git/qemu/include/sysemu/kvm.h:383: error: previous declaration of 
‘kvm_set_one_reg’ was here
/home/cohuck/git/qemu/target-s390x/kvm.c:146: error: static declaration of 
‘kvm_get_one_reg’ follows non-static declaration
/home/cohuck/git/qemu/include/sysemu/kvm.h:393: error: previous declaration of 
‘kvm_get_one_reg’ was here

> 
> for you to fetch changes up to 12474c96368ec3a01ad95c81fe9d00bd33e01877:
> 
>   target-i386: the x86 CPL is stored in CS.selector - auto update hflags 
> accordingly. (2014-05-10 08:47:56 +0200)
> 
> ----------------------------------------------------------------
> Alexey Kardashevskiy (1):
>       kvm: add set_one_reg/get_one_reg helpers

Here's where the conflict gets introduced. I don't mind using generic
helper functions, but these are missing the trace events on failure. So
I'd either like to have this patch replaced by
<address@hidden>, or
alternatively I can do an add-on patch that removes the s390
implementation introduced with 860643bc ("s390x/kvm: rework KVM
synchronize to tracing for some ONEREGS") and adds a trace event to the
common code implementation.

> 
> Gonglei (1):
>       pci-assign: Fix a bug when map MSI-X table memory failed
> 
> Kevin O'Connor (4):
>       target-i386: set eflags prior to calling svm_load_seg_cache() in 
> svm_helper.c
>       target-i386: set eflags and cr0 prior to calling 
> cpu_x86_load_seg_cache() in smm_helper.c
>       target-i386: set eflags prior to calling cpu_x86_load_seg_cache() in 
> seg_helper.c
>       target-i386: the x86 CPL is stored in CS.selector - auto update hflags 
> accordingly.
> 
> Michael S. Tsirkin (1):
>       pci-assign: limit # of msix vectors
> 
> Stefan Weil (1):
>       target-i386: Remove unused data from local array
> 
>  bsd-user/main.c          |  2 --
>  hw/i386/kvm/pci-assign.c | 13 ++++++------
>  include/sysemu/kvm.h     | 20 ++++++++++++++++++
>  kvm-all.c                | 18 ++++++++++++++++
>  linux-user/main.c        |  2 --
>  target-i386/cpu.h        | 25 +++++++++++------------
>  target-i386/kvm.c        |  3 +--
>  target-i386/seg_helper.c | 53 
> +++++++++++++++++-------------------------------
>  target-i386/smm_helper.c | 34 +++++++++++++++----------------
>  target-i386/svm_helper.c | 11 ++--------
>  10 files changed, 96 insertions(+), 85 deletions(-)