From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [PATCH 06/10] kvm: remove unused variables
Date: Wed, 15 Jun 2011 11:25:32 +0300
Message-ID: <20110615082532.GA31267@redhat.com>
References: <cover.1308072799.git.mst@redhat.com>
 <b8c61957187f86291291abfaed88f44ac8d41b95.1308072799.git.mst@redhat.com>
 <4DF8617F.20700@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: qemu-devel@nongnu.org, Paul Brook <paul@codesourcery.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Riku Voipio <riku.voipio@iki.fi>,
	Richard Henderson <rth@twiddle.net>,
	Avi Kivity <avi@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Blue Swirl <blauwirbel@gmail.com>,
	Stefan Weil <weil@mail.berlios.de>,
	Jan Kiszka <jan.kiszka@siemens.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Christoph Hellwig <hch@lst.de>,
	Aurelien Jarno <aurelien@aurel32.net>,
	Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>,
	Alexander Graf <agraf@suse.de>,
	Isaku Yamahata <yamahata@valinux.co.jp>, kvm@vger.kernel.org
To: Kevin Wolf <kwolf@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:30896 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753358Ab1FOI0L (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 15 Jun 2011 04:26:11 -0400
Content-Disposition: inline
In-Reply-To: <4DF8617F.20700@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Wed, Jun 15, 2011 at 09:38:39AM +0200, Kevin Wolf wrote:
> 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

Sorry, this belongs in another patch.
Thanks for pointing this out.
Otherwise ack?

> 
> > 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;