[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/24] move I/O-related definitions from qemu-common
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 06/24] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h) |
Date: |
Wed, 24 Oct 2012 01:01:50 -0200 |
This will help reduce the qemu-common.h dependency hell.
Signed-off-by: Eduardo Habkost <address@hidden>
--
Changes v1 -> v2:
- move qemu_open() & qemu_close() to qemu-stdio.h, too
---
qemu-common.h | 59 ++--------------------------------------------
qemu-stdio.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 57 deletions(-)
create mode 100644 qemu-stdio.h
diff --git a/qemu-common.h b/qemu-common.h
index 3deeac7..94b349d 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -15,6 +15,8 @@
#include "compiler.h"
#include "config-host.h"
+#include "qemu-stdio.h"
+
#if defined(__arm__) || defined(__sparc__) || defined(__mips__) ||
defined(__hppa__) || defined(__ia64__)
#define WORDS_ALIGNED
#endif
@@ -57,28 +59,6 @@ typedef struct MigrationParams MigrationParams;
#include "qemu-os-posix.h"
#endif
-#ifndef O_LARGEFILE
-#define O_LARGEFILE 0
-#endif
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-#ifndef MAP_ANONYMOUS
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-#ifndef ENOMEDIUM
-#define ENOMEDIUM ENODEV
-#endif
-#if !defined(ENOTSUP)
-#define ENOTSUP 4096
-#endif
-#if !defined(ECANCELED)
-#define ECANCELED 4097
-#endif
-#ifndef TIME_MAX
-#define TIME_MAX LONG_MAX
-#endif
-
/* HOST_LONG_BITS is the size of a native pointer in bits. */
#if UINTPTR_MAX == UINT32_MAX
# define HOST_LONG_BITS 32
@@ -88,39 +68,6 @@ typedef struct MigrationParams MigrationParams;
# error Unknown pointer size
#endif
-#ifndef CONFIG_IOVEC
-#define CONFIG_IOVEC
-struct iovec {
- void *iov_base;
- size_t iov_len;
-};
-/*
- * Use the same value as Linux for now.
- */
-#define IOV_MAX 1024
-#else
-#include <sys/uio.h>
-#endif
-
-typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
- GCC_FMT_ATTR(2, 3);
-
-#ifdef _WIN32
-#define fsync _commit
-#if !defined(lseek)
-# define lseek _lseeki64
-#endif
-int qemu_ftruncate64(int, int64_t);
-#if !defined(ftruncate)
-# define ftruncate qemu_ftruncate64
-#endif
-
-static inline char *realpath(const char *path, char *resolved_path)
-{
- _fullpath(resolved_path, path, _MAX_PATH);
- return resolved_path;
-}
-#endif
/* icount */
void configure_icount(const char *option);
@@ -217,8 +164,6 @@ const char *path(const char *pathname);
void *qemu_oom_check(void *ptr);
-int qemu_open(const char *name, int flags, ...);
-int qemu_close(int fd);
ssize_t qemu_write_full(int fd, const void *buf, size_t count)
QEMU_WARN_UNUSED_RESULT;
ssize_t qemu_send_full(int fd, const void *buf, size_t count, int flags)
diff --git a/qemu-stdio.h b/qemu-stdio.h
new file mode 100644
index 0000000..b2e8eda
--- /dev/null
+++ b/qemu-stdio.h
@@ -0,0 +1,76 @@
+/* Some basic definitions related to stdio.h or other I/O interfaces
+ */
+#ifndef QEMU_STDIO_H
+#define QEMU_STDIO_H
+
+#include "compiler.h"
+#include "config-host.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+#ifndef ENOMEDIUM
+#define ENOMEDIUM ENODEV
+#endif
+#if !defined(ENOTSUP)
+#define ENOTSUP 4096
+#endif
+#if !defined(ECANCELED)
+#define ECANCELED 4097
+#endif
+#ifndef TIME_MAX
+#define TIME_MAX LONG_MAX
+#endif
+
+#ifndef CONFIG_IOVEC
+#define CONFIG_IOVEC
+struct iovec {
+ void *iov_base;
+ size_t iov_len;
+};
+/*
+ * Use the same value as Linux for now.
+ */
+#define IOV_MAX 1024
+#else
+#include <sys/uio.h>
+#endif
+
+typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
+
+#ifdef _WIN32
+#define fsync _commit
+#if !defined(lseek)
+# define lseek _lseeki64
+#endif
+int qemu_ftruncate64(int, int64_t);
+#if !defined(ftruncate)
+# define ftruncate qemu_ftruncate64
+#endif
+
+static inline char *realpath(const char *path, char *resolved_path)
+{
+ _fullpath(resolved_path, path, _MAX_PATH);
+ return resolved_path;
+}
+#endif
+
+int qemu_open(const char *name, int flags, ...);
+int qemu_close(int fd);
+
+#endif /* QEMU_STDIO_H */
--
1.7.11.7
- [Qemu-devel] [PATCH v5 00/24] CPU DeviceState, 5th try, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 03/24] qemu-common.h: comment about usage rules, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 09/24] ui/vnc-pallete.c: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 01/24] user: move *-user/qemu-types.h to main directory, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 15/24] qlist.h: do not include qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 16/24] qapi-types.h: don't include qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 10/24] qemu-config.h: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 06/24] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h),
Eduardo Habkost <=
- [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 08/24] vnc-palette.h: include <stdbool.h>, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 11/24] qapi/qmp-registry.c: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 07/24] qemu-fsdev-dummy.c: include module.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 20/24] qdev: add stub vmstate handling to qdev.c, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 24/24] qom: make CPU a child of DeviceState, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 21/24] qdev: add sysbus_get_default() GCC_WEAK stub, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 13/24] create qemu-types.h for struct typedefs, Eduardo Habkost, 2012/10/23