On 29/05/2020 16:06, Cindy Lu wrote: > user the qemu_get_peer to replace the old process > > Signed-off-by: Cindy Lu <l...@redhat.com> > --- > hw/net/vhost_net.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c > index 6b82803fa7..d1d421e3d9 100644 > --- a/hw/net/vhost_net.c > +++ b/hw/net/vhost_net.c > @@ -306,7 +306,9 @@ int vhost_net_start(VirtIODevice *dev, NetClientState > *ncs, > BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev))); > VirtioBusState *vbus = VIRTIO_BUS(qbus); > VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus); > + struct vhost_net *net; > int r, e, i; > + NetClientState *peer; > > if (!k->set_guest_notifiers) { > error_report("binding does not support guest notifiers"); > @@ -314,9 +316,9 @@ int vhost_net_start(VirtIODevice *dev, NetClientState > *ncs, > } > > for (i = 0; i < total_queues; i++) { > - struct vhost_net *net; > > - net = get_vhost_net(ncs[i].peer); > + peer = qemu_get_peer(ncs, i); > + net = get_vhost_net(peer); > vhost_net_set_vq_index(net, i * 2); > > /* Suppress the masking guest notifiers on vhost user > @@ -335,7 +337,8 @@ int vhost_net_start(VirtIODevice *dev, NetClientState > *ncs, > } > > for (i = 0; i < total_queues; i++) { > - r = vhost_net_start_one(get_vhost_net(ncs[i].peer), dev); > + peer = qemu_get_peer(ncs, i); > + r = vhost_net_start_one(get_vhost_net(peer), dev); > > if (r < 0) { > goto err_start; > @@ -343,7 +346,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState > *ncs, > > if (ncs[i].peer->vring_enable) {
You can replace this "ncs[i].peer->vring_enable" by "peer->vring_enable"... and you do this later in PATCH 5/8. Thanks, Laurent