[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_R
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE |
Date: |
Fri, 2 Oct 2015 18:18:51 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 |
On 24/09/2015 15:20, Michael S. Tsirkin wrote:
> From: Yuanhan Liu <address@hidden>
>
> Quote from Michael:
>
> We really should rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE.
Where is the corresponding Linux patch for this?
I would like to fetch the updated headers for KVM, and this is breaking
it. In fact, a patch that just renames the #define (without providing
the old name for backwards compatibility) would be NACKed in upstream Linux.
Paolo
> Suggested-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Yuanhan Liu <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Yuanhan Liu <address@hidden>
> Reviewed-by: Marcel Apfelbaum <address@hidden>
> ---
> linux-headers/linux/vhost.h | 2 +-
> hw/net/vhost_net.c | 2 +-
> hw/virtio/vhost-user.c | 6 +++---
> tests/vhost-user-test.c | 2 +-
> docs/specs/vhost-user.txt | 4 ++--
> 5 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h
> index ead86db..14a0160 100644
> --- a/linux-headers/linux/vhost.h
> +++ b/linux-headers/linux/vhost.h
> @@ -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_OWNER _IO(VHOST_VIRTIO, 0x02)
> +#define VHOST_RESET_DEVICE _IO(VHOST_VIRTIO, 0x02)
>
> /* Set up/modify memory layout */
> #define VHOST_SET_MEM_TABLE _IOW(VHOST_VIRTIO, 0x03, struct vhost_memory)
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index 9d32d76..b7d29b7 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -287,7 +287,7 @@ static void vhost_net_stop_one(struct vhost_net *net,
> } else if (net->nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER) {
> for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
> const VhostOps *vhost_ops = net->dev.vhost_ops;
> - int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_OWNER,
> + int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_DEVICE,
> NULL);
> assert(r >= 0);
> }
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index 7fe35c6..9cb2f52 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -32,7 +32,7 @@ typedef enum VhostUserRequest {
> VHOST_USER_GET_FEATURES = 1,
> VHOST_USER_SET_FEATURES = 2,
> VHOST_USER_SET_OWNER = 3,
> - VHOST_USER_RESET_OWNER = 4,
> + VHOST_USER_RESET_DEVICE = 4,
> VHOST_USER_SET_MEM_TABLE = 5,
> VHOST_USER_SET_LOG_BASE = 6,
> VHOST_USER_SET_LOG_FD = 7,
> @@ -98,7 +98,7 @@ static unsigned long int
> ioctl_to_vhost_user_request[VHOST_USER_MAX] = {
> VHOST_GET_FEATURES, /* VHOST_USER_GET_FEATURES */
> VHOST_SET_FEATURES, /* VHOST_USER_SET_FEATURES */
> VHOST_SET_OWNER, /* VHOST_USER_SET_OWNER */
> - VHOST_RESET_OWNER, /* VHOST_USER_RESET_OWNER */
> + VHOST_RESET_DEVICE, /* VHOST_USER_RESET_DEVICE */
> VHOST_SET_MEM_TABLE, /* VHOST_USER_SET_MEM_TABLE */
> VHOST_SET_LOG_BASE, /* VHOST_USER_SET_LOG_BASE */
> VHOST_SET_LOG_FD, /* VHOST_USER_SET_LOG_FD */
> @@ -222,7 +222,7 @@ static int vhost_user_call(struct vhost_dev *dev,
> unsigned long int request,
> break;
>
> case VHOST_USER_SET_OWNER:
> - case VHOST_USER_RESET_OWNER:
> + case VHOST_USER_RESET_DEVICE:
> break;
>
> case VHOST_USER_SET_MEM_TABLE:
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index 75fedf0..e301db7 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -58,7 +58,7 @@ typedef enum VhostUserRequest {
> VHOST_USER_GET_FEATURES = 1,
> VHOST_USER_SET_FEATURES = 2,
> VHOST_USER_SET_OWNER = 3,
> - VHOST_USER_RESET_OWNER = 4,
> + VHOST_USER_RESET_DEVICE = 4,
> VHOST_USER_SET_MEM_TABLE = 5,
> VHOST_USER_SET_LOG_BASE = 6,
> VHOST_USER_SET_LOG_FD = 7,
> diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt
> index 70da3b1..ccbbcbb 100644
> --- a/docs/specs/vhost-user.txt
> +++ b/docs/specs/vhost-user.txt
> @@ -194,10 +194,10 @@ Message types
> as an owner of the session. This can be used on the Slave as a
> "session start" flag.
>
> - * VHOST_USER_RESET_OWNER
> + * VHOST_USER_RESET_DEVICE
>
> Id: 4
> - Equivalent ioctl: VHOST_RESET_OWNER
> + Equivalent ioctl: VHOST_RESET_DEVICE
> Master payload: N/A
>
> Issued when a new connection is about to be closed. The Master will no
>
- Re: [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE,
Paolo Bonzini <=