OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

open /dev/nbd in nbd_client_thread 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-12-06 09:07:00 +01:00
parent 9faf31b68f
commit a6ac2313a8
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qemu-nbd.c
View File

@ -37,7 +37,6 @@
static NBDExport *exp; static NBDExport *exp;
static int verbose; static int verbose;
static char *device;
static char *srcpath; static char *srcpath;
static char *sockpath; static char *sockpath;
static bool sigterm_reported; static bool sigterm_reported;
@ -178,6 +177,7 @@ static void termsig_handler(int signum)
static void *show_parts(void *arg) static void *show_parts(void *arg)
{ {
char *device = arg;
int nbd; int nbd;
/* linux just needs an open() to trigger /* linux just needs an open() to trigger
@ -194,11 +194,11 @@ static void *show_parts(void *arg)
static void *nbd_client_thread(void *arg) static void *nbd_client_thread(void *arg)
{ {
int fd = *(int *)arg; char *device = arg;
off_t size; off_t size;
size_t blocksize; size_t blocksize;
uint32_t nbdflags; uint32_t nbdflags;
int sock; int fd, sock;
int ret; int ret;
pthread_t show_parts_thread; pthread_t show_parts_thread;
@ -213,13 +213,20 @@ static void *nbd_client_thread(void *arg)
goto out; goto out;
} }
fd = open(device, O_RDWR);
if (fd == -1) {
/* Linux-only, we can use %m in printf. */
fprintf(stderr, "Failed to open %s: %m", device);
goto out;
}
ret = nbd_init(fd, sock, nbdflags, size, blocksize); ret = nbd_init(fd, sock, nbdflags, size, blocksize);
if (ret == -1) { if (ret == -1) {
goto out; goto out;
} }
/* update partition table */ /* update partition table */
pthread_create(&show_parts_thread, NULL, show_parts, NULL); pthread_create(&show_parts_thread, NULL, show_parts, device);
if (verbose) { if (verbose) {
fprintf(stderr, "NBD device %s is now connected to %s\n", fprintf(stderr, "NBD device %s is now connected to %s\n",
@ -273,6 +280,7 @@ int main(int argc, char **argv)
uint32_t nbdflags = 0; uint32_t nbdflags = 0;
bool disconnect = false; bool disconnect = false;
const char *bindto = "0.0.0.0"; const char *bindto = "0.0.0.0";
char *device = NULL;
int port = NBD_DEFAULT_PORT; int port = NBD_DEFAULT_PORT;
off_t fd_size; off_t fd_size;
const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t"; const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t";
@ -466,19 +474,9 @@ int main(int argc, char **argv)
} }
} }
if (device) { if (device != NULL && sockpath == NULL) {
/* Open before spawning new threads. In the future, we may sockpath = g_malloc(128);
* drop privileges after opening. snprintf(sockpath, 128, SOCKET_PATH, basename(device));
*/
fd = open(device, O_RDWR);
if (fd == -1) {
err(EXIT_FAILURE, "Failed to open %s", device);
}
if (sockpath == NULL) {
sockpath = g_malloc(128);
snprintf(sockpath, 128, SOCKET_PATH, basename(device));
}
} }
bdrv_init(); bdrv_init();
@ -513,7 +511,7 @@ int main(int argc, char **argv)
if (device) { if (device) {
int ret; int ret;
ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd); ret = pthread_create(&client_thread, NULL, nbd_client_thread, device);
if (ret != 0) { if (ret != 0) {
errx(EXIT_FAILURE, "Failed to create client thread: %s", errx(EXIT_FAILURE, "Failed to create client thread: %s",
strerror(ret)); strerror(ret));