openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libcacard/vscclient: fix error paths for socket creation 

Signed-off-by: Alon Levy <alevy@redhat.com>
This commit is contained in:
Alon Levy 2011-09-27 17:19:25 +03:00
parent 7fc7e5844c
commit e7c5e89318
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcacard/vscclient.c
View File

@ -357,6 +357,7 @@ connect_to_qemu(
if (sock < 0) { if (sock < 0) {
/* Error */ /* Error */
fprintf(stderr, "Error opening socket!\n"); fprintf(stderr, "Error opening socket!\n");
return -1;
} }
memset(&hints, 0, sizeof(struct addrinfo)); memset(&hints, 0, sizeof(struct addrinfo));
@ -370,13 +371,13 @@ connect_to_qemu(
if (ret != 0) { if (ret != 0) {
/* Error */ /* Error */
fprintf(stderr, "getaddrinfo failed\n"); fprintf(stderr, "getaddrinfo failed\n");
return 5; return -1;
} }
if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) { if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) {
/* Error */ /* Error */
fprintf(stderr, "Could not connect\n"); fprintf(stderr, "Could not connect\n");
return 5; return -1;
} }
if (verbose) { if (verbose) {
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader)); printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
@ -505,6 +506,10 @@ main(
qemu_host = strdup(argv[argc - 2]); qemu_host = strdup(argv[argc - 2]);
qemu_port = strdup(argv[argc - 1]); qemu_port = strdup(argv[argc - 1]);
sock = connect_to_qemu(qemu_host, qemu_port); sock = connect_to_qemu(qemu_host, qemu_port);
if (sock == -1) {
fprintf(stderr, "error opening socket, exiting.\n");
exit(5);
}
qemu_mutex_init(&write_lock); qemu_mutex_init(&write_lock);
qemu_mutex_init(&pending_reader_lock); qemu_mutex_init(&pending_reader_lock);