ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h" 

Files requiring DisplayState/DisplaySurface already include "ui/console.h".

To clean "qemu/typedefs.h", move the declarations to "ui/console.h"
(removing DisplaySurface forward declaration).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-01-11 15:08:56 +01:00 committed by Thomas Huth
parent dfbb251e9f
commit 7536587c07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/typedefs.h
View File

@ -24,8 +24,6 @@ typedef struct DeviceListener DeviceListener;
typedef struct DeviceState DeviceState; typedef struct DeviceState DeviceState;
typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot; typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot;
typedef struct DisplayChangeListener DisplayChangeListener; typedef struct DisplayChangeListener DisplayChangeListener;
typedef struct DisplayState DisplayState;
typedef struct DisplaySurface DisplaySurface;
typedef struct DriveInfo DriveInfo; typedef struct DriveInfo DriveInfo;
typedef struct Error Error; typedef struct Error Error;
typedef struct EventNotifier EventNotifier; typedef struct EventNotifier EventNotifier;

6
include/ui/console.h
View File

@ -131,7 +131,7 @@ struct PixelFormat {
uint8_t rbits, gbits, bbits, abits; uint8_t rbits, gbits, bbits, abits;
}; };
struct DisplaySurface { typedef struct DisplaySurface {
pixman_format_code_t format; pixman_format_code_t format;
pixman_image_t *image; pixman_image_t *image;
uint8_t flags; uint8_t flags;
@ -140,7 +140,7 @@ struct DisplaySurface {
GLenum gltype; GLenum gltype;
GLuint texture; GLuint texture;
#endif #endif
}; } DisplaySurface;
typedef struct QemuUIInfo { typedef struct QemuUIInfo {
/* geometry */ /* geometry */
@ -189,6 +189,8 @@ typedef struct QemuDmaBuf {
bool y0_top; bool y0_top;
} QemuDmaBuf; } QemuDmaBuf;
typedef struct DisplayState DisplayState;
typedef struct DisplayChangeListenerOps { typedef struct DisplayChangeListenerOps {
const char *dpy_name; const char *dpy_name;