[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] virtio-rng: switch to linux-headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 06/10] virtio-rng: switch to linux-headers |
Date: |
Thu, 23 May 2013 17:35:03 +0300 |
It's easier to keep everything in sync if
we just use linux headers for virtio constants.
Add virtio_rng.h header from linux 3.10-rc1, and
remove duplicate symbols from virtio-rng.h
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/virtio-rng.h | 5 ++---
linux-headers/linux/virtio_rng.h | 8 ++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 linux-headers/linux/virtio_rng.h
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index debaa15..a0cc62e 100644
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -14,14 +14,13 @@
#include "sysemu/rng.h"
#include "sysemu/rng-random.h"
+#include "linux/virtio_rng.h"
+#include "linux/virtio_ids.h"
#define TYPE_VIRTIO_RNG "virtio-rng-device"
#define VIRTIO_RNG(obj) \
OBJECT_CHECK(VirtIORNG, (obj), TYPE_VIRTIO_RNG)
-/* The Virtio ID for the virtio rng device */
-#define VIRTIO_ID_RNG 4
-
struct VirtIORNGConf {
RngBackend *rng;
uint64_t max_bytes;
diff --git a/linux-headers/linux/virtio_rng.h b/linux-headers/linux/virtio_rng.h
new file mode 100644
index 0000000..c4d5de8
--- /dev/null
+++ b/linux-headers/linux/virtio_rng.h
@@ -0,0 +1,8 @@
+#ifndef _LINUX_VIRTIO_RNG_H
+#define _LINUX_VIRTIO_RNG_H
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers. */
+#include <linux/virtio_ids.h>
+#include <linux/virtio_config.h>
+
+#endif /* _LINUX_VIRTIO_RNG_H */
--
MST
- [Qemu-devel] [PATCH 00/10] virtio: import headers from linux, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 01/10] scripts/update-linux-headers.sh: add virtio, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 03/10] virtio-net, eth: use linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 04/10] virtio-blk: switch to linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 06/10] virtio-rng: switch to linux-headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 05/10] virtio-balloon: switch to linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 07/10] virtio-console: switch to linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 08/10] virtio: add virtio_ids from linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 09/10] virtio-pci: switch to linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 10/10] virtio: use ring structure from linux-headers, Michael S. Tsirkin, 2013/05/23
- [Qemu-devel] [PATCH 02/10] virtio-9p: switch to linux-headers, Michael S. Tsirkin, 2013/05/23
- Re: [Qemu-devel] [PATCH 00/10] virtio: import headers from linux, Peter Maydell, 2013/05/23