xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-19 11:41:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nbd: accept relative path to Unix socket

Browse Source 
Adding the "is_unix" member now will simplify the parsing of NBD URIs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-11-04 12:56:39 +01:00
parent 7e7f4a0efc
commit d04b0bbbc9
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/nbd.c
View File

@ -55,7 +55,6 @@ typedef struct BDRVNBDState {
uint32_t nbdflags; uint32_t nbdflags;
off_t size; off_t size;
size_t blocksize; size_t blocksize;
char *export_name; /* An NBD server may export several devices */
CoMutex send_mutex; CoMutex send_mutex;
CoMutex free_sema; CoMutex free_sema;
@ -65,13 +64,12 @@ typedef struct BDRVNBDState {
Coroutine *recv_coroutine[MAX_NBD_REQUESTS]; Coroutine *recv_coroutine[MAX_NBD_REQUESTS];
struct nbd_reply reply; struct nbd_reply reply;
/* If it begins with '/', this is a UNIX domain socket. Otherwise, int is_unix;
* it's a string of the form <hostname|ip4|\[ip6\]>:port
*/
char *host_spec; char *host_spec;
char *export_name; /* An NBD server may export several devices */
} BDRVNBDState; } BDRVNBDState;
static int nbd_config(BDRVNBDState *s, const char *filename, int flags) static int nbd_config(BDRVNBDState *s, const char *filename)
{ {
char *file; char *file;
char *export_name; char *export_name;
@ -98,11 +96,10 @@ static int nbd_config(BDRVNBDState *s, const char *filename, int flags)
/* are we a UNIX or TCP socket? */ /* are we a UNIX or TCP socket? */
if (strstart(host_spec, "unix:", &unixpath)) { if (strstart(host_spec, "unix:", &unixpath)) {
if (unixpath[0] != '/') { /* We demand an absolute path*/ s->is_unix = true;
goto out;
}
s->host_spec = g_strdup(unixpath); s->host_spec = g_strdup(unixpath);
} else { } else {
s->is_unix = false;
s->host_spec = g_strdup(host_spec); s->host_spec = g_strdup(host_spec);
} }
@ -262,7 +259,7 @@ static int nbd_establish_connection(BlockDriverState *bs)
off_t size; off_t size;
size_t blocksize; size_t blocksize;
if (s->host_spec[0] == '/') { if (s->is_unix) {
sock = unix_socket_outgoing(s->host_spec); sock = unix_socket_outgoing(s->host_spec);
} else { } else {
sock = tcp_socket_outgoing_spec(s->host_spec); sock = tcp_socket_outgoing_spec(s->host_spec);
@ -320,7 +317,7 @@ static int nbd_open(BlockDriverState *bs, const char* filename, int flags)
qemu_co_mutex_init(&s->free_sema); qemu_co_mutex_init(&s->free_sema);
/* Pop the config into our state object. Exit if invalid. */ /* Pop the config into our state object. Exit if invalid. */
result = nbd_config(s, filename, flags); result = nbd_config(s, filename);
if (result != 0) { if (result != 0) {
return result; return result;
} }