mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sheepdog: explicitly set copies as type uint8_t

Browse Source 
'copies' is actually uint8_t since day one, but request headers and some helper
functions parameterize it as uint32_t for unknown reasons and effectively
reserve 24 bytes for possible future use. This patch explicitly set the correct
for copies and reserve the left bytes.

This is a preparation patch that allow passing copy_policy in request header.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Liu Yuan <namei.unix@gmail.com>
Acked-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Liu Yuan 2013-10-23 16:51:51 +08:00 committed by Kevin Wolf
parent 61ed268453
commit 29a67f7e92
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/sheepdog.c
View File

@ -125,8 +125,8 @@ typedef struct SheepdogObjReq {
uint32_t data_length; uint32_t data_length;
uint64_t oid; uint64_t oid;
uint64_t cow_oid; uint64_t cow_oid;
uint32_t copies; uint8_t copies;
uint32_t rsvd; uint8_t reserved[7];
uint64_t offset; uint64_t offset;
} SheepdogObjReq; } SheepdogObjReq;
@ -138,7 +138,8 @@ typedef struct SheepdogObjRsp {
uint32_t id; uint32_t id;
uint32_t data_length; uint32_t data_length;
uint32_t result; uint32_t result;
uint32_t copies; uint8_t copies;
uint8_t reserved[3];
uint32_t pad[6]; uint32_t pad[6];
} SheepdogObjRsp; } SheepdogObjRsp;
@ -151,7 +152,8 @@ typedef struct SheepdogVdiReq {
uint32_t data_length; uint32_t data_length;
uint64_t vdi_size; uint64_t vdi_size;
uint32_t vdi_id; uint32_t vdi_id;
uint32_t copies; uint8_t copies;
uint8_t reserved[3];
uint32_t snapid; uint32_t snapid;
uint32_t pad[3]; uint32_t pad[3];
} SheepdogVdiReq; } SheepdogVdiReq;
@ -1081,7 +1083,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
return 0; return 0;
} }
static int read_write_object(int fd, char *buf, uint64_t oid, int copies, static int read_write_object(int fd, char *buf, uint64_t oid, uint8_t copies,
unsigned int datalen, uint64_t offset, unsigned int datalen, uint64_t offset,
bool write, bool create, uint32_t cache_flags) bool write, bool create, uint32_t cache_flags)
{ {
@ -1129,7 +1131,7 @@ static int read_write_object(int fd, char *buf, uint64_t oid, int copies,
} }
} }
static int read_object(int fd, char *buf, uint64_t oid, int copies, static int read_object(int fd, char *buf, uint64_t oid, uint8_t copies,
unsigned int datalen, uint64_t offset, unsigned int datalen, uint64_t offset,
uint32_t cache_flags) uint32_t cache_flags)
{ {
@ -1137,7 +1139,7 @@ static int read_object(int fd, char *buf, uint64_t oid, int copies,
false, cache_flags); false, cache_flags);
} }
static int write_object(int fd, char *buf, uint64_t oid, int copies, static int write_object(int fd, char *buf, uint64_t oid, uint8_t copies,
unsigned int datalen, uint64_t offset, bool create, unsigned int datalen, uint64_t offset, bool create,
uint32_t cache_flags) uint32_t cache_flags)
{ {