Commit 60915dc4 authored by Yuanhan Liu's avatar Yuanhan Liu Committed by Michael S. Tsirkin
Browse files

vhost: rename RESET_DEVICE backto RESET_OWNER 

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2b8819c6

docs/specs/vhost-user.txt

+2 −2
Original line number Diff line number Diff line
@@ -256,10 +256,10 @@ Message types 
      as an owner of the session. This can be used on the Slave as a

      "session start" flag.



 * VHOST_USER_RESET_DEVICE

 * VHOST_USER_RESET_OWNER



      Id: 4

      Equivalent ioctl: VHOST_RESET_DEVICE

      Equivalent ioctl: VHOST_RESET_OWNER

      Master payload: N/A



      Issued when a new connection is about to be closed. The Master will no

hw/virtio/vhost-backend.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int vhost_kernel_set_owner(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)

hw/virtio/vhost-user.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ typedef enum VhostUserRequest { 
    VHOST_USER_GET_FEATURES = 1,

    VHOST_USER_SET_FEATURES = 2,

    VHOST_USER_SET_OWNER = 3,

    VHOST_USER_RESET_DEVICE = 4,

    VHOST_USER_RESET_OWNER = 4,

    VHOST_USER_SET_MEM_TABLE = 5,

    VHOST_USER_SET_LOG_BASE = 6,

    VHOST_USER_SET_LOG_FD = 7,
@@ -163,7 +163,7 @@ static bool vhost_user_one_time_request(VhostUserRequest request) 
{

    switch (request) {

    case VHOST_USER_SET_OWNER:

    case VHOST_USER_RESET_DEVICE:

    case VHOST_USER_RESET_OWNER:

    case VHOST_USER_SET_MEM_TABLE:

    case VHOST_USER_GET_QUEUE_NUM:

        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)

{

    VhostUserMsg msg = {

        .request = VHOST_USER_RESET_DEVICE,

        .request = VHOST_USER_RESET_OWNER,

        .flags = VHOST_USER_VERSION,

    };

linux-headers/linux/vhost.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct vhost_memory { 
#define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)

/* Give up ownership, and reset the device to default values.

 * 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 */

#define VHOST_SET_MEM_TABLE	_IOW(VHOST_VIRTIO, 0x03, struct vhost_memory)

tests/vhost-user-bridge.c

+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ typedef enum VhostUserRequest { 
    VHOST_USER_GET_FEATURES = 1,

    VHOST_USER_SET_FEATURES = 2,

    VHOST_USER_SET_OWNER = 3,

    VHOST_USER_RESET_DEVICE = 4,

    VHOST_USER_RESET_OWNER = 4,

    VHOST_USER_SET_MEM_TABLE = 5,

    VHOST_USER_SET_LOG_BASE = 6,

    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_SET_FEATURES]           =  "VHOST_USER_SET_FEATURES",

    [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_LOG_BASE]           =  "VHOST_USER_SET_LOG_BASE",

    [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);

    case VHOST_USER_SET_OWNER:

        return vubr_set_owner_exec(dev, vmsg);

    case VHOST_USER_RESET_DEVICE:

    case VHOST_USER_RESET_OWNER:

        return vubr_reset_device_exec(dev, vmsg);

    case VHOST_USER_SET_MEM_TABLE:

        return vubr_set_mem_table_exec(dev, vmsg);