[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/25] ui/console: Remove DisplayState/DisplaySurface
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 20/25] ui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h" |
Date: |
Mon, 14 Jan 2019 11:02:15 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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é <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
include/qemu/typedefs.h | 2 --
include/ui/console.h | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 67dd04f..30ad8b2 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -24,8 +24,6 @@ typedef struct DeviceListener DeviceListener;
typedef struct DeviceState DeviceState;
typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot;
typedef struct DisplayChangeListener DisplayChangeListener;
-typedef struct DisplayState DisplayState;
-typedef struct DisplaySurface DisplaySurface;
typedef struct DriveInfo DriveInfo;
typedef struct Error Error;
typedef struct EventNotifier EventNotifier;
diff --git a/include/ui/console.h b/include/ui/console.h
index c4f497c..0a19037 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -131,7 +131,7 @@ struct PixelFormat {
uint8_t rbits, gbits, bbits, abits;
};
-struct DisplaySurface {
+typedef struct DisplaySurface {
pixman_format_code_t format;
pixman_image_t *image;
uint8_t flags;
@@ -140,7 +140,7 @@ struct DisplaySurface {
GLenum gltype;
GLuint texture;
#endif
-};
+} DisplaySurface;
typedef struct QemuUIInfo {
/* geometry */
@@ -189,6 +189,8 @@ typedef struct QemuDmaBuf {
bool y0_top;
} QemuDmaBuf;
+typedef struct DisplayState DisplayState;
+
typedef struct DisplayChangeListenerOps {
const char *dpy_name;
--
1.8.3.1
- [Qemu-devel] [PULL 01/25] hw/misc/ivshmem: Remove deprecated "ivshmem" legacy device, (continued)
- [Qemu-devel] [PULL 01/25] hw/misc/ivshmem: Remove deprecated "ivshmem" legacy device, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 13/25] hw/ide/ahci: Remove AllwinnerAHCIState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 16/25] hw/char/serial: Remove SerialState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 11/25] hw/pcmcia: Remove PCMCIACardState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 19/25] ui/console: Remove QemuDmaBuf from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 24/25] configure: Force the C standard to gnu99, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 12/25] hw/ssi: Remove SSIBus from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 09/25] tests/pnv-xscom: Make test independent of global_qtest, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 18/25] audio: Remove AudioState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 22/25] ppc: Move spapr-related prototypes from xics.h into a seperate header file, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 20/25] ui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h",
Thomas Huth <=
- [Qemu-devel] [PULL 17/25] hw/i386: Remove PCMachineClass from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 21/25] linux-user: Fix compilation with clang 3.4, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 10/25] hw/input/ps2: Remove PS2State from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 25/25] tests/hexloader-test: Don't pass -nographic to the QEMU under test, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 15/25] hw/bt: Remove HCIInfo from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 23/25] ppc: Fix duplicated typedefs to be able to compile with Clang in gnu99 mode, Thomas Huth, 2019/01/14
- Re: [Qemu-devel] [PULL 00/25] ivshmem deprecation, qtests, typedefs and gnu99, Peter Maydell, 2019/01/14