diff options
| -rw-r--r-- | block-raw-posix.c | 20 | ||||
| -rw-r--r-- | cmd.c | 2 | ||||
| -rw-r--r-- | cmd.h | 2 | ||||
| -rw-r--r-- | dma-helpers.c | 2 |
4 files changed, 12 insertions, 14 deletions
diff --git a/block-raw-posix.c b/block-raw-posix.c index 50aad587dc..4da5ae4397 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -876,15 +876,15 @@ static void raw_flush(BlockDriverState *bs) } BlockDriver bdrv_raw = { - "raw", - sizeof(BDRVRawState), - NULL, /* no probe for protocols */ - raw_open, - NULL, - NULL, - raw_close, - raw_create, - raw_flush, + .format_name = "raw", + .instance_size = sizeof(BDRVRawState), + .bdrv_probe = NULL, /* no probe for protocols */ + .bdrv_open = raw_open, + .bdrv_read = raw_read, + .bdrv_write = raw_write, + .bdrv_close = raw_close, + .bdrv_create = raw_create, + .bdrv_flush = raw_flush, #ifdef CONFIG_AIO .bdrv_aio_read = raw_aio_read, @@ -893,8 +893,6 @@ BlockDriver bdrv_raw = { .aiocb_size = sizeof(RawAIOCB), #endif - .bdrv_read = raw_read, - .bdrv_write = raw_write, .bdrv_truncate = raw_truncate, .bdrv_getlength = raw_getlength, }; @@ -212,8 +212,6 @@ command_loop(void) # include <histedit.h> #endif -extern char *progname; - static char * get_prompt(void) { @@ -75,4 +75,6 @@ enum { extern void timestr(struct timeval *tv, char *str, size_t sz, int flags); +extern char *progname; + #endif /* __COMMAND_H__ */ diff --git a/dma-helpers.c b/dma-helpers.c index 1469e34df9..f9eb2240b2 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -81,7 +81,7 @@ static void dma_bdrv_unmap(DMAAIOCB *dbs) } } -void dma_bdrv_cb(void *opaque, int ret) +static void dma_bdrv_cb(void *opaque, int ret) { DMAAIOCB *dbs = (DMAAIOCB *)opaque; target_phys_addr_t cur_addr, cur_len; |