Message ID | BANLkTi=R9VtWdUoF47s9QxpNbwpHj_f+_Q@mail.gmail.com |
---|---|
State | New |
Headers | show |
Am 09.06.2011 07:06, schrieb Devin Nakamura: > Signed-off-by: Devin Nakamura <devin122@gmail.com> > --- > block.h | 6 +++--- > block_int.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/block.h b/block.h > index da7d39c..859d1d9 100644 > --- a/block.h > +++ b/block.h > @@ -110,7 +110,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res); > typedef struct BlockDriverAIOCB BlockDriverAIOCB; > typedef void BlockDriverCompletionFunc(void *opaque, int ret); > typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector, > - int sector_num); > + int sector_num); > BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num, > QEMUIOVector *iov, int nb_sectors, > BlockDriverCompletionFunc *cb, void *opaque); > @@ -118,7 +118,7 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState > *bs, int64_t sector_num, The patch is corrupted by this line wrap. This won't happen if you use git send-email. Stefan posted his config for GMail recently, maybe it helps you: > The GMail web interface *always* wraps lines, there doesn't seem to be > a way to disable that. If you send it through GMail's SMTP servers > with git-send-email(1) you'll be fine. > > Here is my .gitconfig: > [sendemail] > smtpserver = smtp.gmail.com > smtpserverport = 587 > smtpencryption = tls > smtpuser = stefanha@gmail.com > chainreplyto = false Kevin
diff --git a/block.h b/block.h index da7d39c..859d1d9 100644 --- a/block.h +++ b/block.h @@ -110,7 +110,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res); typedef struct BlockDriverAIOCB BlockDriverAIOCB; typedef void BlockDriverCompletionFunc(void *opaque, int ret); typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector, - int sector_num); + int sector_num); BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *iov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); @@ -118,7 +118,7 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *iov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque); + BlockDriverCompletionFunc *cb, void *opaque); void bdrv_aio_cancel(BlockDriverAIOCB *acb); typedef struct BlockRequest { @@ -150,7 +150,7 @@ void bdrv_close_all(void); int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_has_zero_init(BlockDriverState *bs); int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, - int *pnum); + int *pnum); #define BIOS_ATA_TRANSLATION_AUTO 0 #define BIOS_ATA_TRANSLATION_NONE 1 diff --git a/block_int.h b/block_int.h index eefbd34..5ffc1a9 100644 --- a/block_int.h +++ b/block_int.h @@ -213,8 +213,8 @@ struct BlockDriverState { void *private; }; -#define CHANGE_MEDIA 0x01 -#define CHANGE_SIZE 0x02 +#define CHANGE_MEDIA 0x01 +#define CHANGE_SIZE 0x02 struct BlockDriverAIOCB { AIOPool *pool;
Signed-off-by: Devin Nakamura <devin122@gmail.com> --- block.h | 6 +++--- block_int.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)