From patchwork Wed Jul 13 14:49:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 104561 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 57745B6F54 for ; Thu, 14 Jul 2011 02:28:09 +1000 (EST) Received: from localhost ([::1]:41187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh2I9-0008Od-T1 for incoming@patchwork.ozlabs.org; Wed, 13 Jul 2011 12:28:06 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh0ll-00074P-0Z for qemu-devel@nongnu.org; Wed, 13 Jul 2011 10:50:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qh0lj-000868-89 for qemu-devel@nongnu.org; Wed, 13 Jul 2011 10:50:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh0li-00085p-GD for qemu-devel@nongnu.org; Wed, 13 Jul 2011 10:50:30 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6DEoTIA003467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Jul 2011 10:50:29 -0400 Received: from bow.tlv.redhat.com (dhcp-3-110.tlv.redhat.com [10.35.3.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p6DEoGsb031549; Wed, 13 Jul 2011 10:50:27 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 13 Jul 2011 17:49:53 +0300 Message-Id: <1310568597-24181-8-git-send-email-alevy@redhat.com> In-Reply-To: <1310568597-24181-1-git-send-email-alevy@redhat.com> References: <1310568597-24181-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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] [PATCHv4 07/11] 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 Signed-off-by: Alon Levy --- hw/qxl.c | 19 ++++++++++++------- hw/qxl.h | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 3d1f108..34a5f78 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -124,11 +124,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); } } @@ -1120,11 +1124,12 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) break; case QXL_IO_MEMSLOT_ADD: 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; @@ -1132,14 +1137,14 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) break; 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); break; case QXL_IO_CREATE_PRIMARY: 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"); @@ -1148,7 +1153,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) break; 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 5db9aae..32ca5a0 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,