Fixes all over the place. virtio dataplane migration support. Old q35 machine types removed. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWzuKeAAoJECgfDbjSjVRpGzIH/1Tz6CoEq1rowiyVJ9B80oQU gDI2YWnJDSwJllmAF0rmoPRBQR8op3ZETZiCAcADHoZ7kdBNWGbyQeaDrrEPH7Q/ rCDVt8Q3g80vs89aWKG0nQ16J2MW5TbkuiQw7pjQSdc9AbUdWpUqSiWnpZ+sPAql 6DuVpjQ4/rN2alucXoa1Sir8KDDV7kBuY8U6/KoY890qzh842dv2523qvuCza9yR KX8Imj3oQAFjFSv5t1aOD3yYvWFd73EsReHPLGb1JtsVr/6wjs0sFUyA3JicBgnT +kWoSObWikfDY69HnqTkJpkun6woMM3zW5h2SkUBf9QP3yqLfGIp9uSriNN84Ak= =KXyh -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging vhost, virtio, pci, pc Fixes all over the place. virtio dataplane migration support. Old q35 machine types removed. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 25 Feb 2016 11:16:46 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: (21 commits) q35: No need to check gigabyte_align q35: Remove unused q35-acpi-dsdt.aml file ich9: Remove enable_tco arguments from init functions machine: Remove no_tco field q35: Remove old machine versions tests/vhost-user-bridge: fix build on 32 bit systems vring: remove virtio-scsi: do not use vring in dataplane virtio-blk: do not use vring in dataplane virtio-blk: fix "disabled data plane" mode virtio: export vring_notify as virtio_should_notify virtio: add AioContext-specific function for host notifiers vring: make vring_enable_notification return void block-migration: acquire AioContext as necessary pci core: function pci_bus_init() cleanup pci core: function pci_host_bus_register() cleanup balloon: Use only 'pc-dimm' type dimm for ballooning virtio-balloon: rewrite get_current_ram_size() move get_current_ram_size to virtio-balloon.c vhost-user: don't merge regions with different fds ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
111 lines
4.9 KiB
C
111 lines
4.9 KiB
C
/*
|
|
* vhost-backend
|
|
*
|
|
* Copyright (c) 2013 Virtual Open Systems Sarl.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef VHOST_BACKEND_H_
|
|
#define VHOST_BACKEND_H_
|
|
|
|
|
|
typedef enum VhostBackendType {
|
|
VHOST_BACKEND_TYPE_NONE = 0,
|
|
VHOST_BACKEND_TYPE_KERNEL = 1,
|
|
VHOST_BACKEND_TYPE_USER = 2,
|
|
VHOST_BACKEND_TYPE_MAX = 3,
|
|
} VhostBackendType;
|
|
|
|
struct vhost_dev;
|
|
struct vhost_log;
|
|
struct vhost_memory;
|
|
struct vhost_vring_file;
|
|
struct vhost_vring_state;
|
|
struct vhost_vring_addr;
|
|
struct vhost_scsi_target;
|
|
|
|
typedef int (*vhost_backend_init)(struct vhost_dev *dev, void *opaque);
|
|
typedef int (*vhost_backend_cleanup)(struct vhost_dev *dev);
|
|
typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev);
|
|
|
|
typedef int (*vhost_net_set_backend_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_file *file);
|
|
typedef int (*vhost_scsi_set_endpoint_op)(struct vhost_dev *dev,
|
|
struct vhost_scsi_target *target);
|
|
typedef int (*vhost_scsi_clear_endpoint_op)(struct vhost_dev *dev,
|
|
struct vhost_scsi_target *target);
|
|
typedef int (*vhost_scsi_get_abi_version_op)(struct vhost_dev *dev,
|
|
int *version);
|
|
typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t base,
|
|
struct vhost_log *log);
|
|
typedef int (*vhost_set_mem_table_op)(struct vhost_dev *dev,
|
|
struct vhost_memory *mem);
|
|
typedef int (*vhost_set_vring_addr_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_addr *addr);
|
|
typedef int (*vhost_set_vring_endian_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_state *ring);
|
|
typedef int (*vhost_set_vring_num_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_state *ring);
|
|
typedef int (*vhost_set_vring_base_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_state *ring);
|
|
typedef int (*vhost_get_vring_base_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_state *ring);
|
|
typedef int (*vhost_set_vring_kick_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_file *file);
|
|
typedef int (*vhost_set_vring_call_op)(struct vhost_dev *dev,
|
|
struct vhost_vring_file *file);
|
|
typedef int (*vhost_set_features_op)(struct vhost_dev *dev,
|
|
uint64_t features);
|
|
typedef int (*vhost_get_features_op)(struct vhost_dev *dev,
|
|
uint64_t *features);
|
|
typedef int (*vhost_set_owner_op)(struct vhost_dev *dev);
|
|
typedef int (*vhost_reset_device_op)(struct vhost_dev *dev);
|
|
typedef int (*vhost_get_vq_index_op)(struct vhost_dev *dev, int idx);
|
|
typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev,
|
|
int enable);
|
|
typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev);
|
|
typedef int (*vhost_migration_done_op)(struct vhost_dev *dev,
|
|
char *mac_addr);
|
|
typedef bool (*vhost_backend_can_merge_op)(struct vhost_dev *dev,
|
|
uint64_t start1, uint64_t size1,
|
|
uint64_t start2, uint64_t size2);
|
|
|
|
typedef struct VhostOps {
|
|
VhostBackendType backend_type;
|
|
vhost_backend_init vhost_backend_init;
|
|
vhost_backend_cleanup vhost_backend_cleanup;
|
|
vhost_backend_memslots_limit vhost_backend_memslots_limit;
|
|
vhost_net_set_backend_op vhost_net_set_backend;
|
|
vhost_scsi_set_endpoint_op vhost_scsi_set_endpoint;
|
|
vhost_scsi_clear_endpoint_op vhost_scsi_clear_endpoint;
|
|
vhost_scsi_get_abi_version_op vhost_scsi_get_abi_version;
|
|
vhost_set_log_base_op vhost_set_log_base;
|
|
vhost_set_mem_table_op vhost_set_mem_table;
|
|
vhost_set_vring_addr_op vhost_set_vring_addr;
|
|
vhost_set_vring_endian_op vhost_set_vring_endian;
|
|
vhost_set_vring_num_op vhost_set_vring_num;
|
|
vhost_set_vring_base_op vhost_set_vring_base;
|
|
vhost_get_vring_base_op vhost_get_vring_base;
|
|
vhost_set_vring_kick_op vhost_set_vring_kick;
|
|
vhost_set_vring_call_op vhost_set_vring_call;
|
|
vhost_set_features_op vhost_set_features;
|
|
vhost_get_features_op vhost_get_features;
|
|
vhost_set_owner_op vhost_set_owner;
|
|
vhost_reset_device_op vhost_reset_device;
|
|
vhost_get_vq_index_op vhost_get_vq_index;
|
|
vhost_set_vring_enable_op vhost_set_vring_enable;
|
|
vhost_requires_shm_log_op vhost_requires_shm_log;
|
|
vhost_migration_done_op vhost_migration_done;
|
|
vhost_backend_can_merge_op vhost_backend_can_merge;
|
|
} VhostOps;
|
|
|
|
extern const VhostOps user_ops;
|
|
|
|
int vhost_set_backend_type(struct vhost_dev *dev,
|
|
VhostBackendType backend_type);
|
|
|
|
#endif /* VHOST_BACKEND_H_ */
|