From patchwork Wed Nov 17 12:01:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 71556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6303CB7155 for ; Wed, 17 Nov 2010 23:02:31 +1100 (EST) Received: from localhost ([127.0.0.1]:35768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIgiZ-0003u3-SE for incoming@patchwork.ozlabs.org; Wed, 17 Nov 2010 07:02:27 -0500 Received: from [140.186.70.92] (port=40204 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIghH-0003sL-1P for qemu-devel@nongnu.org; Wed, 17 Nov 2010 07:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIghF-0007Ht-Ly for qemu-devel@nongnu.org; Wed, 17 Nov 2010 07:01:06 -0500 Received: from cantor2.suse.de ([195.135.220.15]:32853 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIghF-0007Hj-A3 for qemu-devel@nongnu.org; Wed, 17 Nov 2010 07:01:05 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 457D84844E; Wed, 17 Nov 2010 13:01:04 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Wed, 17 Nov 2010 13:01:04 +0100 Message-Id: <1289995264-4948-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH] s390: compile fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The s390 target doesn't compile out of the box anymore. This patch fixes all the obvious glitches that got introduced in the last few weeks. Signed-off-by: Alexander Graf --- hw/s390-virtio-bus.h | 2 ++ hw/s390-virtio.c | 1 + target-s390x/kvm.c | 2 +- target-s390x/translate.c | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 41558c9..669b610 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -17,6 +17,8 @@ * License along with this library; if not, see . */ +#include "virtio-net.h" + #define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */ #define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */ #define VIRTIO_DEV_OFFS_FEATURE_LEN 2 /* 8 bits */ diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index e7aec14..f29b624 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -19,6 +19,7 @@ #include "hw.h" #include "block.h" +#include "blockdev.h" #include "sysemu.h" #include "net.h" #include "boards.h" diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 9bf6abb..adf4a9e 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -119,7 +119,7 @@ int kvm_arch_put_registers(CPUState *env, int level) int kvm_arch_get_registers(CPUState *env) { - uint32_t ret; + int ret; struct kvm_regs regs; int i; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 881d8c4..d33bfb1 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -36,7 +36,7 @@ void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, } } for (i = 0; i < 16; i++) { - cpu_fprintf(f, "F%02d=%016lx", i, env->fregs[i]); + cpu_fprintf(f, "F%02d=%016lx", i, (long)env->fregs[i].i); if ((i % 4) == 3) { cpu_fprintf(f, "\n"); } else {