diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:06 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:06 -0600 |
| commit | 7e68494b0be4310c48996e9334373ef5771e3d15 (patch) | |
| tree | f9f24372cc2bd72f537142f143426765c9d794db /qemu-pixman.c | |
| parent | f3d44eb53c10b4dddfb3762c3e005be38adfc0ed (diff) | |
| parent | 6e72719e721a40fe1224701ca10edc1caf0cd708 (diff) | |
| download | focaccia-qemu-7e68494b0be4310c48996e9334373ef5771e3d15.tar.gz focaccia-qemu-7e68494b0be4310c48996e9334373ef5771e3d15.zip | |
Merge remote-tracking branch 'agraf/ppc-for-upstream-1.3' into staging
* agraf/ppc-for-upstream-1.3: fbdev: fix pixman compile on old pixman vl.c: Fix broken -usb option pseries: Fix bug in PCI MSI allocation kvm: fix incorrect length in a loop over kvm dirty pages map PPC: Fix missing TRACE exception hw/ide/macio: Fix segfault caused by NULL DMAContext* Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-pixman.c')
| -rw-r--r-- | qemu-pixman.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-pixman.c b/qemu-pixman.c index ac7bc018ec..e46e1804f6 100644 --- a/qemu-pixman.c +++ b/qemu-pixman.c @@ -21,7 +21,9 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift) if (rshift == 0) { type = PIXMAN_TYPE_ABGR; } else { +#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 21, 8) type = PIXMAN_TYPE_BGRA; +#endif } } return type; |