diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
| commit | 7fa124b273acd22a808e742ead78c065ccd9b4c4 (patch) | |
| tree | 60fc0c2deebaa7cef45b35f123986eed40f3ba3f /ui | |
| parent | fd2590bccc0bd63833813592a3e193686cf1c623 (diff) | |
| parent | daa76aa416b1e18ab1fac650ff53d966d8f21f68 (diff) | |
| download | qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.zip qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.tar.gz qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into staging
Error reporting patches for 2016-06-20
# gpg: Signature made Mon 20 Jun 2016 15:56:15 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2016-06-20:
log: Fix qemu_set_log_filename() error handling
log: Fix qemu_set_dfilter_ranges() error reporting
log: Plug memory leak on multiple -dfilter
coccinelle: Remove unnecessary variables for function return value
error: Remove unnecessary local_err variables
error: Remove NULL checks on error_propagate() calls
vl: Error messages need to go to stderr, fix some
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/cursor.c | 10 | ||||
| -rw-r--r-- | ui/qemu-pixman.c | 13 |
2 files changed, 7 insertions, 16 deletions
diff --git a/ui/cursor.c b/ui/cursor.c index a276e01..5155b39 100644 --- a/ui/cursor.c +++ b/ui/cursor.c @@ -81,18 +81,12 @@ void cursor_print_ascii_art(QEMUCursor *c, const char *prefix) QEMUCursor *cursor_builtin_hidden(void) { - QEMUCursor *c; - - c = cursor_parse_xpm(cursor_hidden_xpm); - return c; + return cursor_parse_xpm(cursor_hidden_xpm); } QEMUCursor *cursor_builtin_left_ptr(void) { - QEMUCursor *c; - - c = cursor_parse_xpm(cursor_left_ptr_xpm); - return c; + return cursor_parse_xpm(cursor_left_ptr_xpm); } QEMUCursor *cursor_alloc(int width, int height) diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index c9f8dce..6e8b83a 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -180,14 +180,11 @@ void qemu_pixman_linebuf_copy(pixman_image_t *fb, int width, int x, int y, pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format, pixman_image_t *image) { - pixman_image_t *mirror; - - mirror = pixman_image_create_bits(format, - pixman_image_get_width(image), - pixman_image_get_height(image), - NULL, - pixman_image_get_stride(image)); - return mirror; + return pixman_image_create_bits(format, + pixman_image_get_width(image), + pixman_image_get_height(image), + NULL, + pixman_image_get_stride(image)); } void qemu_pixman_image_unref(pixman_image_t *image) |