[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qxl: make qxl_guest_bug take variable arguments
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH] qxl: make qxl_guest_bug take variable arguments |
Date: |
Wed, 6 Jul 2011 14:19:21 +0200 |
---
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,
--
1.7.5.4
- [Qemu-devel] [PATCH] qxl: move qemu_spice_create_primary_surface call out of qxl_create_guest_primary, (continued)
- [Qemu-devel] [PATCH] qxl: move qemu_spice_create_primary_surface call out of qxl_create_guest_primary, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: remove qxl_destroy_primary(), Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] spice/qxl: move worker wrappers, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: move qemu_spice_add_memslot call out of qxl_add_memslot, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: fix surface tracking & locking, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: add io_port_to_string, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: bump pci rev, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: error handling fixes and cleanups., Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: make qxl_guest_bug take variable arguments,
Alon Levy <=
- [Qemu-devel] [PATCH] qxl: only disallow specific io's in vga mode, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: async I/O, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: use QXL_REVISION_*, Alon Levy, 2011/07/06
- [Qemu-devel] [PATCH] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support, Alon Levy, 2011/07/06