On Wed, Oct 21, 2015 at 01:40:59PM +0300, Michael S. Tsirkin wrote: > On Wed, Oct 21, 2015 at 05:07:14PM +0800, Yuanhan Liu wrote: > > This reverts commit d1f8b30ec8dde0318fd1b98d24a64926feae9625. > > > > 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" <m...@redhat.com> > > Reported-by: Paolo Bonzini <pbonz...@redhat.com> > > Signed-off-by: Yuanhan Liu <yuanhan....@linux.intel.com> > > > Are these patches dependent on each other? If yes pls send a cover letter. > If not pls don't send a series, post them separately.
Got it. > And, pls Cc me on all vhost user patches. Isn't I always doing that? :) --yliu > > > --- > > docs/specs/vhost-user.txt | 4 ++-- > > hw/net/vhost_net.c | 2 +- > > hw/virtio/vhost-user.c | 8 ++++---- > > linux-headers/linux/vhost.h | 2 +- > > tests/vhost-user-test.c | 2 +- > > 5 files changed, 9 insertions(+), 9 deletions(-) > > > > diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt > > index 4eadad1..4bcd17d 100644 > > --- a/docs/specs/vhost-user.txt > > +++ b/docs/specs/vhost-user.txt > > @@ -211,10 +211,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 > > diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c > > index 2bce891..804f5c9 100644 > > --- a/hw/net/vhost_net.c > > +++ b/hw/net/vhost_net.c > > @@ -296,7 +296,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_DEVICE, > > + int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_OWNER, > > NULL); > > assert(r >= 0); > > } > > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > > index b11c0d2..12a9104 100644 > > --- a/hw/virtio/vhost-user.c > > +++ b/hw/virtio/vhost-user.c > > @@ -34,7 +34,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, > > @@ -102,7 +102,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_DEVICE, /* VHOST_USER_RESET_DEVICE */ > > + VHOST_RESET_OWNER, /* VHOST_USER_RESET_OWNER */ > > 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 */ > > @@ -192,7 +192,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; > > @@ -249,7 +249,7 @@ static int vhost_user_call(struct vhost_dev *dev, > > unsigned long int request, > > break; > > > > case VHOST_USER_SET_OWNER: > > - case VHOST_USER_RESET_DEVICE: > > + case VHOST_USER_RESET_OWNER: > > break; > > > > case VHOST_USER_SET_MEM_TABLE: > > diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h > > index 14a0160..ead86db 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_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) > > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c > > index 56df5cc..f181391 100644 > > --- a/tests/vhost-user-test.c > > +++ b/tests/vhost-user-test.c > > @@ -53,7 +53,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, > > -- > > 1.9.0 > >