File 0320-virtio-use-standard-virtio_ring.h.patch of Package qemu.6354

From a1de27bed4df552fe5a632a0f2ee7493fbd0477e Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Mon, 16 Feb 2015 22:35:40 +0100
Subject: [PATCH] virtio: use standard virtio_ring.h

Switch to virtio_ring.h from standard headers.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 4fbe0f322d5413482efbf9c0d2329fdc32bea6d1)
[BR: Fix and/or infrastructure for BSC#1038396]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 hw/net/vhost_net.c                  | 2 +-
 include/hw/virtio/dataplane/vring.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index a1de2f43a0..3aec4257a5 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -28,7 +28,7 @@
 #include <linux/kvm.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/virtio_ring.h>
+#include "standard-headers/linux/virtio_ring.h"
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/include/hw/virtio/dataplane/vring.h b/include/hw/virtio/dataplane/vring.h
index 63e7bf4256..1aa82aab7e 100644
--- a/include/hw/virtio/dataplane/vring.h
+++ b/include/hw/virtio/dataplane/vring.h
@@ -17,7 +17,7 @@
 #ifndef VRING_H
 #define VRING_H
 
-#include <linux/virtio_ring.h>
+#include "standard-headers/linux/virtio_ring.h"
 #include "qemu-common.h"
 #include "hw/virtio/virtio.h"