qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Glauber Costa <glommer@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PATCH 15/15] Fix vga_screen_dump_blank() PPM generation
Date: Wed, 17 Jun 2009 13:10:04 -0400	[thread overview]
Message-ID: <1245258604-2843-16-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1245258604-2843-15-git-send-email-glommer@redhat.com>

From: Eduardo Habkost <ehabkost@redhat.com>

vga_screen_dump_blank() was not generating a valid PPM file: the width of the
image made no sense (why it was multiplied by sizeof(uint32_t)?), and there was
only one sample per pixel, instead of three.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 hw/vga.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/vga.c b/hw/vga.c
index 709d6bb..00a7ae5 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2606,8 +2606,9 @@ static void vga_screen_dump_blank(VGAState *s, const char *filename)
 {
     FILE *f;
     unsigned int y, x, w, h;
+    unsigned char blank_sample[3] = { 0, 0, 0 };
 
-    w = s->last_scr_width * sizeof(uint32_t);
+    w = s->last_scr_width;
     h = s->last_scr_height;
 
     f = fopen(filename, "wb");
@@ -2616,7 +2617,7 @@ static void vga_screen_dump_blank(VGAState *s, const char *filename)
     fprintf(f, "P6\n%d %d\n%d\n", w, h, 255);
     for (y = 0; y < h; y++) {
         for (x = 0; x < w; x++) {
-            fputc(0, f);
+            fwrite(blank_sample, 3, 1, f);
         }
     }
     fclose(f);
-- 
1.6.2.2

  reply	other threads:[~2009-06-17 17:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-17 17:09 [Qemu-devel] [GIT PULL 00/15] Stable branch update 2009-06-17 Glauber Costa
2009-06-17 17:09 ` [Qemu-devel] [PATCH 01/15] net: Fix -net socket, listen (Jan Kiszka) Glauber Costa
2009-06-17 17:09   ` [Qemu-devel] [PATCH 02/15] Minimal ethernet frame length is 64 bytes Glauber Costa
2009-06-17 17:09     ` [Qemu-devel] [PATCH 03/15] Don't send all gratuitous packets at once Glauber Costa
2009-06-17 17:09       ` [Qemu-devel] [PATCH 04/15] serial: fix lost character after sysrq Glauber Costa
2009-06-17 17:09         ` [Qemu-devel] [PATCH 05/15] e1000: Ignore reset command Glauber Costa
2009-06-17 17:09           ` [Qemu-devel] [PATCH 06/15] VNC: Fix memory allocation (wrong structure size) Glauber Costa
2009-06-17 17:09             ` [Qemu-devel] [PATCH 07/15] fix raw_pread_aligned return value Glauber Costa
2009-06-17 17:09               ` [Qemu-devel] [PATCH 08/15] BACKPORT: Register reset functions for e1000 and rtl8139 Glauber Costa
2009-06-17 17:09                 ` [Qemu-devel] [PATCH 09/15] BACKPORT: Update irqs on reset and device load Glauber Costa
2009-06-17 17:09                   ` [Qemu-devel] [PATCH 10/15] BACKPORT: Add rtc reset function Glauber Costa
2009-06-17 17:10                     ` [Qemu-devel] [PATCH 11/15] fix qemu_aio_flush Glauber Costa
2009-06-17 17:10                       ` [Qemu-devel] [PATCH 12/15] QEMU KVM: i386: Fix the cpu reset state Glauber Costa
2009-06-17 17:10                         ` [Qemu-devel] [PATCH 13/15] kvm: Fix IRQ injection into full queue Glauber Costa
2009-06-17 17:10                           ` [Qemu-devel] [PATCH 14/15] Prevent CD-ROM media eject while device is locked Glauber Costa
2009-06-17 17:10                             ` Glauber Costa [this message]
2009-06-17 17:12                   ` [Qemu-devel] Re: [PATCH 09/15] BACKPORT: Update irqs on reset and device load Blue Swirl
2009-06-17 17:49                     ` Glauber Costa
2009-06-17 17:57 ` [Qemu-devel] [GIT PULL 00/15] Stable branch update 2009-06-17 Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1245258604-2843-16-git-send-email-glommer@redhat.com \
    --to=glommer@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).