linux-headers: update (7a52ce8a) · Commits · SUMMER2020 / students / proj-2021291

include/standard-headers/linux/virtio_balloon.h

+26 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE. */
		#include "standard-headers/linux/types.h"
		#include "standard-headers/linux/virtio_ids.h"
		#include "standard-headers/linux/virtio_config.h"

		@@ -51,9 +52,32 @@ struct virtio_balloon_config {
		#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */
		#define VIRTIO_BALLOON_S_NR 6

		/*
		* Memory statistics structure.
		* Driver fills an array of these structures and passes to device.
		*
		* NOTE: fields are laid out in a way that would make compiler add padding
		* between and after fields, so we have to use compiler-specific attributes to
		* pack it, to disable this padding. This also often causes compiler to
		* generate suboptimal code.
		*
		* We maintain this statistics structure format for backwards compatibility,
		* but don't follow this example.
		*
		* If implementing a similar structure, do something like the below instead:
		* struct virtio_balloon_stat {
		* __virtio16 tag;
		* uint8_t reserved[6];
		* __virtio64 val;
		* };
		*
		* In other words, add explicit reserved fields to align field and
		* structure boundaries at field size, avoiding compiler padding
		* without the packed attribute.
		*/
		struct virtio_balloon_stat {
		uint16_t tag;
		uint64_t val;
		__virtio16 tag;
		__virtio64 val;
		} QEMU_PACKED;

		#endif /* _LINUX_VIRTIO_BALLOON_H */

include/standard-headers/linux/virtio_ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,5 +39,6 @@
		#define VIRTIO_ID_9P 9 /* 9p virtio console */
		#define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
		#define VIRTIO_ID_CAIF 12 /* Virtio caif */
		#define VIRTIO_ID_INPUT 18 /* virtio input */

		#endif /* _LINUX_VIRTIO_IDS_H */

include/standard-headers/linux/virtio_input.h

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		#ifndef _LINUX_VIRTIO_INPUT_H
		#define _LINUX_VIRTIO_INPUT_H
		/* This header is BSD licensed so anyone can use the definitions to implement
		* compatible drivers/servers.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* 3. Neither the name of IBM nor the names of its contributors
		* may be used to endorse or promote products derived from this software
		* without specific prior written permission.
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IBM OR
		* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
		* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE. */

		#include "standard-headers/linux/types.h"

		enum virtio_input_config_select {
		VIRTIO_INPUT_CFG_UNSET = 0x00,
		VIRTIO_INPUT_CFG_ID_NAME = 0x01,
		VIRTIO_INPUT_CFG_ID_SERIAL = 0x02,
		VIRTIO_INPUT_CFG_ID_DEVIDS = 0x03,
		VIRTIO_INPUT_CFG_PROP_BITS = 0x10,
		VIRTIO_INPUT_CFG_EV_BITS = 0x11,
		VIRTIO_INPUT_CFG_ABS_INFO = 0x12,
		};

		struct virtio_input_absinfo {
		uint32_t min;
		uint32_t max;
		uint32_t fuzz;
		uint32_t flat;
		uint32_t res;
		};

		struct virtio_input_devids {
		uint16_t bustype;
		uint16_t vendor;
		uint16_t product;
		uint16_t version;
		};

		struct virtio_input_config {
		uint8_t select;
		uint8_t subsel;
		uint8_t size;
		uint8_t reserved[5];
		union {
		char string[128];
		uint8_t bitmap[128];
		struct virtio_input_absinfo abs;
		struct virtio_input_devids ids;
		} u;
		};

		struct virtio_input_event {
		uint16_t type;
		uint16_t code;
		uint32_t value;
		};

		#endif /* _LINUX_VIRTIO_INPUT_H */

linux-headers/asm-arm/kvm.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -195,9 +195,16 @@ struct kvm_arch_memory_slot {
		#define KVM_ARM_IRQ_CPU_IRQ 0
		#define KVM_ARM_IRQ_CPU_FIQ 1

		/* Highest supported SPI, from VGIC_NR_IRQS */
		/*
		* This used to hold the highest supported SPI, but it is now obsolete
		* and only here to provide source code level compatibility with older
		* userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.
		*/
		#define KVM_ARM_IRQ_GIC_MAX 127

		/* One single KVM irqchip, ie. the VGIC */
		#define KVM_NR_IRQCHIPS 1

		/* PSCI interface */
		#define KVM_PSCI_FN_BASE 0x95c1ba5e
		#define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n))

linux-headers/asm-arm64/kvm.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -188,9 +188,16 @@ struct kvm_arch_memory_slot {
		#define KVM_ARM_IRQ_CPU_IRQ 0
		#define KVM_ARM_IRQ_CPU_FIQ 1

		/* Highest supported SPI, from VGIC_NR_IRQS */
		/*
		* This used to hold the highest supported SPI, but it is now obsolete
		* and only here to provide source code level compatibility with older
		* userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.
		*/
		#define KVM_ARM_IRQ_GIC_MAX 127

		/* One single KVM irqchip, ie. the VGIC */
		#define KVM_NR_IRQCHIPS 1

		/* PSCI interface */
		#define KVM_PSCI_FN_BASE 0x95c1ba5e
		#define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n))