qemu-common: Move qemu_isalnum() etc. to qemu/ctype.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-3-armbru@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

diff --git a/block/ssh.c b/block/ssh.c
index 12fd4f39e8e96e78ec414d2a3fbfc47b7849da27..584c302fe6d9fa5cd975d80445d6e82433835a37 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -32,6 +32,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qemu/sockets.h"
 #include "qemu/uri.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index 253cc716dd814524ca41f8b130dc9ad01e87bd4f..f6c28805dda4a78e687a28c3a914d09cd4dfa8e4 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -34,6 +34,7 @@
 #include "migration/blocker.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 

diff --git a/gdbstub.c b/gdbstub.c
index 462f89edfeead4613d81bc30e334d12fc5a065a0..9159d7d15314f58ae9a38b55f648b364e3ef7d18 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -16,9 +16,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "trace-root.h"
 #ifdef CONFIG_USER_ONLY

diff --git a/hw/core/bus.c b/hw/core/bus.c
index e09843f6abea0e24f8adf2506771745e22f21e69..60c47203791c44802ead69c33ac09f0e4fbffe03 100644 (file)
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/ctype.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"
 

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 5da1439a8bb9cd176892c94d953ce0a36cebd88b..81c97f48a7f09fea32ae6c5e491d78a960d6ac7a 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -4,6 +4,7 @@
 #include "qapi/error.h"
 #include "hw/pci/pci.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/ctype.h"
 #include "qemu/error-report.h"
 #include "hw/block/block.h"
 #include "net/hub.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4d643686cb5628d2439eeb84ee92fca2d2eb059e..87b2039f1bf8f616704c27343c1fdfa3639a5850 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -23,6 +23,7 @@
 #include "hw/s390x/css.h"
 #include "virtio-ccw.h"
 #include "qemu/config-file.h"
+#include "qemu/ctype.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "s390-pci-bus.h"

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index d82b462be40d656fd9def2b7f2b72b28422131e6..e8a8706a4f3d0d325d62ec205ed3e32859a9fcd7 100644 (file)
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/ctype.h"
 #include "qemu/error-report.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/emulation.h"

diff --git a/include/qemu-common.h b/include/qemu-common.h
index d7f4a4e7eb2c5fe92a40e36fc03f72bd7a76ca0d..9b01f6e7cb6a3dd9247b7f610a6ad4205ef6cf72 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -31,22 +31,6 @@ int qemu_main(int argc, char **argv, char **envp);
 void qemu_get_timedate(struct tm *tm, int offset);
 int qemu_timedate_diff(struct tm *tm);
 
-#define qemu_isalnum(c)                isalnum((unsigned char)(c))
-#define qemu_isalpha(c)                isalpha((unsigned char)(c))
-#define qemu_iscntrl(c)                iscntrl((unsigned char)(c))
-#define qemu_isdigit(c)                isdigit((unsigned char)(c))
-#define qemu_isgraph(c)                isgraph((unsigned char)(c))
-#define qemu_islower(c)                islower((unsigned char)(c))
-#define qemu_isprint(c)                isprint((unsigned char)(c))
-#define qemu_ispunct(c)                ispunct((unsigned char)(c))
-#define qemu_isspace(c)                isspace((unsigned char)(c))
-#define qemu_isupper(c)                isupper((unsigned char)(c))
-#define qemu_isxdigit(c)       isxdigit((unsigned char)(c))
-#define qemu_tolower(c)                tolower((unsigned char)(c))
-#define qemu_toupper(c)                toupper((unsigned char)(c))
-#define qemu_isascii(c)                isascii((unsigned char)(c))
-#define qemu_toascii(c)                toascii((unsigned char)(c))
-
 void *qemu_oom_check(void *ptr);
 
 ssize_t qemu_write_full(int fd, const void *buf, size_t count)

diff --git a/include/qemu/ctype.h b/include/qemu/ctype.h
new file mode 100644 (file)
index 0000000..3691f09
--- /dev/null
+++ b/include/qemu/ctype.h
@@ -0,0 +1,27 @@
+/*
+ * QEMU TCG support
+ *
+ * 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_CTYPE_H
+#define QEMU_CTYPE_H
+
+#define qemu_isalnum(c)         isalnum((unsigned char)(c))
+#define qemu_isalpha(c)         isalpha((unsigned char)(c))
+#define qemu_iscntrl(c)         iscntrl((unsigned char)(c))
+#define qemu_isdigit(c)         isdigit((unsigned char)(c))
+#define qemu_isgraph(c)         isgraph((unsigned char)(c))
+#define qemu_islower(c)         islower((unsigned char)(c))
+#define qemu_isprint(c)         isprint((unsigned char)(c))
+#define qemu_ispunct(c)         ispunct((unsigned char)(c))
+#define qemu_isspace(c)         isspace((unsigned char)(c))
+#define qemu_isupper(c)         isupper((unsigned char)(c))
+#define qemu_isxdigit(c)        isxdigit((unsigned char)(c))
+#define qemu_tolower(c)         tolower((unsigned char)(c))
+#define qemu_toupper(c)         toupper((unsigned char)(c))
+#define qemu_isascii(c)         isascii((unsigned char)(c))
+#define qemu_toascii(c)         toascii((unsigned char)(c))
+
+#endif

diff --git a/monitor.c b/monitor.c
index 3650ceb57464c2fe4cfaad74417e06aae937c3da..5c5cbe254a3df6b76884a03db5d7b5498c496f68 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -42,6 +42,7 @@
 #include "sysemu/numa.h"
 #include "monitor/monitor.h"
 #include "qemu/config-file.h"
+#include "qemu/ctype.h"
 #include "qemu/readline.h"
 #include "ui/console.h"
 #include "ui/input.h"

diff --git a/net/net.c b/net/net.c
index 2cf5e7646997fd78b86562af5769e27ce2f729cc..3e65c93920904751ea84582b699b7ce349cb8dad 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -41,6 +41,7 @@
 #include "qemu/sockets.h"
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
+#include "qemu/ctype.h"
 #include "hw/qdev.h"
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"

diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index a2a92356c1a017ae0270e4d4ee8c8b665969c788..0e3f3e0a9bc01d485b6f73fc7e88bb3920ed7c63 100644 (file)
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "tap_int.h"
 #include "sysemu/sysemu.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 
 #include <sys/ethernet.h>

diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index e9b266bb70962b1c37141ce2ca006645ad83e72e..29a6c98b53882ee8df978feec1d608ecef1a9fa9 100644 (file)
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/ctype.h"
 
 const char *qapi_enum_lookup(const QEnumLookup *lookup, int val)
 {

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index d8eb210c0c7e784d67ec695a483a080b71f3c203..7d23e12e3379f91025459751c1addd2d90e545a9 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -12,10 +12,10 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qemu/unicode.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"

diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c
index ee9d6e81d20c4891924564b902a4bf44a1f39d5f..7f8360d903bad3091269e3722853ba56c1eb08d5 100644 (file)
--- a/target/ppc/monitor.c
+++ b/target/ppc/monitor.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
+#include "qemu/ctype.h"
 #include "monitor/hmp-target.h"
 #include "hmp.h"
 

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 86fd8693a89a3d739a829d592fb599236ebe2991..6f2b64422086a279ce6f038d54b7a5bd31aac7af 100644 (file)
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/qemu-print.h"
+#include "qemu/ctype.h"
 #include "qemu/log.h"
 #include "cpu.h"
 #include "exec/exec-all.h"

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 9b9b5f37fc97e162fbc89982a68f4ca55bde1684..3c5c3f49d803bcfb964cffbfe48a2129606881b9 100644 (file)
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -22,6 +22,7 @@
 
 #include "libqtest.h"
 #include "qemu-common.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qapi/qmp/json-parser.h"

diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 5b771de7a33c5f84c84d0db6d6e7ebd4f0ada8ef..0bb03af0e51b94b8329e0a2791b7060e7223bc54 100644 (file)
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -30,8 +30,8 @@
 #define _FILE_OFFSET_BITS 64
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/atomic.h"
+#include "qemu/ctype.h"
 #include "qemu/iov.h"
 #include "standard-headers/linux/virtio_net.h"
 #include "contrib/libvhost-user/libvhost-user.h"

diff --git a/ui/keymaps.c b/ui/keymaps.c
index 544b55c27b16e330c296816fb0be12218143be38..38fd22ed2b04919c1af72b5e9c468b51043a2995 100644 (file)
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -26,6 +26,7 @@
 #include "keymaps.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
+#include "qemu/ctype.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "ui/input.h"

diff --git a/util/cutils.c b/util/cutils.c
index 9aacc422ca6aaf21fa81cea11f9f24be5ef5ab2c..53e4af59f8d92e199a23fe727599a1c4512fe1ec 100644 (file)
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -21,14 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/host-utils.h"
 #include <math.h>
 
 #include "qemu/sockets.h"
 #include "qemu/iov.h"
 #include "net/net.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 

diff --git a/util/id.c b/util/id.c
index 614135295536be17fac07ab2e487705de8ffa0bb..af1c5f1b815cf3e38109ce73c8541758fe6452a3 100644 (file)
--- a/util/id.c
+++ b/util/id.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/ctype.h"
 #include "qemu/id.h"
 
 bool id_wellformed(const char *id)

diff --git a/util/readline.c b/util/readline.c
index a7672b51c103252a866053ce1216f5e8b9c53f40..e534460da68383db53c86e4d3afc14a5a89b2894 100644 (file)
--- a/util/readline.c
+++ b/util/readline.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/readline.h"
+#include "qemu/ctype.h"
 #include "qemu/cutils.h"
 
 #define IS_NORM 0