virtio-net: unify vhost-net start/stop
PATCH v2 1/1 virtio-net: unify vhost-net start/stop
Move all of vhost-net start/stop logic to a single routine, and call it from everywhere.
Additionally, start/stop vhost-net on link up/down:
we should not transmit anything if user asked us to put the link down.
---
Sent a wrong version, sorry about the noise.
hw/virtio-net.c | 89 ++++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 46 deletions(-)
hw/virtio-net.c +43 -46
@@ -51,6 +51,7 @@ typedef struct VirtIONetuint8_t nouni;uint8_t nobcast;uint8_t vhost_started; +bool vm_running;VMChangeStateEntry *vmstate;struct {int in_use;
@@ -95,6 +96,38 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) } } +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + } +if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == (status &VIRTIO_CONFIG_S_DRIVER_OK ) && + (n->status &VIRTIO_NET_S_LINK_UP ) && + n->vm_running) { +return ; + } +if (!n->vhost_started) { +int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); +if (r <0 ) { +fprintf (stderr,"unable to start vhost net: %d: " +"falling back on userspace virtio\n" , -r); + }else { + n->vhost_started =1 ; + } + }else { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); + n->vhost_started =0 ; + } +} +static void virtio_net_set_link_status (VLANClientState *nc) {VirtIONet *n =DO_UPCAST (NICState, nc, nc)->opaque;
@@ -107,6 +140,8 @@ static void virtio_net_set_link_status(VLANClientState *nc)if (n->status != old_status)virtio_notify_config (&n->vdev); + +virtio_net_set_status (&n->vdev, n->vdev.status); }static void virtio_net_reset (VirtIODevice *vdev)
@@ -120,10 +155,6 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nomulti =0 ; n->nouni =0 ; n->nobcast =0 ; -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - }/* Flush any MAC and VLAN filter table state */ n->mac_table.in_use =0 ;
@@ -726,12 +757,9 @@ static void virtio_net_save(QEMUFile *f, void *opaque) {VirtIONet *n = opaque; -if (n->vhost_started) { -/* TODO: should we really stop the backend? -* If we don't, it might keep writing to memory. */ -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); - n->vhost_started =0 ; - } +/* At this point, backend must be stopped, otherwise +* it might keep writing to memory. */ +assert (!n->vhost_started);virtio_save (&n->vdev, f);qemu_put_buffer (f, n->mac,ETH_ALEN );
@@ -863,44 +891,14 @@ static NetClientInfo net_virtio_info = { .link_status_changed = virtio_net_set_link_status, }; -static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) -{ -VirtIONet *n =to_virtio_net (vdev); -if (!n->nic->nc.peer) { -return ; - } -if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { -return ; - } - -if (!tap_get_vhost_net (n->nic->nc.peer)) { -return ; - } -if (!!n->vhost_started == !!(status &VIRTIO_CONFIG_S_DRIVER_OK )) { -return ; - } -if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { -int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), vdev); -if (r <0 ) { -fprintf (stderr,"unable to start vhost net: %d: " -"falling back on userspace virtio\n" , -r); - }else { - n->vhost_started =1 ; - } - }else { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - } -} -static void virtio_net_vmstate_change (void *opaque,int running,int reason) {VirtIONet *n = opaque; -uint8_t status = running ?VIRTIO_CONFIG_S_DRIVER_OK :0 ; + n->vm_running = running;/* This is called when vm is started/stopped, -* it will start/stop vhost backend if * appropriate +* it will start/stop vhost backend if appropriate * e.g. after migration. */ -virtio_net_set_status (&n->vdev, n->vdev.status & status); +virtio_net_set_status (&n->vdev, n->vdev.status); }VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf)
@@ -951,9 +949,8 @@ void virtio_net_exit(VirtIODevice *vdev)VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev);qemu_del_vm_change_state_handler (n->vmstate); -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - } +/* This will stop vhost backend if appropriate. */ +virtio_net_set_status (vdev,0 );qemu_purge_queued_packets (&n->nic->nc);
Signature · 1 line
1.7.3-rc1
Quoted 37 lines · Michael S. Tsirkin
Move all of vhost-net start/stop logic to a single routine, and call it from everywhere.
Additionally, start/stop vhost-net on link up/down:
we should not transmit anything if user asked us to put the link down.Signed-off-by Michael S. Tsirkin <[email protected]>---
Sent a wrong version, sorry about the noise.
hw/virtio-net.c | 89 ++++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 46 deletions(-)hw/virtio-net.c +7
-0@@ -51,6 +51,7 @@ typedef struct VirtIONetuint8_t nouni;uint8_t nobcast;uint8_t vhost_started; +bool vm_running;VMChangeStateEntry *vmstate;struct {int in_use;@@ -95,6 +96,38 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) } } +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + }
hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 114
Quoted 10 lines
hw/virtio-net.c +10
-0+if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == (status &VIRTIO_CONFIG_S_DRIVER_OK ) && + (n->status &VIRTIO_NET_S_LINK_UP ) && + n->vm_running) {
I don't think this works...
#define VIRTIO_CONFIG_S_DRIVER_OK 4
!!(1) == (status & 4)?
hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 121
Quoted 7 lines
hw/virtio-net.c +7
-0+return ; + } +if (!n->vhost_started) { +int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); +if (r <0 ) { +fprintf (stderr,"unable to start vhost net: %d: " +"falling back on userspace virtio\n" , -r);
Definitely worth noting if not using vhost, but aren't we potentially going to see this in the log a lot in that case? Thanks,
Alex
Quoted 108 lines
hw/virtio-net.c +19
-46+ }else { + n->vhost_started =1 ; + } + }else { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); + n->vhost_started =0 ; + } +} +static void virtio_net_set_link_status (VLANClientState *nc) {VirtIONet *n =DO_UPCAST (NICState, nc, nc)->opaque;@@ -107,6 +140,8 @@ static void virtio_net_set_link_status(VLANClientState *nc)if (n->status != old_status)virtio_notify_config (&n->vdev); + +virtio_net_set_status (&n->vdev, n->vdev.status); }static void virtio_net_reset (VirtIODevice *vdev)@@ -120,10 +155,6 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nomulti =0 ; n->nouni =0 ; n->nobcast =0 ; -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - }/* Flush any MAC and VLAN filter table state */ n->mac_table.in_use =0 ;@@ -726,12 +757,9 @@ static void virtio_net_save(QEMUFile *f, void *opaque) {VirtIONet *n = opaque; -if (n->vhost_started) { -/* TODO: should we really stop the backend? -* If we don't, it might keep writing to memory. */ -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); - n->vhost_started =0 ; - } +/* At this point, backend must be stopped, otherwise +* it might keep writing to memory. */ +assert (!n->vhost_started);virtio_save (&n->vdev, f);qemu_put_buffer (f, n->mac,ETH_ALEN );@@ -863,44 +891,14 @@ static NetClientInfo net_virtio_info = { .link_status_changed = virtio_net_set_link_status, }; -static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) -{ -VirtIONet *n =to_virtio_net (vdev); -if (!n->nic->nc.peer) { -return ; - } -if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { -return ; - } - -if (!tap_get_vhost_net (n->nic->nc.peer)) { -return ; - } -if (!!n->vhost_started == !!(status &VIRTIO_CONFIG_S_DRIVER_OK )) { -return ; - } -if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { -int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), vdev); -if (r <0 ) { -fprintf (stderr,"unable to start vhost net: %d: " -"falling back on userspace virtio\n" , -r); - }else { - n->vhost_started =1 ; - } - }else { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - } -} -static void virtio_net_vmstate_change (void *opaque,int running,int reason) {VirtIONet *n = opaque; -uint8_t status = running ?VIRTIO_CONFIG_S_DRIVER_OK :0 ; + n->vm_running = running;/* This is called when vm is started/stopped, -* it will start/stop vhost backend if * appropriate +* it will start/stop vhost backend if appropriate * e.g. after migration. */ -virtio_net_set_status (&n->vdev, n->vdev.status & status); +virtio_net_set_status (&n->vdev, n->vdev.status); }VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf)@@ -951,9 +949,8 @@ void virtio_net_exit(VirtIODevice *vdev)VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev);qemu_del_vm_change_state_handler (n->vmstate); -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - } +/* This will stop vhost backend if appropriate. */ +virtio_net_set_status (vdev,0 );qemu_purge_queued_packets (&n->nic->nc);
Quoted 51 lines · Alex Williamson
Quoted 37 lines · Michael S. Tsirkin
Move all of vhost-net start/stop logic to a single routine, and call it from everywhere.
Additionally, start/stop vhost-net on link up/down:
we should not transmit anything if user asked us to put the link down.Signed-off-by Michael S. Tsirkin <[email protected]>---
Sent a wrong version, sorry about the noise.
hw/virtio-net.c | 89 ++++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 46 deletions(-)hw/virtio-net.c +7
-0@@ -51,6 +51,7 @@ typedef struct VirtIONetuint8_t nouni;uint8_t nobcast;uint8_t vhost_started; +bool vm_running;VMChangeStateEntry *vmstate;struct {int in_use;@@ -95,6 +96,38 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) } } +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + }hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 114
Quoted 10 lines
hw/virtio-net.c +10
-0+if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == (status &VIRTIO_CONFIG_S_DRIVER_OK ) && + (n->status &VIRTIO_NET_S_LINK_UP ) && + n->vm_running) {I don't think this works...
Quoted 3 lines
#define
VIRTIO_CONFIG_S_DRIVER_OK4!!(1) == (status & 4)?
The && converts it to a boolean.
Quoted 8 lines
hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 121
Quoted 7 lines
hw/virtio-net.c +7
-0+return ; + } +if (!n->vhost_started) { +int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); +if (r <0 ) { +fprintf (stderr,"unable to start vhost net: %d: " +"falling back on userspace virtio\n" , -r);
Quoted 4 lines
Definitely worth noting if not using vhost, but aren't we potentially going to see this in the log a lot in that case? Thanks,
Alex
Not really, we detect failure at start normally, and do not proceed.
This means that somehow the device went dead: should not happen really, but since it's easy to recover we do.
Quoted 110 lines
Quoted 108 lines
hw/virtio-net.c +19
-46+ }else { + n->vhost_started =1 ; + } + }else { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); + n->vhost_started =0 ; + } +} +static void virtio_net_set_link_status (VLANClientState *nc) {VirtIONet *n =DO_UPCAST (NICState, nc, nc)->opaque;@@ -107,6 +140,8 @@ static void virtio_net_set_link_status(VLANClientState *nc)if (n->status != old_status)virtio_notify_config (&n->vdev); + +virtio_net_set_status (&n->vdev, n->vdev.status); }static void virtio_net_reset (VirtIODevice *vdev)@@ -120,10 +155,6 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nomulti =0 ; n->nouni =0 ; n->nobcast =0 ; -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - }/* Flush any MAC and VLAN filter table state */ n->mac_table.in_use =0 ;@@ -726,12 +757,9 @@ static void virtio_net_save(QEMUFile *f, void *opaque) {VirtIONet *n = opaque; -if (n->vhost_started) { -/* TODO: should we really stop the backend? -* If we don't, it might keep writing to memory. */ -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); - n->vhost_started =0 ; - } +/* At this point, backend must be stopped, otherwise +* it might keep writing to memory. */ +assert (!n->vhost_started);virtio_save (&n->vdev, f);qemu_put_buffer (f, n->mac,ETH_ALEN );@@ -863,44 +891,14 @@ static NetClientInfo net_virtio_info = { .link_status_changed = virtio_net_set_link_status, }; -static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) -{ -VirtIONet *n =to_virtio_net (vdev); -if (!n->nic->nc.peer) { -return ; - } -if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { -return ; - } - -if (!tap_get_vhost_net (n->nic->nc.peer)) { -return ; - } -if (!!n->vhost_started == !!(status &VIRTIO_CONFIG_S_DRIVER_OK )) { -return ; - } -if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { -int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), vdev); -if (r <0 ) { -fprintf (stderr,"unable to start vhost net: %d: " -"falling back on userspace virtio\n" , -r); - }else { - n->vhost_started =1 ; - } - }else { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - } -} -static void virtio_net_vmstate_change (void *opaque,int running,int reason) {VirtIONet *n = opaque; -uint8_t status = running ?VIRTIO_CONFIG_S_DRIVER_OK :0 ; + n->vm_running = running;/* This is called when vm is started/stopped, -* it will start/stop vhost backend if * appropriate +* it will start/stop vhost backend if appropriate * e.g. after migration. */ -virtio_net_set_status (&n->vdev, n->vdev.status & status); +virtio_net_set_status (&n->vdev, n->vdev.status); }VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf)@@ -951,9 +949,8 @@ void virtio_net_exit(VirtIODevice *vdev)VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev);qemu_del_vm_change_state_handler (n->vmstate); -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - } +/* This will stop vhost backend if appropriate. */ +virtio_net_set_status (vdev,0 );qemu_purge_queued_packets (&n->nic->nc);
Quoted 52 lines · Michael S. Tsirkin
Quoted 51 lines · Alex Williamson
Quoted 37 lines · Michael S. Tsirkin
Move all of vhost-net start/stop logic to a single routine, and call it from everywhere.
Additionally, start/stop vhost-net on link up/down:
we should not transmit anything if user asked us to put the link down.Signed-off-by Michael S. Tsirkin <[email protected]>---
Sent a wrong version, sorry about the noise.
hw/virtio-net.c | 89 ++++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 46 deletions(-)hw/virtio-net.c +7
-0@@ -51,6 +51,7 @@ typedef struct VirtIONetuint8_t nouni;uint8_t nobcast;uint8_t vhost_started; +bool vm_running;VMChangeStateEntry *vmstate;struct {int in_use;@@ -95,6 +96,38 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) } } +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + }hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 114
Quoted 10 lines
hw/virtio-net.c +10
-0+if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == (status &VIRTIO_CONFIG_S_DRIVER_OK ) && + (n->status &VIRTIO_NET_S_LINK_UP ) && + n->vm_running) {I don't think this works...
Quoted 5 lines
Quoted 3 lines
#define
VIRTIO_CONFIG_S_DRIVER_OK4!!(1) == (status & 4)?
The && converts it to a boolean.
Are you missing a set of parens around everything right of the ==? ie:
if (!!n->vhost_started == ((status & VIRTIO_CONFIG_S_DRIVER_OK) &&
(n->status & VIRTIO_NET_S_LINK_UP) &&
n->vm_running)) {...Has this actually been tested?
Alex
Quoted 128 lines
Quoted 8 lines
hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 121
Quoted 7 lines
hw/virtio-net.c +7
-0+return ; + } +if (!n->vhost_started) { +int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); +if (r <0 ) { +fprintf (stderr,"unable to start vhost net: %d: " +"falling back on userspace virtio\n" , -r);Quoted 4 lines
Definitely worth noting if not using vhost, but aren't we potentially going to see this in the log a lot in that case? Thanks,
Alex
Not really, we detect failure at start normally, and do not proceed.
This means that somehow the device went dead: should not happen really, but since it's easy to recover we do.Quoted 110 lines
Quoted 108 lines
hw/virtio-net.c +19
-46+ }else { + n->vhost_started =1 ; + } + }else { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); + n->vhost_started =0 ; + } +} +static void virtio_net_set_link_status (VLANClientState *nc) {VirtIONet *n =DO_UPCAST (NICState, nc, nc)->opaque;@@ -107,6 +140,8 @@ static void virtio_net_set_link_status(VLANClientState *nc)if (n->status != old_status)virtio_notify_config (&n->vdev); + +virtio_net_set_status (&n->vdev, n->vdev.status); }static void virtio_net_reset (VirtIODevice *vdev)@@ -120,10 +155,6 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nomulti =0 ; n->nouni =0 ; n->nobcast =0 ; -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - }/* Flush any MAC and VLAN filter table state */ n->mac_table.in_use =0 ;@@ -726,12 +757,9 @@ static void virtio_net_save(QEMUFile *f, void *opaque) {VirtIONet *n = opaque; -if (n->vhost_started) { -/* TODO: should we really stop the backend? -* If we don't, it might keep writing to memory. */ -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); - n->vhost_started =0 ; - } +/* At this point, backend must be stopped, otherwise +* it might keep writing to memory. */ +assert (!n->vhost_started);virtio_save (&n->vdev, f);qemu_put_buffer (f, n->mac,ETH_ALEN );@@ -863,44 +891,14 @@ static NetClientInfo net_virtio_info = { .link_status_changed = virtio_net_set_link_status, }; -static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) -{ -VirtIONet *n =to_virtio_net (vdev); -if (!n->nic->nc.peer) { -return ; - } -if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { -return ; - } - -if (!tap_get_vhost_net (n->nic->nc.peer)) { -return ; - } -if (!!n->vhost_started == !!(status &VIRTIO_CONFIG_S_DRIVER_OK )) { -return ; - } -if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { -int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), vdev); -if (r <0 ) { -fprintf (stderr,"unable to start vhost net: %d: " -"falling back on userspace virtio\n" , -r); - }else { - n->vhost_started =1 ; - } - }else { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - n->vhost_started =0 ; - } -} -static void virtio_net_vmstate_change (void *opaque,int running,int reason) {VirtIONet *n = opaque; -uint8_t status = running ?VIRTIO_CONFIG_S_DRIVER_OK :0 ; + n->vm_running = running;/* This is called when vm is started/stopped, -* it will start/stop vhost backend if * appropriate +* it will start/stop vhost backend if appropriate * e.g. after migration. */ -virtio_net_set_status (&n->vdev, n->vdev.status & status); +virtio_net_set_status (&n->vdev, n->vdev.status); }VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf)@@ -951,9 +949,8 @@ void virtio_net_exit(VirtIODevice *vdev)VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev);qemu_del_vm_change_state_handler (n->vmstate); -if (n->vhost_started) { -vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); - } +/* This will stop vhost backend if appropriate. */ +virtio_net_set_status (vdev,0 );qemu_purge_queued_packets (&n->nic->nc);
Quoted 57 lines · Alex Williamson
Quoted 56 lines · Michael S. Tsirkin
Quoted 54 lines · Alex Williamson
Quoted 37 lines · Michael S. Tsirkin
Move all of vhost-net start/stop logic to a single routine, and call it from everywhere.
Additionally, start/stop vhost-net on link up/down:
we should not transmit anything if user asked us to put the link down.Signed-off-by Michael S. Tsirkin <[email protected]>---
Sent a wrong version, sorry about the noise.
hw/virtio-net.c | 89 ++++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 46 deletions(-)hw/virtio-net.c +7
-0@@ -51,6 +51,7 @@ typedef struct VirtIONetuint8_t nouni;uint8_t nobcast;uint8_t vhost_started; +bool vm_running;VMChangeStateEntry *vmstate;struct {int in_use;@@ -95,6 +96,38 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) } } +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + }hw/virtio-net.c static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) · line 114
Quoted 10 lines
hw/virtio-net.c +10
-0+if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == (status &VIRTIO_CONFIG_S_DRIVER_OK ) && + (n->status &VIRTIO_NET_S_LINK_UP ) && + n->vm_running) {I don't think this works...
#define
VIRTIO_CONFIG_S_DRIVER_OK4!!(1) == (status & 4)?
Quoted 7 lines
Quoted 1 line
The && converts it to a boolean.
Are you missing a set of parens around everything right of the ==? ie:
if (!!n->vhost_started == ((status &
VIRTIO_CONFIG_S_DRIVER_OK) &&(n->status & VIRTIO_NET_S_LINK_UP) && n->vm_running)) {...
Yes, that's it. Thanks!
Signature · 1 line
MST