| Message ID | 20190114130829.21790-4-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | typedefs: Remove scarcely used declarations | expand |
On Mon, Jan 14, 2019 at 02:08:29PM +0100, Philippe Mathieu-Daudé wrote: > 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). Acked-by: Gerd Hoffmann <kraxel@redhat.com> > > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/qemu/typedefs.h | 1 - > include/ui/console.h | 10 ---------- > 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 4cda7343bf..64b8386697 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -67,7 +67,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); > -- > 2.17.2 >
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 4cda7343bf..64b8386697 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -67,7 +67,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);
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> --- include/qemu/typedefs.h | 1 - include/ui/console.h | 10 ---------- include/ui/qemu-pixman.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 11 deletions(-)