ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd: add more constants 

Avoid magic numbers and magic size computations; hide them behind
constants.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-08-22 15:13:30 +02:00
parent 89c33337fd
commit fa26c26b07
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nbd.c
View File

@ -57,9 +57,12 @@
/* This is all part of the "official" NBD API */ /* This is all part of the "official" NBD API */
#define NBD_REQUEST_SIZE (4 + 4 + 8 + 8 + 4)
#define NBD_REPLY_SIZE (4 + 4 + 8) #define NBD_REPLY_SIZE (4 + 4 + 8)
#define NBD_REQUEST_MAGIC 0x25609513 #define NBD_REQUEST_MAGIC 0x25609513
#define NBD_REPLY_MAGIC 0x67446698 #define NBD_REPLY_MAGIC 0x67446698
#define NBD_OPTS_MAGIC 0x49484156454F5054LL
#define NBD_CLIENT_MAGIC 0x0000420281861253LL
#define NBD_SET_SOCK _IO(0xab, 0) #define NBD_SET_SOCK _IO(0xab, 0)
#define NBD_SET_BLKSIZE _IO(0xab, 1) #define NBD_SET_BLKSIZE _IO(0xab, 1)
@ -213,7 +216,7 @@ static int nbd_send_negotiate(int csock, off_t size, uint32_t flags)
/* Negotiate /* Negotiate
[ 0 .. 7] passwd ("NBDMAGIC") [ 0 .. 7] passwd ("NBDMAGIC")
[ 8 .. 15] magic (0x00420281861253) [ 8 .. 15] magic (NBD_CLIENT_MAGIC)
[16 .. 23] size [16 .. 23] size
[24 .. 27] flags [24 .. 27] flags
[28 .. 151] reserved (0) [28 .. 151] reserved (0)
@ -224,7 +227,7 @@ static int nbd_send_negotiate(int csock, off_t size, uint32_t flags)
TRACE("Beginning negotiation."); TRACE("Beginning negotiation.");
memcpy(buf, "NBDMAGIC", 8); memcpy(buf, "NBDMAGIC", 8);
cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL); cpu_to_be64w((uint64_t*)(buf + 8), NBD_CLIENT_MAGIC);
cpu_to_be64w((uint64_t*)(buf + 16), size); cpu_to_be64w((uint64_t*)(buf + 16), size);
cpu_to_be32w((uint32_t*)(buf + 24), cpu_to_be32w((uint32_t*)(buf + 24),
flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM | flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |
@ -295,7 +298,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
uint32_t namesize; uint32_t namesize;
TRACE("Checking magic (opts_magic)"); TRACE("Checking magic (opts_magic)");
if (magic != 0x49484156454F5054LL) { if (magic != NBD_OPTS_MAGIC) {
LOG("Bad magic received"); LOG("Bad magic received");
goto fail; goto fail;
} }
@ -334,7 +337,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
} else { } else {
TRACE("Checking magic (cli_magic)"); TRACE("Checking magic (cli_magic)");
if (magic != 0x00420281861253LL) { if (magic != NBD_CLIENT_MAGIC) {
LOG("Bad magic received"); LOG("Bad magic received");
goto fail; goto fail;
} }
@ -477,7 +480,7 @@ int nbd_client(int fd)
ssize_t nbd_send_request(int csock, struct nbd_request *request) ssize_t nbd_send_request(int csock, struct nbd_request *request)
{ {
uint8_t buf[4 + 4 + 8 + 8 + 4]; uint8_t buf[NBD_REQUEST_SIZE];
ssize_t ret; ssize_t ret;
cpu_to_be32w((uint32_t*)buf, NBD_REQUEST_MAGIC); cpu_to_be32w((uint32_t*)buf, NBD_REQUEST_MAGIC);
@ -504,7 +507,7 @@ ssize_t nbd_send_request(int csock, struct nbd_request *request)
static ssize_t nbd_receive_request(int csock, struct nbd_request *request) static ssize_t nbd_receive_request(int csock, struct nbd_request *request)
{ {
uint8_t buf[4 + 4 + 8 + 8 + 4]; uint8_t buf[NBD_REQUEST_SIZE];
uint32_t magic; uint32_t magic;
ssize_t ret; ssize_t ret;
@ -582,7 +585,7 @@ ssize_t nbd_receive_reply(int csock, struct nbd_reply *reply)
static ssize_t nbd_send_reply(int csock, struct nbd_reply *reply) static ssize_t nbd_send_reply(int csock, struct nbd_reply *reply)
{ {
uint8_t buf[4 + 4 + 8]; uint8_t buf[NBD_REPLY_SIZE];
ssize_t ret; ssize_t ret;
/* Reply /* Reply