[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 12/48] error: New error_printf() and error_vprin
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 12/48] error: New error_printf() and error_vprintf() |
Date: |
Wed, 24 Feb 2010 18:55:24 +0100 |
FIXME They should return int, so callers can calculate width.
Signed-off-by: Markus Armbruster <address@hidden>
---
qemu-error.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
qemu-error.h | 14 ++++++++++++++
2 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/qemu-error.c b/qemu-error.c
index 63bcdcf..76c660a 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -1,18 +1,53 @@
+/*
+ * Error reporting
+ *
+ * Copyright (C) 2010 Red Hat Inc.
+ *
+ * Authors:
+ * Markus Armbruster <address@hidden>,
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
#include <stdio.h>
#include "monitor.h"
#include "sysemu.h"
-void qemu_error(const char *fmt, ...)
+/*
+ * Print to current monitor if we have one, else to stderr.
+ * FIXME should return int, so callers can calculate width, but that
+ * requires surgery to monitor_printf(). Left for another day.
+ */
+void error_vprintf(const char *fmt, va_list ap)
{
- va_list args;
-
- va_start(args, fmt);
if (cur_mon) {
- monitor_vprintf(cur_mon, fmt, args);
+ monitor_vprintf(cur_mon, fmt, ap);
} else {
- vfprintf(stderr, fmt, args);
+ vfprintf(stderr, fmt, ap);
}
- va_end(args);
+}
+
+/*
+ * Print to current monitor if we have one, else to stderr.
+ * FIXME just like error_vprintf()
+ */
+void error_printf(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_vprintf(fmt, ap);
+ va_end(ap);
+}
+
+void qemu_error(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_vprintf(fmt, ap);
+ va_end(ap);
}
void qemu_error_internal(const char *file, int linenr, const char *func,
diff --git a/qemu-error.h b/qemu-error.h
index fa16113..d90f1da 100644
--- a/qemu-error.h
+++ b/qemu-error.h
@@ -1,6 +1,20 @@
+/*
+ * Error reporting
+ *
+ * Copyright (C) 2010 Red Hat Inc.
+ *
+ * Authors:
+ * Markus Armbruster <address@hidden>,
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
#ifndef QEMU_ERROR_H
#define QEMU_ERROR_H
+void error_vprintf(const char *fmt, va_list ap);
+void error_printf(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
void qemu_error(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
void qemu_error_internal(const char *file, int linenr, const char *func,
const char *fmt, ...)
--
1.6.6
- [Qemu-devel] [PATCH RFC 06/48] pc: Factor common code out of pc_boot_set() and cmos_init(), (continued)
- [Qemu-devel] [PATCH RFC 06/48] pc: Factor common code out of pc_boot_set() and cmos_init(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 08/48] monitor: Separate "default monitor" and "current monitor" cleanly, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 15/48] error: Don't abuse qemu_error() for non-error in qdev_device_help(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 05/48] pc: Fix error reporting for -boot once, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 07/48] tools: Remove unused cur_mon from qemu-tool.c, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 32/48] error: New QERR_DEVICE_MULTIPLE_BUSSES, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 34/48] qdev: Convert qbus_find() to QError, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 33/48] error: New QERR_DEVICE_NO_BUS, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 14/48] error: Don't abuse qemu_error() for non-error in scsi_hot_add(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 12/48] error: New error_printf() and error_vprintf(),
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 41/48] Revert "qdev: Use QError for 'device not found' error", Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 20/48] QemuOpts: Fix qemu_config_parse() to catch file read errors, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 40/48] error: New QERR_NO_BUS_FOR_DEVICE, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 45/48] qemu-option: Rename find_list() to qemu_find_opts() & external linkage, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 37/48] error: New QERR_BAD_BUS_FOR_DEVICE, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out of qdev_create(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 36/48] error: New error_printf_unless_qmp(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 19/48] error: Track locations in configuration files, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 47/48] monitor: Use argument type 'O' for device_add, Markus Armbruster, 2010/02/24