From patchwork Wed Jul 6 12:19:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BF2A6B6F7A for ; Wed, 6 Jul 2011 22:47:53 +1000 (EST) Received: from localhost ([::1]:50671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeRW9-0008Ig-MY for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2011 08:47:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR5C-0001iC-Br for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR55-0005EN-3h for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR54-0005EE-EB for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:50 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p66CJnaG022812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:49 -0400 Received: from bow.redhat.com (vpn-10-220.rdu.redhat.com [10.11.10.220]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p66CJR0s022836; Wed, 6 Jul 2011 08:19:48 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2011 14:19:21 +0200 Message-Id: <1309954766-9728-13-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] qxl: make qxl_guest_bug take variable arguments 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 --- hw/qxl.c | 18 +++++++++++------- hw/qxl.h | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 36cc9af..a5c2d69 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -139,11 +139,15 @@ static void qxl_reset_memslots(PCIQXLDevice *d); static void qxl_reset_surfaces(PCIQXLDevice *d); static void qxl_ring_set_dirty(PCIQXLDevice *qxl); -void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg) +void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) { qxl_send_events(qxl, QXL_INTERRUPT_ERROR); if (qxl->guestdebug) { - fprintf(stderr, "qxl-%d: guest bug: %s\n", qxl->id, msg); + va_list ap; + va_start(ap, msg); + fprintf(stderr, "qxl-%d: guest bug: ", qxl->id); + vfprintf(stderr, msg, ap); + va_end(ap); } } @@ -1152,11 +1156,11 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) QXLDevMemSlot memslot; if (val >= NUM_MEMSLOTS) { - qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: val out of range"); + qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: val out of range\n"); break; } if (d->guest_slots[val].active) { - qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: memory slot already active"); + qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: memory slot already active\n"); break; } d->guest_slots[val].slot = d->ram->mem_slot; @@ -1166,7 +1170,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) } case QXL_IO_MEMSLOT_DEL: if (val >= NUM_MEMSLOTS) { - qxl_guest_bug(d, "QXL_IO_MEMSLOT_DEL: val out of range"); + qxl_guest_bug(d, "QXL_IO_MEMSLOT_DEL: val out of range\n"); break; } qxl_del_memslot(d, val); @@ -1176,7 +1180,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) QXLDevSurfaceCreate surface; if (val != 0) { - qxl_guest_bug(d, "QXL_IO_CREATE_PRIMARY: val != 0"); + qxl_guest_bug(d, "QXL_IO_CREATE_PRIMARY: val != 0\n"); break; } dprint(d, 1, "QXL_IO_CREATE_PRIMARY\n"); @@ -1187,7 +1191,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) } case QXL_IO_DESTROY_PRIMARY: if (val != 0) { - qxl_guest_bug(d, "QXL_IO_DESTROY_PRIMARY: val != 0"); + qxl_guest_bug(d, "QXL_IO_DESTROY_PRIMARY: val != 0\n"); break; } dprint(d, 1, "QXL_IO_DESTROY_PRIMARY (%s)\n", qxl_mode_to_string(d->mode)); diff --git a/hw/qxl.h b/hw/qxl.h index 88393c2..e361bc6 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -99,7 +99,7 @@ typedef struct PCIQXLDevice { /* qxl.c */ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); -void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg); +void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...); void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, struct QXLRect *area, struct QXLRect *dirty_rects,