From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97C-0008Iv-T9 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:51:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN97B-0000HW-PX for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:51:38 -0400 Sender: fluxion From: Michael Roth Date: Tue, 2 Apr 2013 16:45:21 -0500 Message-Id: <1364939142-30066-17-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 16/37] Allow virtio-net features for legacy s390 virtio bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Christian Borntraeger Enable all virtio-net features for the legacy s390 virtio bus. This also fixes kernel BUG at /usr/src/packages/BUILD/kernel-default-3.0.58/linux-3.0/drivers/s390/kvm/kvm_virtio.c:121! Signed-off-by: Christian Borntraeger Cc: qemu-stable@nongnu.org Signed-off-by: Alexander Graf (cherry picked from commit 35569cea79fd3f5ccb5b23ca024c7d3aa4d24e75) Signed-off-by: Michael Roth --- hw/s390x/s390-virtio-bus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 089ed92..d9b7f83 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -402,6 +402,7 @@ static const VirtIOBindings virtio_s390_bindings = { static Property s390_virtio_net_properties[] = { DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic), + DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features), DEFINE_PROP_UINT32("x-txtimer", VirtIOS390Device, net.txtimer, TX_TIMER_INTERVAL), DEFINE_PROP_INT32("x-txburst", VirtIOS390Device, -- 1.7.9.5