redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Make lguest_launcher.h types userspace-friendly 

lguest_launcher.h uses "u32" not "__u32", which sets a bad example.  Fix that,
and include <linux/types.h>.

This means we need to use -I on the Launcher build line so types.h is found.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
hifive-unleashed-5.1
Rusty Russell 2007-10-22 10:56:24 +10:00
parent 9653c4aff9
commit b45d8cb054
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/lguest/Makefile
View File

@ -11,7 +11,7 @@ endif
include $(KBUILD_OUTPUT)/.config include $(KBUILD_OUTPUT)/.config
LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000) LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000)
CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -Wl,-T,lguest.lds CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -Wl,-T,lguest.lds
LDLIBS:=-lz LDLIBS:=-lz
# Removing this works for some versions of ld.so (eg. Ubuntu Feisty) and # Removing this works for some versions of ld.so (eg. Ubuntu Feisty) and
# not others (eg. FC7). # not others (eg. FC7).

4
Documentation/lguest/lguest.c
View File

@ -45,8 +45,8 @@ typedef unsigned long long u64;
typedef uint32_t u32; typedef uint32_t u32;
typedef uint16_t u16; typedef uint16_t u16;
typedef uint8_t u8; typedef uint8_t u8;
#include "../../include/linux/lguest_launcher.h" #include "linux/lguest_launcher.h"
#include "../../include/asm-x86/e820.h" #include "asm-x86/e820.h"
/*:*/ /*:*/
#define PAGE_PRESENT 0x7 /* Present, RW, Execute */ #define PAGE_PRESENT 0x7 /* Present, RW, Execute */

21
include/linux/lguest_launcher.h
View File

@ -1,6 +1,7 @@
#ifndef _ASM_LGUEST_USER #ifndef _ASM_LGUEST_USER
#define _ASM_LGUEST_USER #define _ASM_LGUEST_USER
/* Everything the "lguest" userspace program needs to know. */ /* Everything the "lguest" userspace program needs to know. */
#include <linux/types.h>
/* They can register up to 32 arrays of lguest_dma. */ /* They can register up to 32 arrays of lguest_dma. */
#define LGUEST_MAX_DMA 32 #define LGUEST_MAX_DMA 32
/* At most we can dma 16 lguest_dma in one op. */ /* At most we can dma 16 lguest_dma in one op. */
@ -37,9 +38,9 @@
struct lguest_dma struct lguest_dma
{ {
/* 0 if free to be used, filled by the Host. */ /* 0 if free to be used, filled by the Host. */
u32 used_len; __u32 used_len;
__u16 len[LGUEST_MAX_DMA_SECTIONS];
unsigned long addr[LGUEST_MAX_DMA_SECTIONS]; unsigned long addr[LGUEST_MAX_DMA_SECTIONS];
u16 len[LGUEST_MAX_DMA_SECTIONS];
}; };
/*:*/ /*:*/
@ -52,11 +53,11 @@ struct lguest_block_page
{ {
/* 0 is a read, 1 is a write. */ /* 0 is a read, 1 is a write. */
int type; int type;
u32 sector; /* Offset in device = sector * 512. */ __u32 sector; /* Offset in device = sector * 512. */
u32 bytes; /* Length expected to be read/written in bytes */ __u32 bytes; /* Length expected to be read/written in bytes */
/* 0 = pending, 1 = done, 2 = done, error */ /* 0 = pending, 1 = done, 2 = done, error */
int result; int result;
u32 num_sectors; /* Disk length = num_sectors * 512 */ __u32 num_sectors; /* Disk length = num_sectors * 512 */
}; };
/*D:520 The network device is basically a memory page where all the Guests on /*D:520 The network device is basically a memory page where all the Guests on
@ -86,21 +87,21 @@ struct lguest_net
*/ */
struct lguest_device_desc { struct lguest_device_desc {
/* The device type: console, network, disk etc. */ /* The device type: console, network, disk etc. */
u16 type; __u16 type;
#define LGUEST_DEVICE_T_CONSOLE 1 #define LGUEST_DEVICE_T_CONSOLE 1
#define LGUEST_DEVICE_T_NET 2 #define LGUEST_DEVICE_T_NET 2
#define LGUEST_DEVICE_T_BLOCK 3 #define LGUEST_DEVICE_T_BLOCK 3
/* The specific features of this device: these depends on device type /* The specific features of this device: these depends on device type
* except for LGUEST_DEVICE_F_RANDOMNESS. */ * except for LGUEST_DEVICE_F_RANDOMNESS. */
u16 features; __u16 features;
#define LGUEST_NET_F_NOCSUM 0x4000 /* Don't bother checksumming */ #define LGUEST_NET_F_NOCSUM 0x4000 /* Don't bother checksumming */
#define LGUEST_DEVICE_F_RANDOMNESS 0x8000 /* IRQ is fairly random */ #define LGUEST_DEVICE_F_RANDOMNESS 0x8000 /* IRQ is fairly random */
/* This is how the Guest reports status of the device: the Host can set /* This is how the Guest reports status of the device: the Host can set
* LGUEST_DEVICE_S_REMOVED to indicate removal, but the rest are only * LGUEST_DEVICE_S_REMOVED to indicate removal, but the rest are only
* ever manipulated by the Guest, and only ever set. */ * ever manipulated by the Guest, and only ever set. */
u16 status; __u16 status;
/* 256 and above are device specific. */ /* 256 and above are device specific. */
#define LGUEST_DEVICE_S_ACKNOWLEDGE 1 /* We have seen device. */ #define LGUEST_DEVICE_S_ACKNOWLEDGE 1 /* We have seen device. */
#define LGUEST_DEVICE_S_DRIVER 2 /* We have found a driver */ #define LGUEST_DEVICE_S_DRIVER 2 /* We have found a driver */
@ -111,8 +112,8 @@ struct lguest_device_desc {
/* Each device exists somewhere in Guest physical memory, over some /* Each device exists somewhere in Guest physical memory, over some
* number of pages. */ * number of pages. */
u16 num_pages; __u16 num_pages;
u32 pfn; __u32 pfn;
}; };
/*:*/ /*:*/