mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 12:09:58 +00:00
7b5d76dae3
Hi all, this patch adds a DisplayAllocator interface that allows display frontends (sdl in particular) to provide a preallocated display buffer for the graphical backend to use. Whenever a graphical backend cannot use qemu_create_displaysurface_from because its own internal pixel format cannot be exported directly (text mode or graphical mode with color depth 8 or 24), it creates another display buffer in memory using qemu_create_displaysurface and does the conversion. This new buffer needs to be blitted into the sdl surface buffer every time we need to update portions of the screen. We can avoid this using the DisplayAllocator interace: sdl provides its own implementation of qemu_create_displaysurface, giving back the sdl surface buffer directly (as we used to do before the DisplayState changes). Since the buffer returned by sdl could be in bgr format we need to put back in the handlers of that case. This approach is good if the two following conditions are true: 1) the sdl surface is a software surface that resides in main memory; 2) the host display color depth is either 16 or 32 bpp. If first condition is false we can have bad performances using sdl and vnc together. If the second condition is false performances are certainly not going to improve but they shouldn't get worse either. The first condition is always true, at least on linux/X11 systems; but I believe is true also on other platforms. The second condition is true in the vast majority of the cases. This patch should also have the good side effect of solving the sdl 2D slowness malc was reporting on MacOS, because SDL_BlitSurface is not going to be called anymore when the guest is in text mode or 24bpp. However the root problem is still present so I suspect we may still see some slowness on MacOS when the guest is in 32 or 16 bpp. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6839 c046a42c-6fe2-441c-8c8c-71466251a162
209 lines
5.8 KiB
C
209 lines
5.8 KiB
C
/* Common header file that is included by all of qemu. */
|
|
#ifndef QEMU_COMMON_H
|
|
#define QEMU_COMMON_H
|
|
|
|
#define QEMU_NORETURN __attribute__ ((__noreturn__))
|
|
|
|
/* Hack around the mess dyngen-exec.h causes: We need QEMU_NORETURN in files that
|
|
cannot include the following headers without conflicts. This condition has
|
|
to be removed once dyngen is gone. */
|
|
#ifndef __DYNGEN_EXEC_H__
|
|
|
|
/* we put basic includes here to avoid repeating them in device drivers */
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include <inttypes.h>
|
|
#include <limits.h>
|
|
#include <time.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/stat.h>
|
|
#include "config-host.h"
|
|
|
|
#ifndef O_LARGEFILE
|
|
#define O_LARGEFILE 0
|
|
#endif
|
|
#ifndef O_BINARY
|
|
#define O_BINARY 0
|
|
#endif
|
|
|
|
#ifndef ENOMEDIUM
|
|
#define ENOMEDIUM ENODEV
|
|
#endif
|
|
|
|
#ifndef HAVE_IOVEC
|
|
#define HAVE_IOVEC
|
|
struct iovec {
|
|
void *iov_base;
|
|
size_t iov_len;
|
|
};
|
|
#else
|
|
#include <sys/uio.h>
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
#define fsync _commit
|
|
#define lseek _lseeki64
|
|
#define ENOTSUP 4096
|
|
extern int qemu_ftruncate64(int, int64_t);
|
|
#define ftruncate qemu_ftruncate64
|
|
|
|
|
|
static inline char *realpath(const char *path, char *resolved_path)
|
|
{
|
|
_fullpath(resolved_path, path, _MAX_PATH);
|
|
return resolved_path;
|
|
}
|
|
|
|
#define PRId64 "I64d"
|
|
#define PRIx64 "I64x"
|
|
#define PRIu64 "I64u"
|
|
#define PRIo64 "I64o"
|
|
#endif
|
|
|
|
/* FIXME: Remove NEED_CPU_H. */
|
|
#ifndef NEED_CPU_H
|
|
|
|
#include <setjmp.h>
|
|
#include "osdep.h"
|
|
#include "bswap.h"
|
|
|
|
#else
|
|
|
|
#include "cpu.h"
|
|
|
|
#endif /* !defined(NEED_CPU_H) */
|
|
|
|
/* bottom halves */
|
|
typedef struct QEMUBH QEMUBH;
|
|
|
|
typedef void QEMUBHFunc(void *opaque);
|
|
|
|
QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
|
|
void qemu_bh_schedule(QEMUBH *bh);
|
|
/* Bottom halfs that are scheduled from a bottom half handler are instantly
|
|
* invoked. This can create an infinite loop if a bottom half handler
|
|
* schedules itself. qemu_bh_schedule_idle() avoids this infinite loop by
|
|
* ensuring that the bottom half isn't executed until the next main loop
|
|
* iteration.
|
|
*/
|
|
void qemu_bh_schedule_idle(QEMUBH *bh);
|
|
void qemu_bh_cancel(QEMUBH *bh);
|
|
void qemu_bh_delete(QEMUBH *bh);
|
|
int qemu_bh_poll(void);
|
|
|
|
uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);
|
|
|
|
void qemu_get_timedate(struct tm *tm, int offset);
|
|
int qemu_timedate_diff(struct tm *tm);
|
|
|
|
/* cutils.c */
|
|
void pstrcpy(char *buf, int buf_size, const char *str);
|
|
char *pstrcat(char *buf, int buf_size, const char *s);
|
|
int strstart(const char *str, const char *val, const char **ptr);
|
|
int stristart(const char *str, const char *val, const char **ptr);
|
|
time_t mktimegm(struct tm *tm);
|
|
int qemu_fls(int i);
|
|
|
|
#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_malloc(size_t size);
|
|
void *qemu_realloc(void *ptr, size_t size);
|
|
void *qemu_mallocz(size_t size);
|
|
void qemu_free(void *ptr);
|
|
char *qemu_strdup(const char *str);
|
|
char *qemu_strndup(const char *str, size_t size);
|
|
|
|
void *get_mmap_addr(unsigned long size);
|
|
|
|
|
|
/* Error handling. */
|
|
|
|
void QEMU_NORETURN hw_error(const char *fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 1, 2)));
|
|
|
|
/* IO callbacks. */
|
|
typedef void IOReadHandler(void *opaque, const uint8_t *buf, int size);
|
|
typedef int IOCanRWHandler(void *opaque);
|
|
typedef void IOHandler(void *opaque);
|
|
|
|
struct ParallelIOArg {
|
|
void *buffer;
|
|
int count;
|
|
};
|
|
|
|
typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int size);
|
|
|
|
/* A load of opaque types so that device init declarations don't have to
|
|
pull in all the real definitions. */
|
|
typedef struct NICInfo NICInfo;
|
|
typedef struct HCIInfo HCIInfo;
|
|
typedef struct AudioState AudioState;
|
|
typedef struct BlockDriverState BlockDriverState;
|
|
typedef struct DisplayState DisplayState;
|
|
typedef struct DisplayChangeListener DisplayChangeListener;
|
|
typedef struct DisplaySurface DisplaySurface;
|
|
typedef struct DisplayAllocator DisplayAllocator;
|
|
typedef struct PixelFormat PixelFormat;
|
|
typedef struct TextConsole TextConsole;
|
|
typedef TextConsole QEMUConsole;
|
|
typedef struct CharDriverState CharDriverState;
|
|
typedef struct VLANState VLANState;
|
|
typedef struct QEMUFile QEMUFile;
|
|
typedef struct i2c_bus i2c_bus;
|
|
typedef struct i2c_slave i2c_slave;
|
|
typedef struct SMBusDevice SMBusDevice;
|
|
typedef struct QEMUTimer QEMUTimer;
|
|
typedef struct PCIBus PCIBus;
|
|
typedef struct PCIDevice PCIDevice;
|
|
typedef struct SerialState SerialState;
|
|
typedef struct IRQState *qemu_irq;
|
|
struct pcmcia_card_s;
|
|
|
|
/* CPU save/load. */
|
|
void cpu_save(QEMUFile *f, void *opaque);
|
|
int cpu_load(QEMUFile *f, void *opaque, int version_id);
|
|
|
|
/* Force QEMU to stop what it's doing and service IO */
|
|
void qemu_service_io(void);
|
|
|
|
typedef struct QEMUIOVector {
|
|
struct iovec *iov;
|
|
int niov;
|
|
int nalloc;
|
|
size_t size;
|
|
} QEMUIOVector;
|
|
|
|
void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
|
|
void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
|
|
void qemu_iovec_destroy(QEMUIOVector *qiov);
|
|
void qemu_iovec_reset(QEMUIOVector *qiov);
|
|
void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf);
|
|
void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count);
|
|
|
|
struct Monitor;
|
|
typedef struct Monitor Monitor;
|
|
|
|
#endif /* dyngen-exec.h hack */
|
|
|
|
#endif
|