Hi, is it ok if I upload an NMU with the attached patch to stable-proposed-updates?
Cheers, Stefan
diff -Nru qemu-2.8+dfsg/debian/changelog qemu-2.8+dfsg/debian/changelog --- qemu-2.8+dfsg/debian/changelog 2017-08-02 15:57:34.000000000 +0200 +++ qemu-2.8+dfsg/debian/changelog 2017-08-07 18:03:51.000000000 +0200 @@ -1,3 +1,10 @@ +qemu (1:2.8+dfsg-6+deb9u3) stretch; urgency=medium + + * Non-maintainer upload. + * Fix virtio-net with vhost with legacy interrupts. Closes: #867978 + + -- Stefan Fritsch <[email protected]> Mon, 07 Aug 2017 18:03:51 +0200 + qemu (1:2.8+dfsg-6+deb9u2) stretch-security; urgency=high * actually apply the nbd server patches, not only include in debian/patches/ diff -Nru qemu-2.8+dfsg/debian/patches/fix-vhost-net-legacy-irq.patch qemu-2.8+dfsg/debian/patches/fix-vhost-net-legacy-irq.patch --- qemu-2.8+dfsg/debian/patches/fix-vhost-net-legacy-irq.patch 1970-01-01 01:00:00.000000000 +0100 +++ qemu-2.8+dfsg/debian/patches/fix-vhost-net-legacy-irq.patch 2017-08-07 18:03:51.000000000 +0200 @@ -0,0 +1,50 @@ +From: Michael S. Tsirkin <[email protected]> +Date: Fri, 17 Feb 2017 04:52:16 +0200 +X-Dgit-Generated: 1:2.8+dfsg-6+deb9u2.1 6290f12ade202d40e5ed6535cd3c6a3049aa6888 +Subject: virtio: Fix no interrupt when not creating msi controller + +For ARM virt machine, if we use virt-2.7 which will not create ITS node, +the virtio-net can not recieve interrupts so it can't get ip address +through dhcp. +This fixes commit 83d768b(virtio: set ISR on dataplane notifications). + +Signed-off-by: Shannon Zhao <[email protected]> +Reviewed-by: Michael S. Tsirkin <[email protected]> +Signed-off-by: Michael S. Tsirkin <[email protected]> + +--- + +--- qemu-2.8+dfsg.orig/hw/virtio/virtio.c ++++ qemu-2.8+dfsg/hw/virtio/virtio.c +@@ -1387,6 +1387,12 @@ void virtio_notify_irqfd(VirtIODevice *v + event_notifier_set(&vq->guest_notifier); + } + ++static void virtio_irq(VirtQueue *vq) ++{ ++ virtio_set_isr(vq->vdev, 0x1); ++ virtio_notify_vector(vq->vdev, vq->vector); ++} ++ + void virtio_notify(VirtIODevice *vdev, VirtQueue *vq) + { + if (!virtio_should_notify(vdev, vq)) { +@@ -1394,8 +1400,7 @@ void virtio_notify(VirtIODevice *vdev, V + } + + trace_virtio_notify(vdev, vq); +- virtio_set_isr(vq->vdev, 0x1); +- virtio_notify_vector(vdev, vq->vector); ++ virtio_irq(vq); + } + + void virtio_notify_config(VirtIODevice *vdev) +@@ -2023,7 +2028,7 @@ static void virtio_queue_guest_notifier_ + { + VirtQueue *vq = container_of(n, VirtQueue, guest_notifier); + if (event_notifier_test_and_clear(n)) { +- virtio_notify_vector(vq->vdev, vq->vector); ++ virtio_irq(vq); + } + } + diff -Nru qemu-2.8+dfsg/debian/patches/series qemu-2.8+dfsg/debian/patches/series --- qemu-2.8+dfsg/debian/patches/series 2017-08-02 15:57:00.000000000 +0200 +++ qemu-2.8+dfsg/debian/patches/series 2017-08-07 18:03:51.000000000 +0200 @@ -42,3 +42,4 @@ slirp-check-len-against-dhcp-options-array-end-CVE-2017-11434.patch exec-use-qemu_ram_ptr_length-to-access-guest-ram-CVE-2017-11334.patch usb-redir-fix-stack-overflow-in-usbredir_log_data-CVE-2017-10806.patch +fix-vhost-net-legacy-irq.patch
