From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWXXO-00049k-Ie for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:36:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWXXM-0006JN-Cm for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:36:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWXXL-0006JI-UB for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:36:24 -0400 Date: Tue, 14 Jun 2011 20:36:00 +0300 From: "Michael S. Tsirkin" Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 06/10] kvm: remove unused variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alexander Graf , Anthony Liguori , Marcelo Tosatti , Gerd Hoffmann , Stefan Hajnoczi , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jan Kiszka , Riku Voipio , Christoph Hellwig , Blue Swirl , Alex Williamson , Isaku Yamahata , Paul Brook , Paolo Bonzini , Avi Kivity , Aurelien Jarno , Richard Henderson 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 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; -- 1.7.5.53.gc233e