diff options
| author | Alexander Graf <agraf@suse.de> | 2010-11-17 13:01:04 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-26 00:29:49 +0100 |
| commit | 6c33286ad3a432627d763ee93aa42200cbb68269 (patch) | |
| tree | dd924869e0558a1bea126c9b36b4fc4c40dd30ae | |
| parent | 9ed5726c043958359b0f1fa44ab3e4f25f9d9a47 (diff) | |
| download | focaccia-qemu-6c33286ad3a432627d763ee93aa42200cbb68269.tar.gz focaccia-qemu-6c33286ad3a432627d763ee93aa42200cbb68269.zip | |
s390: compile fixes
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 <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | hw/s390-virtio-bus.h | 2 | ||||
| -rw-r--r-- | hw/s390-virtio.c | 1 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 2 | ||||
| -rw-r--r-- | 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 41558c9c67..669b610a14 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 <http://www.gnu.org/licenses/>. */ +#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 e7aec14fae..f29b624e41 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 9bf6abb213..adf4a9e1e5 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 881d8c4acf..d33bfb1f31 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 { |