Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/lguest/lguest.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <signal.h>

#include "linux/lguest_launcher.h"

#include "linux/virtio_config.h"

#include <linux/virtio_ids.h>

#include "linux/virtio_net.h"

#include "linux/virtio_blk.h"

#include "linux/virtio_console.h"

drivers/block/virtio_blk.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include <linux/blkdev.h>

#include <linux/hdreg.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_blk.h>

#include <linux/scatterlist.h>

drivers/char/hw_random/virtio-rng.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/scatterlist.h>

#include <linux/spinlock.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_rng.h>



/* The host will fill any buffer we give it with sweet, sweet randomness.  We

drivers/char/virtio_console.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/err.h>

#include <linux/init.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_console.h>

#include "hvc_console.h"

drivers/net/virtio_net.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/ethtool.h>

#include <linux/module.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_net.h>

#include <linux/scatterlist.h>

#include <linux/if_vlan.h>