Re: [PATCH 06/10] kvm: remove unused variables

[Kevin Wolf <kwolf@redhat.com>]

Am 14.06.2011 19:36, schrieb Michael S. Tsirkin:
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/virtio-pci.h   |    8 +++++---
>  target-i386/kvm.c |    3 +--
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h
> index a4b5fd3..b518917 100644
> --- a/hw/virtio-pci.h
> +++ b/hw/virtio-pci.h
> @@ -37,7 +37,9 @@ typedef struct {
>      bool ioeventfd_started;
>  } VirtIOPCIProxy;
>  
> -extern void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
> -                            uint16_t vendor, uint16_t device,
> -                            uint16_t class_code, uint8_t pif);
> +void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);
> +
> +/* Virtio ABI version, if we increment this, we break the guest driver. */
> +#define VIRTIO_PCI_ABI_VERSION          0
> +
>  #endif

Is this hunk there intentionally?

Kevin


> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index faedc6c..58a70bc 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -970,7 +970,7 @@ static int kvm_get_xsave(CPUState *env)
>  #ifdef KVM_CAP_XSAVE
>      struct kvm_xsave* xsave;
>      int ret, i;
> -    uint16_t cwd, swd, twd, fop;
> +    uint16_t cwd, swd, twd;
>  
>      if (!kvm_has_xsave()) {
>          return kvm_get_fpu(env);
> @@ -986,7 +986,6 @@ static int kvm_get_xsave(CPUState *env)
>      cwd = (uint16_t)xsave->region[0];
>      swd = (uint16_t)(xsave->region[0] >> 16);
>      twd = (uint16_t)xsave->region[1];
> -    fop = (uint16_t)(xsave->region[1] >> 16);
>      env->fpstt = (swd >> 11) & 7;
>      env->fpus = swd;
>      env->fpuc = cwd;