From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0Xrv-0003ep-UC for qemu-devel@nongnu.org; Wed, 11 May 2016 13:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0Xrr-0007QW-9v for qemu-devel@nongnu.org; Wed, 11 May 2016 13:24:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0Xrr-0007Pr-1L for qemu-devel@nongnu.org; Wed, 11 May 2016 13:24:15 -0400 Date: Wed, 11 May 2016 20:24:11 +0300 From: "Michael S. Tsirkin" Message-ID: <20160511202308-mutt-send-email-mst@redhat.com> References: <1462960324-4655-1-git-send-email-den@openvz.org> <1462960324-4655-3-git-send-email-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1462960324-4655-3-git-send-email-den@openvz.org> Subject: Re: [Qemu-devel] [RFC 2/2] virtio: show features acked by guest in 'info qtree' dump List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: qemu-devel@nongnu.org, Eric Blake On Wed, May 11, 2016 at 12:52:04PM +0300, Denis V. Lunev wrote: > It is very convinient and useful for debug purpose to expose the set of > features negotiated with guest. The patch exports those features via > read-only bit properties. > > Signed-off-by: Denis V. Lunev > CC: Michael S. Tsirkin > CC: Eric Blake Fine but can we avoid the code duplication, using some macro? Same name and it are nearly always used with both host and guest features. > --- > hw/net/virtio-net.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 5798f87..cb9ce9c 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -1904,6 +1904,50 @@ static Property virtio_net_properties[] = { > DEFINE_PROP_BIT("ctrl_guest_offloads", VirtIONet, host_features, > VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, true), > DEFINE_PROP_BIT("mq", VirtIONet, host_features, VIRTIO_NET_F_MQ, false), > + > + DEFINE_PROP_RO_BIT64("csum_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CSUM), > + DEFINE_PROP_RO_BIT64("guest_csum_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_CSUM), > + DEFINE_PROP_RO_BIT64("gso_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GSO), > + DEFINE_PROP_RO_BIT64("guest_tso4_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_TSO4), > + DEFINE_PROP_RO_BIT64("guest_tso6_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_TSO6), > + DEFINE_PROP_RO_BIT64("guest_ecn_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_ECN), > + DEFINE_PROP_RO_BIT64("guest_ufo_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_UFO), > + DEFINE_PROP_RO_BIT64("guest_announce_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_GUEST_ANNOUNCE), > + DEFINE_PROP_RO_BIT64("host_tso4_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_HOST_TSO4), > + DEFINE_PROP_RO_BIT64("host_tso6_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_HOST_TSO6), > + DEFINE_PROP_RO_BIT64("host_ecn_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_HOST_ECN), > + DEFINE_PROP_RO_BIT64("host_ufo_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_HOST_UFO), > + DEFINE_PROP_RO_BIT64("mrg_rxbuf_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_MRG_RXBUF), > + DEFINE_PROP_RO_BIT64("status_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_STATUS), > + DEFINE_PROP_RO_BIT64("ctrl_vq_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CTRL_VQ), > + DEFINE_PROP_RO_BIT64("ctrl_rx_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CTRL_RX), > + DEFINE_PROP_RO_BIT64("ctrl_vlan_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CTRL_VLAN), > + DEFINE_PROP_RO_BIT64("ctrl_rx_extra_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CTRL_RX_EXTRA), > + DEFINE_PROP_RO_BIT64("ctrl_mac_addr_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_CTRL_MAC_ADDR), > + DEFINE_PROP_RO_BIT64("ctrl_guest_offloads_acked", VirtIODevice, > + guest_features, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS), > + DEFINE_PROP_RO_BIT64("mq_acked", VirtIODevice, guest_features, > + VIRTIO_NET_F_MQ), > + > DEFINE_NIC_PROPERTIES(VirtIONet, nic_conf), > DEFINE_PROP_UINT32("x-txtimer", VirtIONet, net_conf.txtimer, > TX_TIMER_INTERVAL), > -- > 2.5.0