diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-01-14 14:08:29 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-01-22 05:14:33 +0100 |
| commit | 0a323e66b509bf2a018ea6c17e9d5fd0da804c44 (patch) | |
| tree | 7c146d80787104e9e028aa6e77a0e179408bc29c /include | |
| parent | 5a4c2e5905c05391a3374f75de582148394fd195 (diff) | |
| download | focaccia-qemu-0a323e66b509bf2a018ea6c17e9d5fd0da804c44.tar.gz focaccia-qemu-0a323e66b509bf2a018ea6c17e9d5fd0da804c44.zip | |
ui/console: Remove PixelFormat from qemu/typedefs.h
Header files requiring PixelFormat already include "ui/qemu-pixman.h". To clean "qemu/typedefs.h", move the declaration to "ui/qemu-pixman.h" (removing the forward declaration). Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/typedefs.h | 1 | ||||
| -rw-r--r-- | include/ui/console.h | 10 | ||||
| -rw-r--r-- | include/ui/qemu-pixman.h | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 38ec1fd38f..5d1a2d8329 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -71,7 +71,6 @@ typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; typedef struct PCMachineState PCMachineState; -typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; diff --git a/include/ui/console.h b/include/ui/console.h index aa9f975544..fef900db76 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -121,16 +121,6 @@ struct QemuConsoleClass { #define QEMU_ALLOCATED_FLAG 0x01 -struct PixelFormat { - uint8_t bits_per_pixel; - uint8_t bytes_per_pixel; - uint8_t depth; /* color depth in bits */ - uint32_t rmask, gmask, bmask, amask; - uint8_t rshift, gshift, bshift, ashift; - uint8_t rmax, gmax, bmax, amax; - uint8_t rbits, gbits, bbits, abits; -}; - typedef struct DisplaySurface { pixman_format_code_t format; pixman_image_t *image; diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index b7c82d17fc..0668109305 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -53,6 +53,16 @@ /* -------------------------------------------------------------------- */ +typedef struct PixelFormat { + uint8_t bits_per_pixel; + uint8_t bytes_per_pixel; + uint8_t depth; /* color depth in bits */ + uint32_t rmask, gmask, bmask, amask; + uint8_t rshift, gshift, bshift, ashift; + uint8_t rmax, gmax, bmax, amax; + uint8_t rbits, gbits, bbits, abits; +} PixelFormat; + PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format); pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endian); pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format); |