From patchwork Sun Mar 11 19:26:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 146011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A821FB6EEA for ; Mon, 12 Mar 2012 06:50:30 +1100 (EST) Received: from localhost ([::1]:53071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6oQr-0004W4-0s for incoming@patchwork.ozlabs.org; Sun, 11 Mar 2012 15:27:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6oQ1-0002Cj-HH for qemu-devel@nongnu.org; Sun, 11 Mar 2012 15:27:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6oPx-0008Hl-VD for qemu-devel@nongnu.org; Sun, 11 Mar 2012 15:27:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6oPx-0008HC-NI for qemu-devel@nongnu.org; Sun, 11 Mar 2012 15:26:57 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2BJQugw018483 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 11 Mar 2012 15:26:56 -0400 Received: from garlic.redhat.com (vpn-200-153.tlv.redhat.com [10.35.200.153]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2BJQkF0032029; Sun, 11 Mar 2012 15:26:54 -0400 From: Alon Levy To: qemu-devel@nongnu.org, kraxel@redhat.com, lcapitulino@redhat.com, aliguori@us.ibm.com Date: Sun, 11 Mar 2012 21:26:43 +0200 Message-Id: <1331494004-26177-5-git-send-email-alevy@redhat.com> In-Reply-To: <1331494004-26177-1-git-send-email-alevy@redhat.com> References: <1331483977-18910-1-git-send-email-alevy@redhat.com> <1331494004-26177-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/5] console: pass Monitor to vga_hw_screen_dump/hw_vga_dump X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Passes the Monitor ptr to the screendump implementation to all for monitor suspend and resume for qxl to fix screendump regression. graphics_console_init signature change required touching every implemented of screen_dump. There is no change other then an added parameter. qxl will make use of it in the next patch. compiles with ./configure Signed-off-by: Alon Levy --- console.c | 4 ++-- console.h | 5 +++-- hw/blizzard.c | 2 +- hw/g364fb.c | 3 ++- hw/omap_dss.c | 4 +++- hw/omap_lcdc.c | 3 ++- hw/qxl.c | 5 +++-- hw/sm501.c | 4 ++-- hw/tcx.c | 12 ++++++++---- hw/vga.c | 6 ++++-- hw/vmware_vga.c | 5 +++-- monitor.c | 2 +- 12 files changed, 34 insertions(+), 21 deletions(-) diff --git a/console.c b/console.c index 6a463f5..3e386fc 100644 --- a/console.c +++ b/console.c @@ -173,7 +173,7 @@ void vga_hw_invalidate(void) active_console->hw_invalidate(active_console->hw); } -void vga_hw_screen_dump(const char *filename) +void vga_hw_screen_dump(const char *filename, Monitor *mon) { TextConsole *previous_active_console; bool cswitch; @@ -187,7 +187,7 @@ void vga_hw_screen_dump(const char *filename) console_select(0); } if (consoles[0] && consoles[0]->hw_screen_dump) { - consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch); + consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch, mon); } else { error_report("screen dump not implemented"); } diff --git a/console.h b/console.h index 4334db5..0d2cf30 100644 --- a/console.h +++ b/console.h @@ -343,7 +343,8 @@ static inline void console_write_ch(console_ch_t *dest, uint32_t ch) typedef void (*vga_hw_update_ptr)(void *); typedef void (*vga_hw_invalidate_ptr)(void *); -typedef void (*vga_hw_screen_dump_ptr)(void *, const char *, bool cswitch); +typedef void (*vga_hw_screen_dump_ptr)(void *, const char *, bool cswitch, + Monitor *mon); typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *); DisplayState *graphic_console_init(vga_hw_update_ptr update, @@ -354,7 +355,7 @@ DisplayState *graphic_console_init(vga_hw_update_ptr update, void vga_hw_update(void); void vga_hw_invalidate(void); -void vga_hw_screen_dump(const char *filename); +void vga_hw_screen_dump(const char *filename, Monitor *mon); void vga_hw_text_update(console_ch_t *chardata); int is_graphic_console(void); diff --git a/hw/blizzard.c b/hw/blizzard.c index c7d844d..8ccea7f 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -933,7 +933,7 @@ static void blizzard_update_display(void *opaque) } static void blizzard_screen_dump(void *opaque, const char *filename, - bool cswitch) + bool cswitch, Monitor *mon) { BlizzardState *s = (BlizzardState *) opaque; diff --git a/hw/g364fb.c b/hw/g364fb.c index 3a0b68f..f89000c 100644 --- a/hw/g364fb.c +++ b/hw/g364fb.c @@ -289,7 +289,8 @@ static void g364fb_reset(G364State *s) g364fb_invalidate_display(s); } -static void g364fb_screen_dump(void *opaque, const char *filename, bool cswitch) +static void g364fb_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { G364State *s = opaque; int y, x; diff --git a/hw/omap_dss.c b/hw/omap_dss.c index 86ed6ea..b4a1a93 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -1072,7 +1072,9 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta, #if 0 s->state = graphic_console_init(omap_update_display, - omap_invalidate_display, omap_screen_dump, s); + omap_invalidate_display, + omap_screen_dump, + NULL, s); #endif return s; diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index f172093..ed2325d 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -264,7 +264,8 @@ static int ppm_save(const char *filename, uint8_t *data, return 0; } -static void omap_screen_dump(void *opaque, const char *filename, bool cswitch) +static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { struct omap_lcd_panel_s *omap_lcd = opaque; if (cswitch) { diff --git a/hw/qxl.c b/hw/qxl.c index bcfd661..d21b508 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1486,7 +1486,8 @@ static void qxl_hw_invalidate(void *opaque) vga->invalidate(vga); } -static void qxl_hw_screen_dump(void *opaque, const char *filename, bool cswitch) +static void qxl_hw_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { PCIQXLDevice *qxl = opaque; VGACommonState *vga = &qxl->vga; @@ -1497,7 +1498,7 @@ static void qxl_hw_screen_dump(void *opaque, const char *filename, bool cswitch) qxl_render_update(qxl, filename); break; case QXL_MODE_VGA: - vga->screen_dump(vga, filename, cswitch); + vga->screen_dump(vga, filename, cswitch, mon); break; default: break; diff --git a/hw/sm501.c b/hw/sm501.c index 786e076..eedcb8e 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -1442,6 +1442,6 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, } /* create qemu graphic console */ - s->ds = graphic_console_init(sm501_update_display, NULL, - NULL, NULL, s); + s->ds = graphic_console_init(sm501_update_display, NULL, NULL, + NULL, s); } diff --git a/hw/tcx.c b/hw/tcx.c index ac7dcb4..e800cb5 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -56,8 +56,10 @@ typedef struct TCXState { uint8_t dac_index, dac_state; } TCXState; -static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch); -static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch); +static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon); +static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon); static void tcx_set_dirty(TCXState *s) { @@ -574,7 +576,8 @@ static int tcx_init1(SysBusDevice *dev) return 0; } -static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch) +static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { TCXState *s = opaque; FILE *f; @@ -601,7 +604,8 @@ static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch) return; } -static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch) +static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { TCXState *s = opaque; FILE *f; diff --git a/hw/vga.c b/hw/vga.c index 6dc98f6..9af231e 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -163,7 +163,8 @@ static uint32_t expand4[256]; static uint16_t expand2[256]; static uint8_t expand4to8[16]; -static void vga_screen_dump(void *opaque, const char *filename, bool cswitch); +static void vga_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon); static void vga_update_memory_access(VGACommonState *s) { @@ -2409,7 +2410,8 @@ int ppm_save(const char *filename, struct DisplaySurface *ds) /* save the vga display in a PPM image even if no display is available */ -static void vga_screen_dump(void *opaque, const char *filename, bool cswitch) +static void vga_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { VGACommonState *s = opaque; diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 142d9f4..803118c 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1003,11 +1003,12 @@ static void vmsvga_invalidate_display(void *opaque) /* save the vga display in a PPM image even if no display is available */ -static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch) +static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch, + Monitor *mon) { struct vmsvga_state_s *s = opaque; if (!s->enable) { - s->vga.screen_dump(&s->vga, filename, cswitch); + s->vga.screen_dump(&s->vga, filename, cswitch, mon); return; } diff --git a/monitor.c b/monitor.c index cbdfbad..cdae23f 100644 --- a/monitor.c +++ b/monitor.c @@ -895,7 +895,7 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, static int do_screen_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) { - vga_hw_screen_dump(qdict_get_str(qdict, "filename")); + vga_hw_screen_dump(qdict_get_str(qdict, "filename"), mon); return 0; }