david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: rename RESET_DEVICE backto RESET_OWNER

Browse Source 
This patch basically reverts commit d1f8b30e.

It turned out that it breaks stuff, so revert it:
    http://lists.nongnu.org/archive/html/qemu-devel/2015-10/msg00949.html

CC: "Michael S. Tsirkin" <mst@redhat.com>
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Yuanhan Liu 2015-11-11 21:24:37 +08:00 committed by Michael S. Tsirkin
parent 2b8819c6ee
commit 60915dc469
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/specs/vhost-user.txt
View File

@ -256,10 +256,10 @@ Message types
as an owner of the session. This can be used on the Slave as a as an owner of the session. This can be used on the Slave as a
"session start" flag. "session start" flag.
* VHOST_USER_RESET_DEVICE * VHOST_USER_RESET_OWNER
Id: 4 Id: 4
Equivalent ioctl: VHOST_RESET_DEVICE Equivalent ioctl: VHOST_RESET_OWNER
Master payload: N/A Master payload: N/A
Issued when a new connection is about to be closed. The Master will no Issued when a new connection is about to be closed. The Master will no

2
hw/virtio/vhost-backend.c
View File

@ -156,7 +156,7 @@ static int vhost_kernel_set_owner(struct vhost_dev *dev)
static int vhost_kernel_reset_device(struct vhost_dev *dev) static int vhost_kernel_reset_device(struct vhost_dev *dev)
{ {
return vhost_kernel_call(dev, VHOST_RESET_DEVICE, NULL); return vhost_kernel_call(dev, VHOST_RESET_OWNER, NULL);
} }
static int vhost_kernel_get_vq_index(struct vhost_dev *dev, int idx) static int vhost_kernel_get_vq_index(struct vhost_dev *dev, int idx)

6
hw/virtio/vhost-user.c
View File

@ -43,7 +43,7 @@ typedef enum VhostUserRequest {
VHOST_USER_GET_FEATURES = 1, VHOST_USER_GET_FEATURES = 1,
VHOST_USER_SET_FEATURES = 2, VHOST_USER_SET_FEATURES = 2,
VHOST_USER_SET_OWNER = 3, VHOST_USER_SET_OWNER = 3,
VHOST_USER_RESET_DEVICE = 4, VHOST_USER_RESET_OWNER = 4,
VHOST_USER_SET_MEM_TABLE = 5, VHOST_USER_SET_MEM_TABLE = 5,
VHOST_USER_SET_LOG_BASE = 6, VHOST_USER_SET_LOG_BASE = 6,
VHOST_USER_SET_LOG_FD = 7, VHOST_USER_SET_LOG_FD = 7,
@ -163,7 +163,7 @@ static bool vhost_user_one_time_request(VhostUserRequest request)
{ {
switch (request) { switch (request) {
case VHOST_USER_SET_OWNER: case VHOST_USER_SET_OWNER:
case VHOST_USER_RESET_DEVICE: case VHOST_USER_RESET_OWNER:
case VHOST_USER_SET_MEM_TABLE: case VHOST_USER_SET_MEM_TABLE:
case VHOST_USER_GET_QUEUE_NUM: case VHOST_USER_GET_QUEUE_NUM:
return true; return true;
@ -493,7 +493,7 @@ static int vhost_user_set_owner(struct vhost_dev *dev)
static int vhost_user_reset_device(struct vhost_dev *dev) static int vhost_user_reset_device(struct vhost_dev *dev)
{ {
VhostUserMsg msg = { VhostUserMsg msg = {
.request = VHOST_USER_RESET_DEVICE, .request = VHOST_USER_RESET_OWNER,
.flags = VHOST_USER_VERSION, .flags = VHOST_USER_VERSION,
}; };

2
linux-headers/linux/vhost.h
View File

@ -78,7 +78,7 @@ struct vhost_memory {
#define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01) #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
/* Give up ownership, and reset the device to default values. /* Give up ownership, and reset the device to default values.
* Allows subsequent call to VHOST_OWNER_SET to succeed. */ * Allows subsequent call to VHOST_OWNER_SET to succeed. */
#define VHOST_RESET_DEVICE _IO(VHOST_VIRTIO, 0x02) #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
/* Set up/modify memory layout */ /* Set up/modify memory layout */
#define VHOST_SET_MEM_TABLE _IOW(VHOST_VIRTIO, 0x03, struct vhost_memory) #define VHOST_SET_MEM_TABLE _IOW(VHOST_VIRTIO, 0x03, struct vhost_memory)

6
tests/vhost-user-bridge.c
View File

@ -188,7 +188,7 @@ typedef enum VhostUserRequest {
VHOST_USER_GET_FEATURES = 1, VHOST_USER_GET_FEATURES = 1,
VHOST_USER_SET_FEATURES = 2, VHOST_USER_SET_FEATURES = 2,
VHOST_USER_SET_OWNER = 3, VHOST_USER_SET_OWNER = 3,
VHOST_USER_RESET_DEVICE = 4, VHOST_USER_RESET_OWNER = 4,
VHOST_USER_SET_MEM_TABLE = 5, VHOST_USER_SET_MEM_TABLE = 5,
VHOST_USER_SET_LOG_BASE = 6, VHOST_USER_SET_LOG_BASE = 6,
VHOST_USER_SET_LOG_FD = 7, VHOST_USER_SET_LOG_FD = 7,
@ -274,7 +274,7 @@ static const char *vubr_request_str[] = {
[VHOST_USER_GET_FEATURES] = "VHOST_USER_GET_FEATURES", [VHOST_USER_GET_FEATURES] = "VHOST_USER_GET_FEATURES",
[VHOST_USER_SET_FEATURES] = "VHOST_USER_SET_FEATURES", [VHOST_USER_SET_FEATURES] = "VHOST_USER_SET_FEATURES",
[VHOST_USER_SET_OWNER] = "VHOST_USER_SET_OWNER", [VHOST_USER_SET_OWNER] = "VHOST_USER_SET_OWNER",
[VHOST_USER_RESET_DEVICE] = "VHOST_USER_RESET_DEVICE", [VHOST_USER_RESET_OWNER] = "VHOST_USER_RESET_OWNER",
[VHOST_USER_SET_MEM_TABLE] = "VHOST_USER_SET_MEM_TABLE", [VHOST_USER_SET_MEM_TABLE] = "VHOST_USER_SET_MEM_TABLE",
[VHOST_USER_SET_LOG_BASE] = "VHOST_USER_SET_LOG_BASE", [VHOST_USER_SET_LOG_BASE] = "VHOST_USER_SET_LOG_BASE",
[VHOST_USER_SET_LOG_FD] = "VHOST_USER_SET_LOG_FD", [VHOST_USER_SET_LOG_FD] = "VHOST_USER_SET_LOG_FD",
@ -921,7 +921,7 @@ vubr_execute_request(VubrDev *dev, VhostUserMsg *vmsg)
return vubr_set_features_exec(dev, vmsg); return vubr_set_features_exec(dev, vmsg);
case VHOST_USER_SET_OWNER: case VHOST_USER_SET_OWNER:
return vubr_set_owner_exec(dev, vmsg); return vubr_set_owner_exec(dev, vmsg);
case VHOST_USER_RESET_DEVICE: case VHOST_USER_RESET_OWNER:
return vubr_reset_device_exec(dev, vmsg); return vubr_reset_device_exec(dev, vmsg);
case VHOST_USER_SET_MEM_TABLE: case VHOST_USER_SET_MEM_TABLE:
return vubr_set_mem_table_exec(dev, vmsg); return vubr_set_mem_table_exec(dev, vmsg);

4
tests/vhost-user-test.c
View File

@ -57,7 +57,7 @@ typedef enum VhostUserRequest {
VHOST_USER_GET_FEATURES = 1, VHOST_USER_GET_FEATURES = 1,
VHOST_USER_SET_FEATURES = 2, VHOST_USER_SET_FEATURES = 2,
VHOST_USER_SET_OWNER = 3, VHOST_USER_SET_OWNER = 3,
VHOST_USER_RESET_DEVICE = 4, VHOST_USER_RESET_OWNER = 4,
VHOST_USER_SET_MEM_TABLE = 5, VHOST_USER_SET_MEM_TABLE = 5,
VHOST_USER_SET_LOG_BASE = 6, VHOST_USER_SET_LOG_BASE = 6,
VHOST_USER_SET_LOG_FD = 7, VHOST_USER_SET_LOG_FD = 7,
@ -315,7 +315,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
g_cond_signal(&s->data_cond); g_cond_signal(&s->data_cond);
break; break;
case VHOST_USER_RESET_DEVICE: case VHOST_USER_RESET_OWNER:
s->fds_num = 0; s->fds_num = 0;
break; break;