Commit e95646c3 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Rusty Russell

virtio: let header files include virtio_ids.h

Rusty,

commit 3ca4f5ca
    virtio: add virtio IDs file
moved all device IDs into a single file. While the change itself is
a very good one, it can break userspace applications. For example
if a userspace tool wanted to get the ID of virtio_net it used to
include virtio_net.h. This does no longer work, since virtio_net.h
does not include virtio_ids.h.
This patch moves all "#include <linux/virtio_ids.h>" from the C
files into the header files, making the header files compatible with
the old ones.

In addition, this patch exports virtio_ids.h to userspace.

CC: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent f8b12e51
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <signal.h> #include <signal.h>
#include "linux/lguest_launcher.h" #include "linux/lguest_launcher.h"
#include "linux/virtio_config.h" #include "linux/virtio_config.h"
#include <linux/virtio_ids.h>
#include "linux/virtio_net.h" #include "linux/virtio_net.h"
#include "linux/virtio_blk.h" #include "linux/virtio_blk.h"
#include "linux/virtio_console.h" #include "linux/virtio_console.h"
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_blk.h> #include <linux/virtio_blk.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_rng.h> #include <linux/virtio_rng.h>
/* The host will fill any buffer we give it with sweet, sweet randomness. We /* The host will fill any buffer we give it with sweet, sweet randomness. We
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_console.h> #include <linux/virtio_console.h>
#include "hvc_console.h" #include "hvc_console.h"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_net.h> #include <linux/virtio_net.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
*/ */
//#define DEBUG //#define DEBUG
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_balloon.h> #include <linux/virtio_balloon.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/kthread.h> #include <linux/kthread.h>
......
...@@ -364,6 +364,7 @@ unifdef-y += utsname.h ...@@ -364,6 +364,7 @@ unifdef-y += utsname.h
unifdef-y += videodev2.h unifdef-y += videodev2.h
unifdef-y += videodev.h unifdef-y += videodev.h
unifdef-y += virtio_config.h unifdef-y += virtio_config.h
unifdef-y += virtio_ids.h
unifdef-y += virtio_blk.h unifdef-y += virtio_blk.h
unifdef-y += virtio_net.h unifdef-y += virtio_net.h
unifdef-y += virtio_9p.h unifdef-y += virtio_9p.h
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_9P_H #define _LINUX_VIRTIO_9P_H
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* Maximum number of virtio channels per partition (1 for now) */ /* Maximum number of virtio channels per partition (1 for now) */
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_BALLOON_H #define _LINUX_VIRTIO_BALLOON_H
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* The feature bitmap for virtio balloon */ /* The feature bitmap for virtio balloon */
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/types.h> #include <linux/types.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* Feature bits */ /* Feature bits */
......
#ifndef _LINUX_VIRTIO_CONSOLE_H #ifndef _LINUX_VIRTIO_CONSOLE_H
#define _LINUX_VIRTIO_CONSOLE_H #define _LINUX_VIRTIO_CONSOLE_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
* anyone can use the definitions to implement compatible drivers/servers. */ * anyone can use the definitions to implement compatible drivers/servers. */
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/types.h> #include <linux/types.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_RNG_H #define _LINUX_VIRTIO_RNG_H
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
#endif /* _LINUX_VIRTIO_RNG_H */ #endif /* _LINUX_VIRTIO_RNG_H */
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <net/9p/transport.h> #include <net/9p/transport.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/virtio.h> #include <linux/virtio.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_9p.h> #include <linux/virtio_9p.h>
#define VIRTQUEUE_NUM 128 #define VIRTQUEUE_NUM 128
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment