From 3bca1ab74c9f0a21948c570c9c72a7a228947f1e Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 18 May 2011 21:59:46 +0300 Subject: [PATCH] kvm tools: Prefix error() and friends helpers with pr_ To look more familiar with kernel functions. Suggested-by: Ingo Molnar Signed-off-by: Cyrill Gorcunov Acked-by: Ingo Molnar Signed-off-by: Pekka Enberg --- tools/kvm/disk/core.c | 12 ++++++------ tools/kvm/disk/qcow.c | 2 +- tools/kvm/include/kvm/util.h | 10 +++++----- tools/kvm/kvm-cpu.c | 2 +- tools/kvm/kvm-run.c | 6 +++--- tools/kvm/kvm.c | 4 ++-- tools/kvm/mptable.c | 2 +- tools/kvm/util.c | 6 +++--- tools/kvm/util/parse-options.c | 16 ++++++++-------- tools/kvm/virtio/blk.c | 2 +- tools/kvm/virtio/console.c | 2 +- tools/kvm/virtio/net.c | 20 ++++++++++---------- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c index b229f83bb599..34852a28697a 100644 --- a/tools/kvm/disk/core.c +++ b/tools/kvm/disk/core.c @@ -54,7 +54,7 @@ struct disk_image *disk_image__open(const char *filename, bool readonly) return disk; if (close(fd) < 0) - warning("close() failed"); + pr_warning("close() failed"); return NULL; } @@ -77,7 +77,7 @@ int disk_image__close(struct disk_image *disk) return disk->ops->close(disk); if (close(disk->fd) < 0) - warning("close() failed"); + pr_warning("close() failed"); free(disk); @@ -99,7 +99,7 @@ ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec */ 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) { @@ -109,7 +109,7 @@ ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec 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; @@ -137,7 +137,7 @@ ssize_t disk_image__write(struct disk_image *disk, u64 sector, const struct iove */ 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) { @@ -147,7 +147,7 @@ ssize_t disk_image__write(struct disk_image *disk, u64 sector, const struct iove 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; } diff --git a/tools/kvm/disk/qcow.c b/tools/kvm/disk/qcow.c index 29964b9488a9..6ec4cdaecb8b 100644 --- a/tools/kvm/disk/qcow.c +++ b/tools/kvm/disk/qcow.c @@ -323,7 +323,7 @@ static ssize_t qcow1_write_sector(struct disk_image *disk, u64 sector, void *src 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; } diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h index ed2de03e5020..a9425cc6d3e3 100644 --- a/tools/kvm/include/kvm/util.h +++ b/tools/kvm/include/kvm/util.h @@ -37,15 +37,15 @@ extern bool do_debug_print; 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) diff --git a/tools/kvm/kvm-cpu.c b/tools/kvm/kvm-cpu.c index a507fa4edede..cdfeb8551fc0 100644 --- a/tools/kvm/kvm-cpu.c +++ b/tools/kvm/kvm-cpu.c @@ -97,7 +97,7 @@ void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu) }; 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) diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index 5451dfe940b6..63181bf78955 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -268,13 +268,13 @@ static u64 host_ram_size(void) 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; } @@ -449,7 +449,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) 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; diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index 3d2fa3bee7b9..815cacfe30e6 100644 --- a/tools/kvm/kvm.c +++ b/tools/kvm/kvm.c @@ -84,7 +84,7 @@ static int kvm__check_extensions(struct kvm *kvm) 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; } @@ -446,7 +446,7 @@ bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, 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) diff --git a/tools/kvm/mptable.c b/tools/kvm/mptable.c index 1138457978f3..7a705c6a9df4 100644 --- a/tools/kvm/mptable.c +++ b/tools/kvm/mptable.c @@ -101,7 +101,7 @@ void mptable_setup(struct kvm *kvm, unsigned int ncpus) 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; } diff --git a/tools/kvm/util.c b/tools/kvm/util.c index cf9340f0a330..4efbce9e25b4 100644 --- a/tools/kvm/util.c +++ b/tools/kvm/util.c @@ -41,7 +41,7 @@ void die(const char *err, ...) va_end(params); } -int error(const char *err, ...) +int pr_error(const char *err, ...) { va_list params; @@ -51,7 +51,7 @@ int error(const char *err, ...) return -1; } -void warning(const char *warn, ...) +void pr_warning(const char *warn, ...) { va_list params; @@ -60,7 +60,7 @@ void warning(const char *warn, ...) va_end(params); } -void info(const char *info, ...) +void pr_info(const char *info, ...) { va_list params; diff --git a/tools/kvm/util/parse-options.c b/tools/kvm/util/parse-options.c index 19d204833e4f..7866c55204e0 100644 --- a/tools/kvm/util/parse-options.c +++ b/tools/kvm/util/parse-options.c @@ -16,10 +16,10 @@ 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, @@ -316,7 +316,7 @@ static void check_typos(const char *arg, const struct option *options) 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); } @@ -324,7 +324,7 @@ static void check_typos(const char *arg, const struct option *options) 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); } } @@ -422,7 +422,7 @@ is_abbreviated: } 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-" : "", @@ -558,9 +558,9 @@ int parse_options(int argc, const char **argv, const struct option *options, 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); } diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c index de88fe92423d..c5d1bb81eb5c 100644 --- a/tools/kvm/virtio/blk.c +++ b/tools/kvm/virtio/blk.c @@ -149,7 +149,7 @@ static bool virtio_blk_do_io_request(struct kvm *kvm, 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; } diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c index c0e251c940e4..affff0bc0328 100644 --- a/tools/kvm/virtio/console.c +++ b/tools/kvm/virtio/console.c @@ -104,7 +104,7 @@ static bool virtio_console_pci_io_device_specific_in(void *data, unsigned long o 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]); diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index b47f02a8a656..649bc0feabc1 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -157,7 +157,7 @@ static bool virtio_net_pci_io_device_specific_in(void *data, unsigned long offse 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]); @@ -224,7 +224,7 @@ static void virtio_net_handle_callback(struct kvm *kvm, u16 queue_index) break; } default: - warning("Unknown queue index %u", queue_index); + pr_warning("Unknown queue index %u", queue_index); } } @@ -297,33 +297,33 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) 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; } @@ -335,7 +335,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) } 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; } } @@ -346,7 +346,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) 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; } } @@ -356,7 +356,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) 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); -- 2.39.5