diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-26 12:18:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-26 12:18:00 +0000 |
| commit | 3ef4ebcc5c0360629bb05f49d9b961774247d6ca (patch) | |
| tree | 98c177d2d960fb0c8fd41d3cb9b0503f856d15a1 /target-s390x/kvm.c | |
| parent | 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80 (diff) | |
| parent | dc622deb2d49aac6afa485f9025be8fed440ef3d (diff) | |
| download | qemu-3ef4ebcc5c0360629bb05f49d9b961774247d6ca.tar.gz | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
The final 2.2 patches from me.
# gpg: Signature made Wed 26 Nov 2014 11:12:25 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
s390x/kvm: Fix compile error
fw_cfg: fix boot order bug when dynamically modified via QOM
-machine vmport=auto: Fix handling of VMWare ioport emulation for xen
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x/kvm.c')
| -rw-r--r-- | target-s390x/kvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 50709ba6b5..2c638ab7b3 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -106,7 +106,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static int cap_sync_regs; static int cap_async_pf; -static void *legacy_s390_alloc(size_t size); +static void *legacy_s390_alloc(size_t size, uint64_t *align); static int kvm_s390_check_clear_cmma(KVMState *s) { @@ -404,7 +404,7 @@ int kvm_arch_get_registers(CPUState *cs) * to grow. We also have to use MAP parameters that avoid * read-only mapping of guest pages. */ -static void *legacy_s390_alloc(size_t size, , uint64_t *align) +static void *legacy_s390_alloc(size_t size, uint64_t *align) { void *mem; |