[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3] qxl: make qxl_guest_bug take variable arguments
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCHv3] qxl: make qxl_guest_bug take variable arguments |
Date: |
Tue, 12 Jul 2011 16:55:21 +0300 |
---
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 91bc98d..ae1d0de 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,11 @@ 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 +1136,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 +1152,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 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.6
- [Qemu-devel] [PATCHv3] async + suspend reworked, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] spice: add worker wrapper functions., Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] spice: add qemu_spice_display_init_common, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: remove qxl_destroy_primary(), Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: fix surface tracking & locking, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: bump pci rev, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: make qxl_guest_bug take variable arguments,
Alon Levy <=
- [Qemu-devel] [PATCHv3] qxl: error handling fixes and cleanups., Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/12
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Daniel P. Berrange, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Luiz Capitulino, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Luiz Capitulino, 2011/07/13