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

9pfs: use error_report() instead of fprintf(stderr)

Browse Source 
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
This commit is contained in:
Greg Kurz 2016-01-22 15:12:17 +01:00
parent 911a4efd0c
commit 63325b181f
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/9pfs/9p-handle.c
View File

@ -19,6 +19,7 @@
#include <sys/socket.h>
#include <sys/un.h>
#include "qemu/xattr.h"
#include "qemu/error-report.h"
#include <unistd.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
@ -655,12 +656,12 @@ static int handle_parse_opts(QemuOpts *opts, struct FsDriverEntry *fse)
const char *path = qemu_opt_get(opts, "path");
if (sec_model) {
fprintf(stderr, "Invalid argument security_model specified with handle fsdriver\n");
error_report("Invalid argument security_model specified with handle fsdriver");
return -1;
}
if (!path) {
fprintf(stderr, "fsdev: No path specified.\n");
error_report("fsdev: No path specified");
return -1;
}
fse->path = g_strdup(path);

15
hw/9pfs/9p-local.c
View File

@ -20,6 +20,7 @@
#include <sys/socket.h>
#include <sys/un.h>
#include "qemu/xattr.h"
#include "qemu/error-report.h"
#include <libgen.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
@ -1209,9 +1210,9 @@ static int local_parse_opts(QemuOpts *opts, struct FsDriverEntry *fse)
const char *path = qemu_opt_get(opts, "path");
if (!sec_model) {
fprintf(stderr, "security model not specified, "
"local fs needs security model\nvalid options are:"
"\tsecurity_model=[passthrough|mapped|none]\n");
error_report("Security model not specified, local fs needs security model");
error_printf("valid options are:"
"\tsecurity_model=[passthrough|mapped-xattr|mapped-file|none]\n");
return -1;
}
@ -1225,14 +1226,14 @@ static int local_parse_opts(QemuOpts *opts, struct FsDriverEntry *fse)
} else if (!strcmp(sec_model, "mapped-file")) {
fse->export_flags |= V9FS_SM_MAPPED_FILE;
} else {
fprintf(stderr, "Invalid security model %s specified, valid options are"
"\n\t [passthrough|mapped-xattr|mapped-file|none]\n",
sec_model);
error_report("Invalid security model %s specified", sec_model);
error_printf("valid options are:"
"\t[passthrough|mapped-xattr|mapped-file|none]\n");
return -1;
}
if (!path) {
fprintf(stderr, "fsdev: No path specified.\n");
error_report("fsdev: No path specified");
return -1;
}
fse->path = g_strdup(path);

12
hw/9pfs/9p-proxy.c
View File

@ -1100,19 +1100,19 @@ static int connect_namedsocket(const char *path)
struct sockaddr_un helper;
if (strlen(path) >= sizeof(helper.sun_path)) {
fprintf(stderr, "Socket name too large\n");
error_report("Socket name too long");
return -1;
}
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sockfd < 0) {
fprintf(stderr, "failed to create socket: %s\n", strerror(errno));
error_report("Failed to create socket: %s", strerror(errno));
return -1;
}
strcpy(helper.sun_path, path);
helper.sun_family = AF_UNIX;
size = strlen(helper.sun_path) + sizeof(helper.sun_family);
if (connect(sockfd, (struct sockaddr *)&helper, size) < 0) {
fprintf(stderr, "failed to connect to %s: %s\n", path, strerror(errno));
error_report("Failed to connect to %s: %s", path, strerror(errno));
close(sockfd);
return -1;
}
@ -1128,11 +1128,11 @@ static int proxy_parse_opts(QemuOpts *opts, struct FsDriverEntry *fs)
const char *sock_fd = qemu_opt_get(opts, "sock_fd");
if (!socket && !sock_fd) {
fprintf(stderr, "socket and sock_fd none of the option specified\n");
error_report("Must specify either socket or sock_fd");
return -1;
}
if (socket && sock_fd) {
fprintf(stderr, "Both socket and sock_fd options specified\n");
error_report("Both socket and sock_fd options specified");
return -1;
}
if (socket) {
@ -1155,7 +1155,7 @@ static int proxy_init(FsContext *ctx)
} else {
sock_id = atoi(ctx->fs_root);
if (sock_id < 0) {
fprintf(stderr, "socket descriptor not initialized\n");
error_report("Socket descriptor not initialized");
}
}
if (sock_id < 0) {

2
hw/9pfs/9p.c
View File

@ -3370,7 +3370,7 @@ static void __attribute__((__constructor__)) v9fs_set_fd_limit(void)
{
struct rlimit rlim;
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
fprintf(stderr, "Failed to get the resource limit\n");
error_report("Failed to get the resource limit");
exit(1);
}
open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3);