Skip to content

Commit 92fbc3e

Browse files
lulu-github-namemstsirkin
authored andcommitted
vhost_net: use the function qemu_get_peer
user the qemu_get_peer to replace the old process Signed-off-by: Cindy Lu <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Message-Id: <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Jason Wang <[email protected]>
1 parent 0165daa commit 92fbc3e

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

hw/net/vhost_net.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,17 +306,19 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
306306
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev)));
307307
VirtioBusState *vbus = VIRTIO_BUS(qbus);
308308
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus);
309+
struct vhost_net *net;
309310
int r, e, i;
311+
NetClientState *peer;
310312

311313
if (!k->set_guest_notifiers) {
312314
error_report("binding does not support guest notifiers");
313315
return -ENOSYS;
314316
}
315317

316318
for (i = 0; i < total_queues; i++) {
317-
struct vhost_net *net;
318319

319-
net = get_vhost_net(ncs[i].peer);
320+
peer = qemu_get_peer(ncs, i);
321+
net = get_vhost_net(peer);
320322
vhost_net_set_vq_index(net, i * 2);
321323

322324
/* Suppress the masking guest notifiers on vhost user
@@ -335,15 +337,16 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
335337
}
336338

337339
for (i = 0; i < total_queues; i++) {
338-
r = vhost_net_start_one(get_vhost_net(ncs[i].peer), dev);
340+
peer = qemu_get_peer(ncs, i);
341+
r = vhost_net_start_one(get_vhost_net(peer), dev);
339342

340343
if (r < 0) {
341344
goto err_start;
342345
}
343346

344-
if (ncs[i].peer->vring_enable) {
347+
if (peer->vring_enable) {
345348
/* restore vring enable state */
346-
r = vhost_set_vring_enable(ncs[i].peer, ncs[i].peer->vring_enable);
349+
r = vhost_set_vring_enable(peer, peer->vring_enable);
347350

348351
if (r < 0) {
349352
goto err_start;
@@ -355,7 +358,8 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
355358

356359
err_start:
357360
while (--i >= 0) {
358-
vhost_net_stop_one(get_vhost_net(ncs[i].peer), dev);
361+
peer = qemu_get_peer(ncs , i);
362+
vhost_net_stop_one(get_vhost_net(peer), dev);
359363
}
360364
e = k->set_guest_notifiers(qbus->parent, total_queues * 2, false);
361365
if (e < 0) {

0 commit comments

Comments
 (0)