Revision 2446333c

b/blockdev.h
16 16
void blockdev_mark_auto_del(BlockDriverState *bs);
17 17
void blockdev_auto_del(BlockDriverState *bs);
18 18

  
19
typedef enum {
20
    IF_NONE,
21
    IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
22
    IF_COUNT
23
} BlockInterfaceType;
24

  
25 19
#define BLOCK_SERIAL_STRLEN 20
26 20

  
27
typedef struct DriveInfo {
21
struct DriveInfo {
28 22
    BlockDriverState *bdrv;
29 23
    char *id;
30 24
    const char *devaddr;
......
35 29
    QemuOpts *opts;
36 30
    char serial[BLOCK_SERIAL_STRLEN + 1];
37 31
    QTAILQ_ENTRY(DriveInfo) next;
38
} DriveInfo;
32
};
39 33

  
40 34
#define MAX_IDE_DEVS	2
41 35
#define MAX_SCSI_DEVS	7
b/hw/device-hotplug.c
25 25
#include "hw.h"
26 26
#include "boards.h"
27 27
#include "net.h"
28
#include "blockdev.h"
28 29

  
29 30
DriveInfo *add_init_drive(const char *optstr)
30 31
{
b/hw/etraxfs.c
31 31
#include "loader.h"
32 32
#include "elf.h"
33 33
#include "cris-boot.h"
34
#include "blockdev.h"
34 35

  
35 36
#define FLASH_SIZE 0x2000000
36 37
#define INTMEM_SIZE (128 * 1024)
b/hw/fdc.c
34 34
#include "isa.h"
35 35
#include "sysbus.h"
36 36
#include "qdev-addr.h"
37
#include "blockdev.h"
37 38

  
38 39
/********************************************************/
39 40
/* debug Floppy devices */
b/hw/fdc.h
2 2
#define HW_FDC_H
3 3

  
4 4
/* fdc.c */
5
#include "blockdev.h"
6 5
#define MAX_FD 2
7 6

  
8 7
typedef struct FDCtrl FDCtrl;
b/hw/gumstix.c
38 38
#include "sysemu.h"
39 39
#include "devices.h"
40 40
#include "boards.h"
41
#include "blockdev.h"
41 42

  
42 43
static const int sector_len = 128 * 1024;
43 44

  
b/hw/ide/core.c
30 30
#include "qemu-timer.h"
31 31
#include "sysemu.h"
32 32
#include "dma.h"
33
#include "blockdev.h"
33 34

  
34 35
#include <hw/ide/internal.h>
35 36

  
b/hw/ide/qdev.c
20 20
#include "dma.h"
21 21
#include "qemu-error.h"
22 22
#include <hw/ide/internal.h>
23
#include "blockdev.h"
23 24

  
24 25
/* --------------------------------- */
25 26

  
b/hw/mainstone.c
17 17
#include "mainstone.h"
18 18
#include "sysemu.h"
19 19
#include "flash.h"
20
#include "blockdev.h"
20 21

  
21 22
static struct keymap map[0xE0] = {
22 23
    [0 ... 0xDF] = { -1, -1 },
b/hw/mips_fulong2e.c
37 37
#include "elf.h"
38 38
#include "vt82c686.h"
39 39
#include "mc146818rtc.h"
40
#include "blockdev.h"
40 41

  
41 42
#define DEBUG_FULONG2E_INIT
42 43

  
b/hw/mips_jazz.c
36 36
#include "mips-bios.h"
37 37
#include "loader.h"
38 38
#include "mc146818rtc.h"
39
#include "blockdev.h"
39 40

  
40 41
enum jazz_model_e
41 42
{
b/hw/mips_malta.c
45 45
#include "loader.h"
46 46
#include "elf.h"
47 47
#include "mc146818rtc.h"
48
#include "blockdev.h"
48 49

  
49 50
//#define DEBUG_BOARD_INIT
50 51

  
b/hw/mips_r4k.c
22 22
#include "loader.h"
23 23
#include "elf.h"
24 24
#include "mc146818rtc.h"
25
#include "blockdev.h"
25 26

  
26 27
#define MAX_IDE_BUS 2
27 28

  
b/hw/musicpal.c
18 18
#include "flash.h"
19 19
#include "console.h"
20 20
#include "i2c.h"
21
#include "blockdev.h"
21 22

  
22 23
#define MP_MISC_BASE            0x80002000
23 24
#define MP_MISC_SIZE            0x00001000
b/hw/omap1.c
25 25
#include "soc_dma.h"
26 26
/* We use pc-style serial ports.  */
27 27
#include "pc.h"
28
#include "blockdev.h"
28 29

  
29 30
/* Should signal the TCMI/GPMC */
30 31
uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr)
b/hw/omap_sx1.c
32 32
#include "boards.h"
33 33
#include "arm-misc.h"
34 34
#include "flash.h"
35
#include "blockdev.h"
35 36

  
36 37
/*****************************************************************************/
37 38
/* Siemens SX1 Cellphone V1 */
b/hw/pc.c
39 39
#include "msix.h"
40 40
#include "sysbus.h"
41 41
#include "sysemu.h"
42
#include "blockdev.h"
42 43

  
43 44
/* output Bochs bios info messages */
44 45
//#define DEBUG_BIOS
b/hw/pc_piix.c
34 34
#include "kvm.h"
35 35
#include "sysemu.h"
36 36
#include "sysbus.h"
37
#include "blockdev.h"
37 38

  
38 39
#define MAX_IDE_BUS 2
39 40

  
b/hw/pci-hotplug.c
31 31
#include "scsi.h"
32 32
#include "virtio-blk.h"
33 33
#include "qemu-config.h"
34
#include "blockdev.h"
34 35

  
35 36
#if defined(TARGET_I386)
36 37
static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
b/hw/pcmcia.h
1 1
/* PCMCIA/Cardbus */
2 2

  
3 3
#include "qemu-common.h"
4
#include "blockdev.h"
5 4

  
6 5
typedef struct {
7 6
    qemu_irq irq;
b/hw/petalogix_s3adsp1800_mmu.c
34 34
#include "xilinx.h"
35 35
#include "loader.h"
36 36
#include "elf.h"
37
#include "blockdev.h"
37 38

  
38 39
#define LMB_BRAM_SIZE  (128 * 1024)
39 40
#define FLASH_SIZE     (16 * 1024 * 1024)
b/hw/ppc405_boards.c
31 31
#include "boards.h"
32 32
#include "qemu-log.h"
33 33
#include "loader.h"
34
#include "blockdev.h"
34 35

  
35 36
#define BIOS_FILENAME "ppc405_rom.bin"
36 37
#define BIOS_SIZE (2048 * 1024)
b/hw/ppc_newworld.c
66 66
#include "kvm.h"
67 67
#include "kvm_ppc.h"
68 68
#include "hw/usb.h"
69
#include "blockdev.h"
69 70

  
70 71
#define MAX_IDE_BUS 2
71 72
#define VGA_BIOS_SIZE 65536
b/hw/ppc_oldworld.c
41 41
#include "elf.h"
42 42
#include "kvm.h"
43 43
#include "kvm_ppc.h"
44
#include "blockdev.h"
44 45

  
45 46
#define MAX_IDE_BUS 2
46 47
#define VGA_BIOS_SIZE 65536
b/hw/ppc_prep.c
37 37
#include "ide.h"
38 38
#include "loader.h"
39 39
#include "mc146818rtc.h"
40
#include "blockdev.h"
40 41

  
41 42
//#define HARD_DEBUG_PPC_IO
42 43
//#define DEBUG_PPC_IO
b/hw/pxa2xx.c
15 15
#include "ssi.h"
16 16
#include "qemu-timer.h"
17 17
#include "qemu-char.h"
18
#include "blockdev.h"
18 19

  
19 20
static struct {
20 21
    target_phys_addr_t io_base;
b/hw/qdev-properties.c
1 1
#include "net.h"
2 2
#include "qdev.h"
3 3
#include "qerror.h"
4
#include "blockdev.h"
4 5

  
5 6
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
6 7
{
b/hw/qdev.c
29 29
#include "qdev.h"
30 30
#include "sysemu.h"
31 31
#include "monitor.h"
32
#include "blockdev.h"
32 33

  
33 34
static int qdev_hotplug = 0;
34 35

  
b/hw/qdev.h
2 2
#define QDEV_H
3 3

  
4 4
#include "hw.h"
5
#include "blockdev.h"
6 5
#include "qemu-queue.h"
7 6
#include "qemu-char.h"
8 7
#include "qemu-option.h"
b/hw/r2d.c
36 36
#include "loader.h"
37 37
#include "usb.h"
38 38
#include "flash.h"
39
#include "blockdev.h"
39 40

  
40 41
#define FLASH_BASE 0x00000000
41 42
#define FLASH_SIZE 0x02000000
b/hw/realview.c
18 18
#include "boards.h"
19 19
#include "bitbang_i2c.h"
20 20
#include "sysbus.h"
21
#include "blockdev.h"
21 22

  
22 23
#define SMP_BOOT_ADDR 0xe0000000
23 24

  
b/hw/scsi-bus.c
3 3
#include "scsi.h"
4 4
#include "scsi-defs.h"
5 5
#include "qdev.h"
6
#include "blockdev.h"
6 7

  
7 8
static struct BusInfo scsi_bus_info = {
8 9
    .name  = "SCSI",
b/hw/scsi-disk.c
36 36
#include "scsi.h"
37 37
#include "scsi-defs.h"
38 38
#include "sysemu.h"
39
#include "blockdev.h"
39 40

  
40 41
#define SCSI_DMA_BUF_SIZE    131072
41 42
#define SCSI_MAX_INQUIRY_LEN 256
b/hw/scsi-generic.c
14 14
#include "qemu-common.h"
15 15
#include "qemu-error.h"
16 16
#include "scsi.h"
17
#include "blockdev.h"
17 18

  
18 19
#ifdef __linux__
19 20

  
b/hw/spitz.c
22 22
#include "block.h"
23 23
#include "audio/audio.h"
24 24
#include "boards.h"
25
#include "blockdev.h"
25 26

  
26 27
#undef REG_FMT
27 28
#define REG_FMT			"0x%02lx"
b/hw/sun4m.c
40 40
#include "qdev-addr.h"
41 41
#include "loader.h"
42 42
#include "elf.h"
43
#include "blockdev.h"
43 44

  
44 45
//#define DEBUG_IRQ
45 46

  
b/hw/sun4u.c
37 37
#include "ide.h"
38 38
#include "loader.h"
39 39
#include "elf.h"
40
#include "blockdev.h"
40 41

  
41 42
//#define DEBUG_IRQ
42 43
//#define DEBUG_EBUS
b/hw/tosa.c
19 19
#include "boards.h"
20 20
#include "i2c.h"
21 21
#include "ssi.h"
22
#include "blockdev.h"
22 23

  
23 24
#define TOSA_RAM    0x04000000
24 25
#define TOSA_ROM	0x00800000
b/hw/usb-msd.c
15 15
#include "console.h"
16 16
#include "monitor.h"
17 17
#include "sysemu.h"
18
#include "blockdev.h"
18 19

  
19 20
//#define DEBUG_MSD
20 21

  
b/hw/versatilepb.c
16 16
#include "pci.h"
17 17
#include "usb-ohci.h"
18 18
#include "boards.h"
19
#include "blockdev.h"
19 20

  
20 21
/* Primary interrupt controller.  */
21 22

  
b/hw/virtio-blk.c
13 13

  
14 14
#include <qemu-common.h>
15 15
#include "qemu-error.h"
16
#include "blockdev.h"
16 17
#include "virtio-blk.h"
17 18
#ifdef __linux__
18 19
# include <scsi/sg.h>
b/hw/virtio-pci.c
24 24
#include "net.h"
25 25
#include "loader.h"
26 26
#include "kvm.h"
27
#include "blockdev.h"
27 28

  
28 29
/* from Linux's linux/virtio_pci.h */
29 30

  
b/hw/xen_backend.h
4 4
#include "xen_common.h"
5 5
#include "sysemu.h"
6 6
#include "net.h"
7
#include "block_int.h"
8
#include "blockdev.h"
9 7

  
10 8
/* ------------------------------------------------------------- */
11 9

  
b/hw/xen_devconfig.c
1 1
#include "xen_backend.h"
2
#include "blockdev.h"
3
#include "block_int.h" /* XXX */
2 4

  
3 5
/* ------------------------------------------------------------- */
4 6

  
b/hw/xen_disk.c
41 41
#include "qemu-char.h"
42 42
#include "xen_blkif.h"
43 43
#include "xen_backend.h"
44
#include "blockdev.h"
44 45

  
45 46
/* ------------------------------------------------------------- */
46 47

  
b/hw/xen_machine_pv.c
28 28
#include "boards.h"
29 29
#include "xen_backend.h"
30 30
#include "xen_domainbuild.h"
31
#include "blockdev.h"
31 32

  
32 33
static void xen_init_pv(ram_addr_t ram_size,
33 34
			const char *boot_device,
b/qemu-common.h
201 201
typedef struct HCIInfo HCIInfo;
202 202
typedef struct AudioState AudioState;
203 203
typedef struct BlockDriverState BlockDriverState;
204
typedef struct DriveInfo DriveInfo;
204 205
typedef struct DisplayState DisplayState;
205 206
typedef struct DisplayChangeListener DisplayChangeListener;
206 207
typedef struct DisplaySurface DisplaySurface;
......
231 232

  
232 233
typedef uint64_t pcibus_t;
233 234

  
235
typedef enum {
236
    IF_NONE,
237
    IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
238
    IF_COUNT
239
} BlockInterfaceType;
240

  
234 241
void cpu_exec_init_all(unsigned long tb_size);
235 242

  
236 243
/* CPU save/load.  */

Also available in: Unified diff