[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/48] vhost-scsi: include linux/vhost.h
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/48] vhost-scsi: include linux/vhost.h |
Date: |
Tue, 22 Sep 2015 17:05:31 +0200 |
From: Marc-André Lureau <address@hidden>
Replace ad-hoc declarations with the linux header.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/vhost-scsi.c | 1 +
include/hw/virtio/vhost-scsi.h | 25 -------------------------
2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index bac9ddb..fb7983d 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -26,6 +26,7 @@
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
#include "hw/fw-path-provider.h"
+#include "linux/vhost.h"
/* Features supported by host kernel. */
static const int kernel_feature_bits[] = {
diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h
index 701bfee..9fd63df 100644
--- a/include/hw/virtio/vhost-scsi.h
+++ b/include/hw/virtio/vhost-scsi.h
@@ -19,37 +19,12 @@
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost.h"
-/*
- * Used by QEMU userspace to ensure a consistent vhost-scsi ABI.
- *
- * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate +
- * RFC-v2 vhost-scsi userspace. Add GET_ABI_VERSION ioctl usage
- * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct
vhost_scsi_target.
- * All the targets under vhost_wwpn can be seen and used by guest.
- */
-
-#define VHOST_SCSI_ABI_VERSION 1
-
-/* TODO #include <linux/vhost.h> properly */
-/* For VHOST_SCSI_SET_ENDPOINT/VHOST_SCSI_CLEAR_ENDPOINT ioctl */
-struct vhost_scsi_target {
- int abi_version;
- char vhost_wwpn[224];
- unsigned short vhost_tpgt;
- unsigned short reserved;
-};
-
enum vhost_scsi_vq_list {
VHOST_SCSI_VQ_CONTROL = 0,
VHOST_SCSI_VQ_EVENT = 1,
VHOST_SCSI_VQ_NUM_FIXED = 2,
};
-#define VHOST_VIRTIO 0xAF
-#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct
vhost_scsi_target)
-#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct
vhost_scsi_target)
-#define VHOST_SCSI_GET_ABI_VERSION _IOW(VHOST_VIRTIO, 0x42, int)
-
#define TYPE_VHOST_SCSI "vhost-scsi"
#define VHOST_SCSI(obj) \
OBJECT_CHECK(VHostSCSI, (obj), TYPE_VHOST_SCSI)
--
2.5.0
- [Qemu-devel] [PULL 00/48] Misc patches for 2015-09-22, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 01/48] nbd: convert to use the QAPI SocketAddress object, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 02/48] qemu-nbd: convert to use the QAPI SocketAddress object, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 04/48] tests: add some qemu_strtosz() tests, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 03/48] utils: rename strtosz to use qemu prefix, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 05/48] checkpatch: do not recommend qemu_strtok over strtok, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 07/48] Makefile: fix build when VPATH is outside GIT tree, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 06/48] scsi-generic: let guests recognize readonly=on on passthrough devices, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 08/48] vhost-scsi: include linux/vhost.h,
Paolo Bonzini <=
- [Qemu-devel] [PULL 10/48] MAINTAINERS: there is no PPC64 TCG backend anymore, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 09/48] get_maintainer.pl: \C is deprecated, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 11/48] MAINTAINERS: Add disassemblers to the various backends, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 12/48] MAINTAINERS: Add more s390 files, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 15/48] MAINTAINERS: add more devices to the PCI section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 16/48] MAINTAINERS: add maintainer for character device front-ends, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 13/48] MAINTAINERS: add IPack section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 17/48] ioapic: coalesce level interrupts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 14/48] MAINTAINERS: add more devices to the PC section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 18/48] ioapic: fix contents of arbitration register, Paolo Bonzini, 2015/09/22