To look more familiar with kernel functions.
Suggested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
return disk;
if (close(fd) < 0)
- warning("close() failed");
+ pr_warning("close() failed");
return NULL;
}
return disk->ops->close(disk);
if (close(disk->fd) < 0)
- warning("close() failed");
+ pr_warning("close() failed");
free(disk);
*/
total = disk->ops->read_sector_iov(disk, sector, iov, iovcount);
if (total < 0) {
- info("disk_image__read error: total=%ld\n", (long)total);
+ pr_info("disk_image__read error: total=%ld\n", (long)total);
return -1;
}
} else if (disk->ops->read_sector) {
while (iovcount--) {
nr = disk->ops->read_sector(disk, sector, iov->iov_base, iov->iov_len);
if (nr != (ssize_t)iov->iov_len) {
- info("disk_image__read error: nr = %ld iov_len=%ld\n", (long)nr, (long)iov->iov_len);
+ pr_info("disk_image__read error: nr = %ld iov_len=%ld\n", (long)nr, (long)iov->iov_len);
return -1;
}
sector += iov->iov_len >> SECTOR_SHIFT;
*/
total = disk->ops->write_sector_iov(disk, sector, iov, iovcount);
if (total < 0) {
- info("disk_image__write error: total=%ld\n", (long)total);
+ pr_info("disk_image__write error: total=%ld\n", (long)total);
return -1;
}
} else if (disk->ops->write_sector) {
while (iovcount--) {
nr = disk->ops->write_sector(disk, sector, iov->iov_base, iov->iov_len);
if (nr != (ssize_t)iov->iov_len) {
- info("disk_image__write error: nr=%ld iov_len=%ld\n", (long)nr, (long)iov->iov_len);
+ pr_info("disk_image__write error: nr=%ld iov_len=%ld\n", (long)nr, (long)iov->iov_len);
return -1;
}
static ssize_t qcow1_nowrite_sector(struct disk_image *disk, u64 sector, void *src, u32 src_len)
{
/* I/O error */
- info("qcow1_nowrite_sector: no write support\n");
+ pr_info("qcow1_nowrite_sector: no write support\n");
return -1;
}
extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
extern void die_perror(const char *s) NORETURN;
-extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern void info(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern int pr_error(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void pr_warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void pr_info(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);
-#define debug(fmt, ...) \
+#define pr_debug(fmt, ...) \
do { \
if (do_debug_print) \
- info("(%s) %s:%d: " fmt, __FILE__, \
+ pr_info("(%s) %s:%d: " fmt, __FILE__, \
__func__, __LINE__, ##__VA_ARGS__); \
} while (0)
};
if (ioctl(vcpu->vcpu_fd, KVM_SET_GUEST_DEBUG, &debug) < 0)
- warning("KVM_SET_GUEST_DEBUG failed");
+ pr_warning("KVM_SET_GUEST_DEBUG failed");
}
static struct kvm_msrs *kvm_msrs__new(size_t nmsrs)
nr_pages = sysconf(_SC_PHYS_PAGES);
if (nr_pages < 0) {
- warning("sysconf(_SC_PHYS_PAGES) failed");
+ pr_warning("sysconf(_SC_PHYS_PAGES) failed");
return 0;
}
page_size = sysconf(_SC_PAGE_SIZE);
if (page_size < 0) {
- warning("sysconf(_SC_PAGE_SIZE) failed");
+ pr_warning("sysconf(_SC_PAGE_SIZE) failed");
return 0;
}
die("Not enough memory specified: %lluMB (min %lluMB)", ram_size, MIN_RAM_SIZE_MB);
if (ram_size > host_ram_size())
- warning("Guest memory size %lluMB exceeds host physical RAM size %lluMB", ram_size, host_ram_size());
+ pr_warning("Guest memory size %lluMB exceeds host physical RAM size %lluMB", ram_size, host_ram_size());
ram_size <<= MB_SHIFT;
for (i = 0; i < ARRAY_SIZE(kvm_req_ext); i++) {
if (!kvm__supports_extension(kvm, kvm_req_ext[i].code)) {
- error("Unsuppored KVM extension detected: %s",
+ pr_error("Unsuppored KVM extension detected: %s",
kvm_req_ext[i].name);
return (int)-i;
}
if (ret)
goto found_kernel;
- warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename);
+ pr_warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename);
ret = load_flat_binary(kvm, fd_kernel);
if (ret)
real_mpc_table = ALIGN(MB_BIOS_BEGIN + bios_rom_size, 16);
if (ncpus > MPTABLE_MAX_CPUS) {
- warning("Too many cpus: %d limited to %d",
+ pr_warning("Too many cpus: %d limited to %d",
ncpus, MPTABLE_MAX_CPUS);
ncpus = MPTABLE_MAX_CPUS;
}
va_end(params);
}
-int error(const char *err, ...)
+int pr_error(const char *err, ...)
{
va_list params;
return -1;
}
-void warning(const char *warn, ...)
+void pr_warning(const char *warn, ...)
{
va_list params;
va_end(params);
}
-void info(const char *info, ...)
+void pr_info(const char *info, ...)
{
va_list params;
static int opterror(const struct option *opt, const char *reason, int flags)
{
if (flags & OPT_SHORT)
- return error("switch `%c' %s", opt->short_name, reason);
+ return pr_error("switch `%c' %s", opt->short_name, reason);
if (flags & OPT_UNSET)
- return error("option `no-%s' %s", opt->long_name, reason);
- return error("option `%s' %s", opt->long_name, reason);
+ return pr_error("option `no-%s' %s", opt->long_name, reason);
+ return pr_error("option `%s' %s", opt->long_name, reason);
}
static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
return;
if (!prefixcmp(arg, "no-")) {
- error ("did you mean `--%s` (with two dashes ?)", arg);
+ pr_error ("did you mean `--%s` (with two dashes ?)", arg);
exit(129);
}
if (!options->long_name)
continue;
if (!prefixcmp(options->long_name, arg)) {
- error ("did you mean `--%s` (with two dashes ?)", arg);
+ pr_error ("did you mean `--%s` (with two dashes ?)", arg);
exit(129);
}
}
}
if (ambiguous_option)
- return error("Ambiguous option: %s "
+ return pr_error("Ambiguous option: %s "
"(could be --%s%s or --%s%s)",
arg,
(ambiguous_flags & OPT_UNSET) ? "no-" : "",
break;
default: /* PARSE_OPT_UNKNOWN */
if (ctx.argv[0][1] == '-') {
- error("unknown option `%s'", ctx.argv[0] + 2);
+ pr_error("unknown option `%s'", ctx.argv[0] + 2);
} else {
- error("unknown switch `%c'", *ctx.opt);
+ pr_error("unknown switch `%c'", *ctx.opt);
}
usage_with_options(usagestr, options);
}
block_cnt = disk_image__flush(bdev->disk);
break;
default:
- warning("request type %d", req->type);
+ pr_warning("request type %d", req->type);
block_cnt = -1;
break;
}
return false;
if ((offset - VIRTIO_MSI_CONFIG_VECTOR) > sizeof(struct virtio_console_config))
- error("config offset is too big: %li", offset - VIRTIO_MSI_CONFIG_VECTOR);
+ pr_error("config offset is too big: %li", offset - VIRTIO_MSI_CONFIG_VECTOR);
ioport__write8(data, config_space[offset - VIRTIO_MSI_CONFIG_VECTOR]);
return false;
if ((offset - VIRTIO_MSI_CONFIG_VECTOR) > sizeof(struct virtio_net_config))
- error("config offset is too big: %li", offset - VIRTIO_MSI_CONFIG_VECTOR);
+ pr_error("config offset is too big: %li", offset - VIRTIO_MSI_CONFIG_VECTOR);
ioport__write8(data, config_space[offset - VIRTIO_MSI_CONFIG_VECTOR]);
break;
}
default:
- warning("Unknown queue index %u", queue_index);
+ pr_warning("Unknown queue index %u", queue_index);
}
}
ndev.tap_fd = open("/dev/net/tun", O_RDWR);
if (ndev.tap_fd < 0) {
- warning("Unable to open /dev/net/tun");
+ pr_warning("Unable to open /dev/net/tun");
goto fail;
}
memset(&ifr, 0, sizeof(ifr));
ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR;
if (ioctl(ndev.tap_fd, TUNSETIFF, &ifr) < 0) {
- warning("Config tap device error. Are you root?");
+ pr_warning("Config tap device error. Are you root?");
goto fail;
}
strncpy(ndev.tap_name, ifr.ifr_name, sizeof(ndev.tap_name));
if (ioctl(ndev.tap_fd, TUNSETNOCSUM, 1) < 0) {
- warning("Config tap device TUNSETNOCSUM error");
+ pr_warning("Config tap device TUNSETNOCSUM error");
goto fail;
}
hdr_len = sizeof(struct virtio_net_hdr);
if (ioctl(ndev.tap_fd, TUNSETVNETHDRSZ, &hdr_len) < 0) {
- warning("Config tap device TUNSETVNETHDRSZ error");
+ pr_warning("Config tap device TUNSETVNETHDRSZ error");
goto fail;
}
offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 | TUN_F_UFO;
if (ioctl(ndev.tap_fd, TUNSETOFFLOAD, offload) < 0) {
- warning("Config tap device TUNSETOFFLOAD error");
+ pr_warning("Config tap device TUNSETOFFLOAD error");
goto fail;
}
} else {
waitpid(pid, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
- warning("Fail to setup tap by %s", params->script);
+ pr_warning("Fail to setup tap by %s", params->script);
goto fail;
}
}
memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr));
ifr.ifr_addr.sa_family = AF_INET;
if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) {
- warning("Could not set ip address on tap device");
+ pr_warning("Could not set ip address on tap device");
goto fail;
}
}
ioctl(sock, SIOCGIFFLAGS, &ifr);
ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0)
- warning("Could not bring tap device up");
+ pr_warning("Could not bring tap device up");
close(sock);