nbd: Use ERRP_GUARD()

[qemu.git] / include / qemu-common.h

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 85f4749aefb73a5e19d2da5a7e930cc05c640c04..d0142f29ac1a3a3a85d7d88b3dd9c2eaa6e75edd 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -1,6 +1,4 @@
-
-/* Common header file that is included by all of QEMU.
- *
+/*
  * This file is supposed to be included only by .c files. No header file should
  * depend on qemu-common.h, as this would easily lead to circular header
  * dependencies.
@@ -12,12 +10,10 @@
 #ifndef QEMU_COMMON_H
 #define QEMU_COMMON_H
 
-#include "qemu/fprintf-fn.h"
-
 #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
 
 /* Copyright string for -version arguments, About dialogs, etc */
-#define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \
+#define QEMU_COPYRIGHT "Copyright (c) 2003-2020 " \
     "Fabrice Bellard and the QEMU Project developers"
 
 /* Bug reporting information for --help arguments, About dialogs, etc */
@@ -33,22 +29,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)
@@ -79,14 +59,6 @@ int qemu_openpty_raw(int *aslave, char *pty_name);
     sendto(sockfd, buf, len, flags, destaddr, addrlen)
 #endif
 
-extern bool tcg_allowed;
-void tcg_exec_init(unsigned long tb_size);
-#ifdef CONFIG_TCG
-#define tcg_enabled() (tcg_allowed)
-#else
-#define tcg_enabled() 0
-#endif
-
 void cpu_exec_init_all(void);
 void cpu_exec_step_atomic(CPUState *cpu);
 
@@ -102,6 +74,12 @@ void cpu_exec_step_atomic(CPUState *cpu);
  */
 bool set_preferred_target_page_bits(int bits);
 
+/**
+ * finalize_target_page_bits:
+ * Commit the final value set by set_preferred_target_page_bits.
+ */
+void finalize_target_page_bits(void);
+
 /**
  * Sends a (part of) iovec down a socket, yielding when the socket is full, or
  * Receives data into a (part of) iovec from a socket,
@@ -139,8 +117,6 @@ void os_setup_early_signal_handling(void);
 char *os_find_datadir(void);
 int os_parse_cmd_args(int index, const char *optarg);
 
-#include "qemu/module.h"
-
 /*
  * Hexdump a buffer to a file. An optional string prefix is added to every line
  */
@@ -153,7 +129,6 @@ void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
 int parse_debug_env(const char *name, int max, int initial);
 
 const char *qemu_ether_ntoa(const MACAddr *mac);
-char *size_to_str(uint64_t val);
 void page_size_init(void);
 
 /* returns non-zero if dump is in progress, otherwise zero is