| Message ID | 20190716090839.19708-1-antonkuchin@yandex-team.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-net: remove redundant qdev from VirtIONet | expand |
On Tue, Jul 16, 2019 at 12:08:39PM +0300, Anton Kuchin wrote: > Signed-off-by: Anton Kuchin <antonkuchin@yandex-team.ru> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/net/virtio-net.c | 3 +-- > include/hw/virtio/virtio-net.h | 1 - > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index b9e1cd71cf..16d2ad5927 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -387,7 +387,7 @@ static void rxfilter_notify(NetClientState *nc) > VirtIONet *n = qemu_get_nic_opaque(nc); > > if (nc->rxfilter_notify_enabled) { > - gchar *path = object_get_canonical_path(OBJECT(n->qdev)); > + gchar *path = object_get_canonical_path(OBJECT(n)); > qapi_event_send_nic_rx_filter_changed(!!n->netclient_name, > n->netclient_name, path); > g_free(path); > @@ -2759,7 +2759,6 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) > nc->rxfilter_notify_enabled = 1; > > QTAILQ_INIT(&n->rsc_chains); > - n->qdev = dev; > } > > static void virtio_net_device_unrealize(DeviceState *dev, Error **errp) > diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h > index b96f0c643f..4a1b599d48 100644 > --- a/include/hw/virtio/virtio-net.h > +++ b/include/hw/virtio/virtio-net.h > @@ -174,7 +174,6 @@ struct VirtIONet { > uint32_t *vlans; > virtio_net_conf net_conf; > NICConf nic_conf; > - DeviceState *qdev; > int multiqueue; > uint16_t max_queues; > uint16_t curr_queues; > -- > 2.20.1
Could you add a commit message describing why we can remove the qdev field? Thanks, Laurent Le 16/07/2019 à 11:08, Anton Kuchin a écrit : > Signed-off-by: Anton Kuchin <antonkuchin@yandex-team.ru> > --- > hw/net/virtio-net.c | 3 +-- > include/hw/virtio/virtio-net.h | 1 - > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index b9e1cd71cf..16d2ad5927 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -387,7 +387,7 @@ static void rxfilter_notify(NetClientState *nc) > VirtIONet *n = qemu_get_nic_opaque(nc); > > if (nc->rxfilter_notify_enabled) { > - gchar *path = object_get_canonical_path(OBJECT(n->qdev)); > + gchar *path = object_get_canonical_path(OBJECT(n)); > qapi_event_send_nic_rx_filter_changed(!!n->netclient_name, > n->netclient_name, path); > g_free(path); > @@ -2759,7 +2759,6 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) > nc->rxfilter_notify_enabled = 1; > > QTAILQ_INIT(&n->rsc_chains); > - n->qdev = dev; > } > > static void virtio_net_device_unrealize(DeviceState *dev, Error **errp) > diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h > index b96f0c643f..4a1b599d48 100644 > --- a/include/hw/virtio/virtio-net.h > +++ b/include/hw/virtio/virtio-net.h > @@ -174,7 +174,6 @@ struct VirtIONet { > uint32_t *vlans; > virtio_net_conf net_conf; > NICConf nic_conf; > - DeviceState *qdev; > int multiqueue; > uint16_t max_queues; > uint16_t curr_queues; >
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b9e1cd71cf..16d2ad5927 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -387,7 +387,7 @@ static void rxfilter_notify(NetClientState *nc) VirtIONet *n = qemu_get_nic_opaque(nc); if (nc->rxfilter_notify_enabled) { - gchar *path = object_get_canonical_path(OBJECT(n->qdev)); + gchar *path = object_get_canonical_path(OBJECT(n)); qapi_event_send_nic_rx_filter_changed(!!n->netclient_name, n->netclient_name, path); g_free(path); @@ -2759,7 +2759,6 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled = 1; QTAILQ_INIT(&n->rsc_chains); - n->qdev = dev; } static void virtio_net_device_unrealize(DeviceState *dev, Error **errp) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index b96f0c643f..4a1b599d48 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -174,7 +174,6 @@ struct VirtIONet { uint32_t *vlans; virtio_net_conf net_conf; NICConf nic_conf; - DeviceState *qdev; int multiqueue; uint16_t max_queues; uint16_t curr_queues;
Signed-off-by: Anton Kuchin <antonkuchin@yandex-team.ru> --- hw/net/virtio-net.c | 3 +-- include/hw/virtio/virtio-net.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)