From patchwork Tue Jun 14 17:36:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 100448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8323EB6F8B for ; Wed, 15 Jun 2011 09:36:46 +1000 (EST) Received: from localhost ([::1]:39676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWdA2-0001Zk-B8 for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2011 19:36:42 -0400 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5EHZmgd006872 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 14 Jun 2011 13:35:48 -0400 Received: from redhat.com (dhcp-1-35.tlv.redhat.com [10.35.1.35]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p5EHZgDH020947; Tue, 14 Jun 2011 13:35:42 -0400 Date: Tue, 14 Jun 2011 20:36:00 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 X-Mailman-Approved-At: Tue, 14 Jun 2011 19:32:53 -0400 Cc: Kevin Wolf , Alexander Graf , Anthony Liguori , Marcelo Tosatti , Gerd Hoffmann , Stefan Hajnoczi , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jan Kiszka , Riku Voipio , qemu-devel@nongnu.org, Christoph Hellwig , Blue Swirl , Alex Williamson , Isaku Yamahata , Paul Brook , Paolo Bonzini , Avi Kivity , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH 06/10] kvm: remove unused variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;