AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

lguest: Convert entropy device to virtio 1.0 PCI.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2015-02-11 15:17:01 +10:30
parent bf6d40344d
commit 0d5b5d399f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/lguest/lguest.c
View File

@ -71,7 +71,7 @@ typedef uint8_t u8;
#include "../../include/uapi/linux/virtio_net.h" #include "../../include/uapi/linux/virtio_net.h"
#include "../../include/uapi/linux/virtio_blk.h" #include "../../include/uapi/linux/virtio_blk.h"
#include <linux/virtio_console.h> #include <linux/virtio_console.h>
#include <linux/virtio_rng.h> #include "../../include/uapi/linux/virtio_rng.h"
#include <linux/virtio_ring.h> #include <linux/virtio_ring.h>
#include "../../include/uapi/linux/virtio_pci.h" #include "../../include/uapi/linux/virtio_pci.h"
#include <asm/bootparam.h> #include <asm/bootparam.h>
@ -2224,7 +2224,6 @@ static void init_pci_config(struct pci_config *pci, u16 type,
* *
* eg : * eg :
* VIRTIO_ID_CONSOLE: class = 0x07, subclass = 0x00 * VIRTIO_ID_CONSOLE: class = 0x07, subclass = 0x00
* VIRTIO_ID_RNG: class = 0xff, subclass = 0
*/ */
pci->class = class; pci->class = class;
pci->subclass = subclass; pci->subclass = subclass;
@ -2816,13 +2815,16 @@ static void setup_rng(void)
rng_info->rfd = open_or_die("/dev/urandom", O_RDONLY); rng_info->rfd = open_or_die("/dev/urandom", O_RDONLY);
/* Create the new device. */ /* Create the new device. */
dev = new_device("rng", VIRTIO_ID_RNG); dev = new_pci_device("rng", VIRTIO_ID_RNG, 0xff, 0);
dev->priv = rng_info; dev->priv = rng_info;
/* The device has one virtqueue, where the Guest places inbufs. */ /* The device has one virtqueue, where the Guest places inbufs. */
add_virtqueue(dev, VIRTQUEUE_NUM, rng_input); add_pci_virtqueue(dev, rng_input);
verbose("device %u: rng\n", devices.device_num++); /* We don't have any configuration space */
no_device_config(dev);
verbose("device %u: rng\n", devices.device_num);
} }
/* That's the end of device setup. */ /* That's the end of device setup. */