Deal with the fallout from the deletion of the old s390 virtio header
in Linux master. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJaF+zhAAoJEN7Pa5PG8C+vNEQQAIxXNq34DXYtuaJneEtUzybI HF3c/dltk3WzIZFfzeFMMG3cCuZ4bS46Y3OtpzB/7CyI3PtDae5a2Sc/6CkUPNVM 3C4qcfIvWcHnmMfqAY+Eivc9etuVOEil8A/JAywLMtAGcMX5lesOy/jgsck3p3Gn JZkNOdnKGJBeJHnHh43pSaI3YeDevQCPYT0cSe3t/nDfuKXFns1/ID97ZY1n2cY3 Mmopj0HsyEuE0oxUTOSKWFpb31AtlvnBkSWxJW0ch0RYlh5ZhCLBZ4m+QN8xVVvi 0lRAZxMaBwtWm9YtlWZwWi4ikxCZNZMCgMXLTIGJk4K2g0zrV4c77iYOiV4oTHOu Y0ANkc2tftvF2SxYgeAA749RqtgZqUL8ydeedqrikO6MIKm2Awl2Jqd8RSje8tcR 4SpgeFrOPPap4UYLkanoEPacBuLwpEei2TznJJIxJd1B8TkCIm3LCJqKroNANTtU 2TAVavSPfxu3XWX+pgCU+ro3vB8/qCPZ+hQ02fDwDVMqTeDfMN0vxj4Ogt9JX0Uo J3NCsNDDSHkDMuqeFOoFzs+m8OOiIboTL7W1AIAqDsxvx/gDaZ/vuGBbyh7vpcO5 eLtJgX/pt2H0srx+0mZ0UxDALdn/Yo6ebhfjEZeFJ/6cgX6GB5ZHvvWQnaDVDKHB lpUv6A+qoOQ/TIOsIfBZ =3Zen -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
38e83b6bed
hw/s390x
include/standard-headers/asm-s390
scripts
@ -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);
|
||||
|
@ -1,64 +0,0 @@
|
||||
/*
|
||||
* definition for virtio for kvm on s390
|
||||
*
|
||||
* Copyright IBM Corp. 2008
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License (version 2 only)
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
|
||||
*/
|
||||
|
||||
#ifndef __KVM_S390_VIRTIO_H
|
||||
#define __KVM_S390_VIRTIO_H
|
||||
|
||||
#include "standard-headers/linux/types.h"
|
||||
|
||||
struct kvm_device_desc {
|
||||
/* The device type: console, network, disk etc. Type 0 terminates. */
|
||||
uint8_t type;
|
||||
/* The number of virtqueues (first in config array) */
|
||||
uint8_t num_vq;
|
||||
/*
|
||||
* The number of bytes of feature bits. Multiply by 2: one for host
|
||||
* features and one for guest acknowledgements.
|
||||
*/
|
||||
uint8_t feature_len;
|
||||
/* The number of bytes of the config array after virtqueues. */
|
||||
uint8_t config_len;
|
||||
/* A status byte, written by the Guest. */
|
||||
uint8_t status;
|
||||
uint8_t config[0];
|
||||
};
|
||||
|
||||
/*
|
||||
* This is how we expect the device configuration field for a virtqueue
|
||||
* to be laid out in config space.
|
||||
*/
|
||||
struct kvm_vqconfig {
|
||||
/* The token returned with an interrupt. Set by the guest */
|
||||
uint64_t token;
|
||||
/* The address of the virtio ring */
|
||||
uint64_t address;
|
||||
/* The number of entries in the virtio_ring */
|
||||
uint16_t num;
|
||||
|
||||
};
|
||||
|
||||
#define KVM_S390_VIRTIO_NOTIFY 0
|
||||
#define KVM_S390_VIRTIO_RESET 1
|
||||
#define KVM_S390_VIRTIO_SET_STATUS 2
|
||||
|
||||
/* The alignment to use between consumer and producer parts of vring.
|
||||
* This is pagesize for historical reasons. */
|
||||
#define KVM_S390_VIRTIO_RING_ALIGN 4096
|
||||
|
||||
|
||||
/* These values are supposed to be in ext_params on an interrupt */
|
||||
#define VIRTIO_PARAM_MASK 0xff
|
||||
#define VIRTIO_PARAM_VRING_INTERRUPT 0x0
|
||||
#define VIRTIO_PARAM_CONFIG_CHANGED 0x1
|
||||
#define VIRTIO_PARAM_DEV_ADD 0x2
|
||||
|
||||
#endif
|
@ -95,7 +95,6 @@ for arch in $ARCHLIST; do
|
||||
rm -rf "$output/include/standard-headers/asm-$arch"
|
||||
mkdir -p "$output/include/standard-headers/asm-$arch"
|
||||
if [ $arch = s390 ]; then
|
||||
cp_portable "$tmpdir/include/asm/kvm_virtio.h" "$output/include/standard-headers/asm-s390/"
|
||||
cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
|
||||
fi
|
||||
if [ $arch = arm ]; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user