xen-project/xen
1
0 Fork 1
mirror of https://github.com/xen-project/xen.git synced 2026-10-29 18:50:05 +01:00
Code Issues Activity

bitkeeper revision 1.1108.33.24 (410e17ceXCIuaFvQA3AD25FUTF_Ohw)

Browse Source 
For clarity, all interface header files are in Xen's hypervisor-ifs
directory. This includes the I/O headers and the xend header.
This commit is contained in:
kaf24@scramble.cl.cam.ac.uk committed 2004-08-02 10:30:38 +00:00
1 parent 6aaa032c24
commit 87fdd59317
21 files changed
+17 -250
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.rootkeys
+3 -5
View File
@@ -56,7 +56,6 @@
4087cf0dvXL1PKX23t_LvO1wVPb7OA linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c
4087cf0dkVF3I19gpT1cNubeJgQr7g linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/main.c
4087cf0dlv1Dw4MAbeRStPPG8IvPPg linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/vbd.c
40880cc6hHg6s2cPHbqPNQxENefjoQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/blkif.h
4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile
4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
4075806d3fJqqDC1pYYPTZPc575iKg linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c
@@ -68,7 +67,6 @@
4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/Makefile
4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/Makefile
405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/Makefile
4097ba83Qy2eafeFUhGhm6_4iMIIDw linux-2.4.26-xen-sparse/arch/xen/drivers/netif/netif.h
3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
4075806dE5mQwlVUf8-t3YXjiMMWDQ linux-2.4.26-xen-sparse/arch/xen/kernel/ctrl_if.c
3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.26-xen-sparse/arch/xen/kernel/entry.S
@@ -249,11 +247,9 @@
40f5623bc8LKPRO09wY5dGDnY_YCpw linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/tlbflush.h
41062ab7uFxnCq-KtPeAm-aV8CicgA linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/vga.h
40f5623bxUbeGjkRrjDguCy_Gm8RLw linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/xor.h
40f5623bqoi4GEoBiiUc6TZk1HjsMg linux-2.6.7-xen-sparse/include/asm-xen/blkif.h
40f5623bYNP7tHE2zX6YQxp9Zq2utQ linux-2.6.7-xen-sparse/include/asm-xen/ctrl_if.h
40f5623b3Eqs8pAc5WpPX8_jTzV2qw linux-2.6.7-xen-sparse/include/asm-xen/evtchn.h
40f5623cndVUFlkxpf7Lfx7xu8madQ linux-2.6.7-xen-sparse/include/asm-xen/multicall.h
40f5623cTZ80EwjWUBlh44A9F9i_Lg linux-2.6.7-xen-sparse/include/asm-xen/netif.h
3f108af1ylCIm82H052FVTfXACBHrw linux-2.6.7-xen-sparse/include/asm-xen/proc_cmd.h
40f5623cBiQhPHILVLrl3xa6bDBaRg linux-2.6.7-xen-sparse/include/asm-xen/xen.h
3f689063BoW-HWV3auUJ-OqXfcGArw linux-2.6.7-xen-sparse/include/asm-xen/xen_proc.h
@@ -382,7 +378,6 @@
40dfd40aMOhnw_cQLve9462UR5yYxQ tools/python/xen/lowlevel/__init__.py
3fbd0a42l40lM0IICw2jXbQBVZSdZg tools/python/xen/lowlevel/xc/xc.c
40dc4076St6AmPTmQPrtQ6LGHPxGmw tools/python/xen/lowlevel/xu/__init__.py
40dc4076pVeE1kEEWzcUaNZin65kCA tools/python/xen/lowlevel/xu/domain_controller.h
40dc4076CwBYRTUQDdbdU1L6KcLgSw tools/python/xen/lowlevel/xu/xu.c
41052eb84_irpx0E9N_kqBp9eoin5g tools/python/xen/sv/CreateDomain.py
4107986egkTAMIHW7n-i4ShvCGWpLQ tools/python/xen/sv/Daemon.py
@@ -699,6 +694,9 @@
3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h
403cd194j2pyLqXD8FJ-ukvZzkPenw xen/include/hypervisor-ifs/event_channel.h
3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h
40f5623bqoi4GEoBiiUc6TZk1HjsMg xen/include/hypervisor-ifs/io/blkif.h
40dc4076pVeE1kEEWzcUaNZin65kCA xen/include/hypervisor-ifs/io/domain_controller.h
40f5623cTZ80EwjWUBlh44A9F9i_Lg xen/include/hypervisor-ifs/io/netif.h
4051db79512nOCGweabrFWO2M2h5ng xen/include/hypervisor-ifs/physdev.h
40589968wmhPmV5-ENbBYmMjnedgKw xen/include/hypervisor-ifs/sched_ctl.h
404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/hypervisor-ifs/trace.h
linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <linux/blkdev.h>
#include <asm/ctrl_if.h>
#include <asm/io.h>
#include "../blkif.h"
#include <asm-xen/hypervisor-ifs/io/blkif.h>
#if 0
#define ASSERT(_p) \
linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
+1 -5
View File
@@ -9,24 +9,20 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/hdreg.h>
#include <linux/blkdev.h>
#include <linux/major.h>
#include <asm/hypervisor-ifs/hypervisor-if.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <asm/uaccess.h>
#include "../blkif.h"
#include <asm-xen/hypervisor-ifs/io/blkif.h>
#if 0
#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <linux/kernel.h>
#include <asm/hypervisor-ifs/hypervisor-if.h>
#include <asm/hypervisor-ifs/dom0_ops.h>
#include <asm/domain_controller.h>
#include <asm/hypervisor-ifs/io/domain_controller.h>
#include <asm/ptrace.h>
#include <asm/page.h>
linux-2.6.7-xen-sparse/drivers/xen/blkback/common.h
+2 -4
View File
@@ -16,11 +16,9 @@
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/pgalloc.h>
#include <asm-xen/hypervisor-ifs/io/blkif.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <asm-xen/blkif.h>
#else
#include "../blkif.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define irqreturn_t void
#define IRQ_HANDLED
#endif
linux-2.6.7-xen-sparse/drivers/xen/blkfront/block.h
+1 -6
View File
@@ -9,27 +9,22 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/hdreg.h>
#include <linux/blkdev.h>
#include <linux/major.h>
#include <linux/devfs_fs_kernel.h>
#include <asm/hypervisor-ifs/hypervisor-if.h>
#include <asm-xen/hypervisor-ifs/io/blkif.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <asm/uaccess.h>
#include <asm-xen/blkif.h>
#if 0
#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
#else
linux-2.6.7-xen-sparse/drivers/xen/netback/common.h
+2 -4
View File
@@ -15,13 +15,11 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <asm-xen/ctrl_if.h>
#include <asm-xen/hypervisor-ifs/io/netif.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <asm-xen/netif.h>
#else
#include "../netif.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define irqreturn_t void
#define IRQ_HANDLED
#endif
linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c
+3 -8
View File
@@ -17,20 +17,15 @@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/init.h>
#include <asm/io.h>
#include <net/sock.h>
#include <net/pkt_sched.h>
#include <asm/io.h>
#include <asm-xen/evtchn.h>
#include <asm-xen/ctrl_if.h>
#include <asm-xen/hypervisor-ifs/io/netif.h>
#include <asm/page.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <asm-xen/netif.h>
#else
#include "../netif.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define irqreturn_t void
#define IRQ_HANDLED
#endif
linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <linux/kernel.h>
#include <asm/hypervisor-ifs/hypervisor-if.h>
#include <asm/hypervisor-ifs/dom0_ops.h>
#include <asm-xen/domain_controller.h>
#include <asm/hypervisor-ifs/io/domain_controller.h>
#include <asm/ptrace.h>
#include <asm/page.h>
#include <asm-xen/xen.h>
linux-2.6.7-xen-sparse/include/asm-xen/blkif.h
-115
View File
@@ -1,115 +0,0 @@
/******************************************************************************
* blkif.h
*
* Unified block-device I/O interface for Xen guest OSes.
*
* Copyright (c) 2003-2004, Keir Fraser
*/
#ifndef __SHARED_BLKIF_H__
#define __SHARED_BLKIF_H__
#define blkif_vdev_t u16
#define blkif_sector_t u64
#define BLKIF_OP_READ 0
#define BLKIF_OP_WRITE 1
#define BLKIF_OP_PROBE 2
/* NB. Ring size must be small enough for sizeof(blkif_ring_t) <= PAGE_SIZE. */
#define BLKIF_RING_SIZE 64
/*
* Maximum scatter/gather segments per request.
* This is carefully chosen so that sizeof(blkif_ring_t) <= PAGE_SIZE.
* NB. This could be 12 if the ring indexes weren't stored in the same page.
*/
#define BLKIF_MAX_SEGMENTS_PER_REQUEST 11
typedef struct {
u8 operation; /* 0: BLKIF_OP_??? */
u8 nr_segments; /* 1: number of segments */
blkif_vdev_t device; /* 2: only for read/write requests */
unsigned long id; /* 4: private guest value, echoed in resp */
blkif_sector_t sector_number; /* start sector idx on disk (r/w only) */
/* @f_a_s[2:0]=last_sect ; @f_a_s[5:3]=first_sect ; @f_a_s[:12]=frame. */
/* @first_sect: first sector in frame to transfer (inclusive). */
/* @last_sect: last sector in frame to transfer (inclusive). */
/* @frame: machine page frame number. */
unsigned long frame_and_sects[BLKIF_MAX_SEGMENTS_PER_REQUEST];
} PACKED blkif_request_t;
#define blkif_first_sect(_fas) (((_fas)>>3)&7)
#define blkif_last_sect(_fas) ((_fas)&7)
typedef struct {
unsigned long id; /* copied from request */
u8 operation; /* copied from request */
s16 status; /* BLKIF_RSP_??? */
} PACKED blkif_response_t;
#define BLKIF_RSP_ERROR -1 /* non-specific 'error' */
#define BLKIF_RSP_OKAY 0 /* non-specific 'okay' */
/*
* We use a special capitalised type name because it is _essential_ that all
* arithmetic on indexes is done on an integer type of the correct size.
*/
typedef u32 BLKIF_RING_IDX;
/*
* Ring indexes are 'free running'. That is, they are not stored modulo the
* size of the ring buffer. The following macro converts a free-running counter
* into a value that can directly index a ring-buffer array.
*/
#define MASK_BLKIF_IDX(_i) ((_i)&(BLKIF_RING_SIZE-1))
typedef struct {
BLKIF_RING_IDX req_prod; /* 0: Request producer. Updated by front-end. */
BLKIF_RING_IDX resp_prod; /* 4: Response producer. Updated by back-end. */
union { /* 8 */
blkif_request_t req;
blkif_response_t resp;
} PACKED ring[BLKIF_RING_SIZE];
} PACKED blkif_ring_t;
/*
* BLKIF_OP_PROBE:
* The request format for a probe request is constrained as follows:
* @operation == BLKIF_OP_PROBE
* @nr_segments == size of probe buffer in pages
* @device == unused (zero)
* @id == any value (echoed in response message)
* @sector_num == unused (zero)
* @frame_and_sects == list of page-sized buffers.
* (i.e., @first_sect == 0, @last_sect == 7).
*
* The response is a list of vdisk_t elements copied into the out-of-band
* probe buffer. On success the response status field contains the number
* of vdisk_t elements.
*/
/* XXX SMH: Type values below are chosen to match ide_xxx in Linux ide.h. */
#define VDISK_TYPE_FLOPPY 0x00
#define VDISK_TYPE_TAPE 0x01
#define VDISK_TYPE_CDROM 0x05
#define VDISK_TYPE_OPTICAL 0x07
#define VDISK_TYPE_DISK 0x20
#define VDISK_TYPE_MASK 0x3F
#define VDISK_TYPE(_x) ((_x) & VDISK_TYPE_MASK)
/* The top two bits of the type field encode various flags. */
#define VDISK_FLAG_RO 0x40
#define VDISK_FLAG_VIRT 0x80
#define VDISK_READONLY(_x) ((_x) & VDISK_FLAG_RO)
#define VDISK_VIRTUAL(_x) ((_x) & VDISK_FLAG_VIRT)
typedef struct {
blkif_sector_t capacity; /* 0: Size in terms of 512-byte sectors. */
blkif_vdev_t device; /* 8: Device number (opaque 16 bit value). */
u16 info; /* 10: Device type and flags (VDISK_*). */
} PACKED vdisk_t; /* 12 bytes */
#endif /* __SHARED_BLKIF_H__ */
linux-2.6.7-xen-sparse/include/asm-xen/netif.h
-88
View File
@@ -1,88 +0,0 @@
/******************************************************************************
* netif.h
*
* Unified network-device I/O interface for Xen guest OSes.
*
* Copyright (c) 2003-2004, Keir Fraser
*/
#ifndef __SHARED_NETIF_H__
#define __SHARED_NETIF_H__
typedef struct {
memory_t addr; /* 0: Machine address of packet. */
MEMORY_PADDING;
u16 id; /* 8: Echoed in response message. */
u16 size; /* 10: Packet size in bytes. */
} PACKED netif_tx_request_t; /* 12 bytes */
typedef struct {
u16 id; /* 0 */
s8 status; /* 2 */
u8 __pad; /* 3 */
} PACKED netif_tx_response_t; /* 4 bytes */
typedef struct {
u16 id; /* 0: Echoed in response message. */
} PACKED netif_rx_request_t; /* 2 bytes */
typedef struct {
memory_t addr; /* 0: Machine address of packet. */
MEMORY_PADDING;
u16 id; /* 8: */
s16 status; /* 10: -ve: BLKIF_RSP_* ; +ve: Rx'ed pkt size. */
} PACKED netif_rx_response_t; /* 12 bytes */
/*
* We use a special capitalised type name because it is _essential_ that all
* arithmetic on indexes is done on an integer type of the correct size.
*/
typedef u32 NETIF_RING_IDX;
/*
* Ring indexes are 'free running'. That is, they are not stored modulo the
* size of the ring buffer. The following macros convert a free-running counter
* into a value that can directly index a ring-buffer array.
*/
#define MASK_NETIF_RX_IDX(_i) ((_i)&(NETIF_RX_RING_SIZE-1))
#define MASK_NETIF_TX_IDX(_i) ((_i)&(NETIF_TX_RING_SIZE-1))
#define NETIF_TX_RING_SIZE 256
#define NETIF_RX_RING_SIZE 256
/* This structure must fit in a memory page. */
typedef struct {
/*
* Frontend places packets into ring at tx_req_prod.
* Frontend receives event when tx_resp_prod passes tx_event.
*/
NETIF_RING_IDX req_prod; /* 0 */
NETIF_RING_IDX resp_prod; /* 4 */
NETIF_RING_IDX event; /* 8 */
union { /* 12 */
netif_tx_request_t req;
netif_tx_response_t resp;
} PACKED ring[NETIF_TX_RING_SIZE];
} PACKED netif_tx_interface_t;
/* This structure must fit in a memory page. */
typedef struct {
/*
* Frontend places empty buffers into ring at rx_req_prod.
* Frontend receives event when rx_resp_prod passes rx_event.
*/
NETIF_RING_IDX req_prod; /* 0 */
NETIF_RING_IDX resp_prod; /* 4 */
NETIF_RING_IDX event; /* 8 */
union { /* 12 */
netif_rx_request_t req;
netif_rx_response_t resp;
} PACKED ring[NETIF_RX_RING_SIZE];
} PACKED netif_rx_interface_t;
/* Descriptor status values */
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
#define NETIF_RSP_OKAY 0
#endif
tools/Make.defs
-1
View File
@@ -1,7 +1,6 @@
# -*- mode: Makefile; -*-
XEN_HYPERVISOR_IFS = $(XEN_ROOT)/xen/include/hypervisor-ifs
XEN_LINUX_INCLUDE = $(XEN_ROOT)/linux-xen-sparse/include
XEN_XU = $(XEN_ROOT)/tools/python/xen/lowlevel/xu
XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
XEN_LIBXUTIL = $(XEN_ROOT)/tools/libxutil
tools/libxc/Makefile
-3
View File
@@ -14,9 +14,6 @@ INCLUDES += -I $(XEN_HYPERVISOR_IFS)
vpath %h $(XEN_LINUX_INCLUDE)
INCLUDES += -I $(XEN_LINUX_INCLUDE)
vpath %.h $(XEN_XU)
INCLUDES += -I $(XEN_XU)
vpath %c $(XEN_LIBXUTIL)
INCLUDES += -I $(XEN_LIBXUTIL)
tools/libxc/xc_private.h
+1 -2
View File
@@ -21,11 +21,10 @@
#include <dom0_ops.h>
#include <event_channel.h>
#include <sched_ctl.h>
#include <io/domain_controller.h>
#include <asm-xen/proc_cmd.h>
/* from xend/lib */
#include <domain_controller.h>
#define _PAGE_PRESENT 0x001
#define _PAGE_RW 0x002
tools/misc/Makefile
-1
View File
@@ -8,7 +8,6 @@ CFLAGS = -Wall -O3
INCLUDES += -I $(XEN_HYPERVISOR_IFS)
INCLUDES += -I $(XEN_LINUX_INCLUDE)
INCLUDES += -I $(XEN_XC)
INCLUDES += -I $(XEN_XU)
INCLUDES += -I $(XEN_LIBXC)
INCLUDES += -I $(XEN_LIBXUTIL)
tools/python/xen/lowlevel/xu/xu.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include <xc.h>
#include <hypervisor-if.h>
#include "domain_controller.h"
#include <io/domain_controller.h>
#include <asm-xen/proc_cmd.h>
tools/xentrace/Makefile
-1
View File
@@ -8,7 +8,6 @@ CFLAGS = -Wall -Werror -O3
CFLAGS += -I $(XEN_HYPERVISOR_IFS)
CFLAGS += -I $(XEN_LINUX_INCLUDE)
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_XU)
CFLAGS += -I $(XEN_LIBXC)
CFLAGS += -I $(XEN_LIBXUTIL)
tools/xfrd/Makefile
-3
View File
@@ -15,9 +15,6 @@ INCLUDES += -I $(XEN_HYPERVISOR_IFS)
vpath %h $(XEN_LINUX_INCLUDE)
INCLUDES += -I $(XEN_LINUX_INCLUDE)
vpath %.h $(XEN_XU)
INCLUDES += -I $(XEN_XU)
vpath %.h $(XEN_LIBXC)
INCLUDES += -I $(XEN_LIBXC)
linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/blkif.h → xen/include/hypervisor-ifs/io/blkif.h
View File
File renamed without changes.
tools/python/xen/lowlevel/xu/domain_controller.h → xen/include/hypervisor-ifs/io/domain_controller.h
View File
File renamed without changes.
linux-2.4.26-xen-sparse/arch/xen/drivers/netif/netif.h → xen/include/hypervisor-ifs/io/netif.h
View File
File renamed without changes.
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.