Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
tools
/
lguest
/
lguest.c
diff --git
a/kernel/tools/lguest/lguest.c
b/kernel/tools/lguest/lguest.c
index
e440524
..
80159e6
100644
(file)
--- a/
kernel/tools/lguest/lguest.c
+++ b/
kernel/tools/lguest/lguest.c
@@
-125,7
+125,11
@@
struct device_list {
/* The list of Guest devices, based on command line arguments. */
static struct device_list devices;
/* The list of Guest devices, based on command line arguments. */
static struct device_list devices;
-struct virtio_pci_cfg_cap {
+/*
+ * Just like struct virtio_pci_cfg_cap in uapi/linux/virtio_pci.h,
+ * but uses a u32 explicitly for the data.
+ */
+struct virtio_pci_cfg_cap_u32 {
struct virtio_pci_cap cap;
u32 pci_cfg_data; /* Data for BAR access. */
};
struct virtio_pci_cap cap;
u32 pci_cfg_data; /* Data for BAR access. */
};
@@
-157,7
+161,7
@@
struct pci_config {
struct virtio_pci_notify_cap notify;
struct virtio_pci_cap isr;
struct virtio_pci_cap device;
struct virtio_pci_notify_cap notify;
struct virtio_pci_cap isr;
struct virtio_pci_cap device;
- struct virtio_pci_cfg_cap cfg_access;
+ struct virtio_pci_cfg_cap
_u32
cfg_access;
};
/* The device structure describes a single device. */
};
/* The device structure describes a single device. */
@@
-1291,7
+1295,7
@@
static struct device *dev_and_reg(u32 *reg)
* only fault if they try to write with some invalid bar/offset/length.
*/
static bool valid_bar_access(struct device *d,
* only fault if they try to write with some invalid bar/offset/length.
*/
static bool valid_bar_access(struct device *d,
- struct virtio_pci_cfg_cap *cfg_access)
+ struct virtio_pci_cfg_cap
_u32
*cfg_access)
{
/* We only have 1 bar (BAR0) */
if (cfg_access->cap.bar != 0)
{
/* We only have 1 bar (BAR0) */
if (cfg_access->cap.bar != 0)