From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWlQ8-0005C4-2z for qemu-devel@nongnu.org; Wed, 15 Jun 2011 04:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWlQ6-0007m8-Fx for qemu-devel@nongnu.org; Wed, 15 Jun 2011 04:25:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWlQ5-0007lt-VH for qemu-devel@nongnu.org; Wed, 15 Jun 2011 04:25:50 -0400 Date: Wed, 15 Jun 2011 11:25:32 +0300 From: "Michael S. Tsirkin" Message-ID: <20110615082532.GA31267@redhat.com> References: <4DF8617F.20700@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4DF8617F.20700@redhat.com> Subject: Re: [Qemu-devel] [PATCH 06/10] kvm: remove unused variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: Alexander Graf , Anthony Liguori , Marcelo Tosatti , Stefan Hajnoczi , kvm@vger.kernel.org, Isaku Yamahata , Jan Kiszka , Paul Brook , Riku Voipio , qemu-devel@nongnu.org, Christoph Hellwig , Blue Swirl , Alex Williamson , Gerd Hoffmann , Paolo Bonzini , Avi Kivity , Aurelien Jarno , Richard Henderson 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 > > --- > > 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;