diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-24 10:26:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-24 10:26:20 +0000 |
| commit | 38e83b6bed80ebabcbab22f9d5b5215071e32b52 (patch) | |
| tree | be99637e864b55323a80862352bd82c6dc65daf3 /hw | |
| parent | c65d5e4e1d6841524c49a07bcdd56094f49982a4 (diff) | |
| parent | c1c4c2192c1c063a6c53c600bb97f20555b2a528 (diff) | |
| download | qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.zip qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.tar.gz qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171124' into staging
Deal with the fallout from the deletion of the old s390 virtio header
in Linux master.
# gpg: Signature made Fri 24 Nov 2017 09:56:49 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20171124:
s390/kvm_virtio/linux-headers: remove traces of old virtio transport
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-virtio-hcall.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-hcall.h b/hw/s390x/s390-virtio-hcall.h index cbc270e..9800c4b 100644 --- a/hw/s390x/s390-virtio-hcall.h +++ b/hw/s390x/s390-virtio-hcall.h @@ -1,7 +1,7 @@ /* * Support for virtio hypercalls on s390x * - * Copyright 2012 IBM Corp. + * Copyright IBM Corp. 2012, 2017 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com> * * This work is licensed under the terms of the GNU GPL, version 2 or (at @@ -12,9 +12,11 @@ #ifndef HW_S390_VIRTIO_HCALL_H #define HW_S390_VIRTIO_HCALL_H -#include "standard-headers/asm-s390/kvm_virtio.h" #include "standard-headers/asm-s390/virtio-ccw.h" +/* The only thing that we need from the old kvm_virtio.h file */ +#define KVM_S390_VIRTIO_NOTIFY 0 + typedef int (*s390_virtio_fn)(const uint64_t *args); void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); int s390_virtio_hypercall(CPUS390XState *env); |