spice patch queue
Hi,
Carrying three little fixes.
please pull,
Gerd
The following changes since commit 94c2b6aff43cdfcfdfb552773a6b6b973a72ef0b:
mips_malta: support up to 2GiB RAM (2013-09-09 18:42:22 +0200)
are available in the git repository at:
git://anongit.freedesktop.org/spice/qemu spice.v73
for you to fetch changes up to c58c7b959b93b864a27fd6b3646ee1465ab8832b:
qxl: fix local renderer (2013-09-10 11:14:08 +0200)
----------------------------------------------------------------
Christophe Fergeau (1):
spice-core: Use g_strdup_printf instead of snprintf
Gerd Hoffmann (2):
qxl: trace io port name
qxl: fix local renderer
hw/display/qxl-render.c | 15 ++++++++++----- hw/display/qxl.c | 5 +++-- trace-events | 2 +- ui/spice-core.c | 28 ++++++++++++++-------------- 4 files changed, 28 insertions(+), 22 deletions(-)
PATCH 1/3 spice-core: Use g_strdup_printf instead of snprintf
From: Christophe Fergeau <[email protected]>
Several places in spice-core.c were using either g_malloc+snprintf or snprintf+g_strdup to achieve the same result as g_strdup_printf.
--- ui/spice-core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
ui/spice-core.c +14 -14
@@ -511,7 +511,9 @@ SpiceInfo *qmp_query_spice(Error **errp)int port, tls_port;const char *addr;SpiceInfo *info; -char version_string[20 ];/* 12 = |255.255.255\0| is the max */ +unsigned int major; +unsigned int minor; +unsigned int micro; info =g_malloc0 (sizeof (*info));
@@ -534,11 +536,10 @@ SpiceInfo *qmp_query_spice(Error **errp) info->host =g_strdup (addr ? addr :"0.0.0.0" ); info->has_compiled_version = true; -snprintf (version_string,sizeof (version_string),"%d.%d.%d" , - (SPICE_SERVER_VERSION &0xff0000 ) >>16 , - (SPICE_SERVER_VERSION &0xff00 ) >>8 , -SPICE_SERVER_VERSION &0xff ); - info->compiled_version =g_strdup (version_string); + major = (SPICE_SERVER_VERSION &0xff0000 ) >>16 ; + minor = (SPICE_SERVER_VERSION &0xff00 ) >>8 ; + micro =SPICE_SERVER_VERSION &0xff ; + info->compiled_version =g_strdup_printf ("%d.%d.%d" , major, minor, micro);if (port) { info->has_port = true;
@@ -640,7 +641,7 @@ void qemu_spice_init(void)char *x509_key_file =NULL , *x509_cert_file =NULL , *x509_cacert_file =NULL ; -int port, tls_port, len, addr_flags; +int port, tls_port, addr_flags;spice_image_compression_t compression;spice_wan_compression_t wan_compr;bool seamless_migration;
@@ -671,30 +672,29 @@ void qemu_spice_init(void)if (NULL == x509_dir) { x509_dir ="." ; } - len =strlen (x509_dir) +32 ; str =qemu_opt_get (opts,"x509-key-file" );if (str) { x509_key_file =g_strdup (str); }else { - x509_key_file =g_malloc (len); -snprintf (x509_key_file, len,"%s/%s" , x509_dir,X509_SERVER_KEY_FILE ); + x509_key_file =g_strdup_printf ("%s/%s" , x509_dir, +X509_SERVER_KEY_FILE ); } str =qemu_opt_get (opts,"x509-cert-file" );if (str) { x509_cert_file =g_strdup (str); }else { - x509_cert_file =g_malloc (len); -snprintf (x509_cert_file, len,"%s/%s" , x509_dir,X509_SERVER_CERT_FILE ); + x509_cert_file =g_strdup_printf ("%s/%s" , x509_dir, +X509_SERVER_CERT_FILE ); } str =qemu_opt_get (opts,"x509-cacert-file" );if (str) { x509_cacert_file =g_strdup (str); }else { - x509_cacert_file =g_malloc (len); -snprintf (x509_cacert_file, len,"%s/%s" , x509_dir,X509_CA_CERT_FILE ); + x509_cacert_file =g_strdup_printf ("%s/%s" , x509_dir, +X509_CA_CERT_FILE ); } x509_key_password =qemu_opt_get (opts,"x509-key-password" );
Signature · 1 line
1.8.3.1
PATCH 2/3 qxl: trace io port name
In reply to Gerd Hoffmann--- hw/display/qxl.c | 5 +++-- trace-events | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
hw/display/qxl.c +3 -2
@@ -1541,8 +1541,9 @@ async_common:default :break ; } -trace_qxl_io_write (d->id,qxl_mode_to_string (d->mode), addr, val, size, - async); +trace_qxl_io_write (d->id,qxl_mode_to_string (d->mode), + addr,io_port_to_string (addr), + val, size, async);switch (io_port) {case QXL_IO_UPDATE_AREA :
trace-events +1 -1
@@ -1059,7 +1059,7 @@ qxl_io_destroy_primary_ignored(int qid, const char *mode) "%d %s" qxl_io_log(int qid, const uint8_t *log_buf) "%d %s" qxl_io_read_unexpected(int qid) "%d" qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const char *desc) "%d 0x%"PRIx64"=%"PRIu64" (%s)" -qxl_io_write(int qid, const char *mode, uint64_t addr, uint64_t val, unsigned size, int async) "%d %s addr=%"PRIu64 " val=%"PRIu64" size=%u async=%d" +qxl_io_write(int qid, const char *mode, uint64_t addr, const char *aname, uint64_t val, unsigned size, int async) "%d %s addr=%"PRIu64 " (%s) val=%"PRIu64" size=%u async=%d" qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uint64_t guest_end) "%d %u: guest phys 0x%"PRIx64 " - 0x%" PRIx64 qxl_post_load(int qid, const char *mode) "%d %s" qxl_pre_load(int qid) "%d"
Signature · 1 line
1.8.3.1
PATCH 3/3 qxl: fix local renderer
In reply to Gerd HoffmannThe local spice renderer assumes the primary surface is located at the start of the "ram" bar. This used to be a requirement in qxl hardware revision 1. In revision 2+ this is relaxed. Nevertheless guest drivers continued to use the traditional location, for historical and backward compatibility reasons. The qxl kms driver doesn't though as it depends on qxl revision 4+ anyway.
Result is that local rendering is hosed for recent linux guests, you'll get pixel garbage with non-spice ui (gtk, sdl, vnc) and when doing screendumps. Fix that by doing a proper mapping of the guest-specified memory location.
https://bugzilla.redhat.com/show_bug.cgi?id=948717
--- hw/display/qxl-render.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
hw/display/qxl-render.c +10 -5
@@ -31,10 +31,6 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect)if (is_buffer_shared (surface)) {return ; } -if (!qxl->guest_primary.data) { -trace_qxl_render_blit_guest_primary_initialized (); - qxl->guest_primary.data =memory_region_get_ram_ptr (&qxl->vga.vram); - }trace_qxl_render_blit (qxl->guest_primary.qxl_stride, rect->left, rect->right, rect->top, rect->bottom); src = qxl->guest_primary.data;
@@ -104,7 +100,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)if (qxl->guest_primary.resized) { qxl->guest_primary.resized =0 ; - qxl->guest_primary.data =memory_region_get_ram_ptr (&qxl->vga.vram); + qxl->guest_primary.data =qxl_phys2virt (qxl, + qxl->guest_primary.surface.mem, +MEMSLOT_GROUP_GUEST ); +if (!qxl->guest_primary.data) { +return ; + }qxl_set_rect_to_surface (qxl, &qxl->dirty[0 ]); qxl->num_dirty_rects =1 ; trace_qxl_render_guest_primary_resized(
@@ -128,6 +129,10 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) }dpy_gfx_replace_surface (vga->con, surface); } + +if (!qxl->guest_primary.data) { +return ; + }for (i =0 ; i < qxl->num_dirty_rects; i++) {if (qemu_spice_rect_is_empty (qxl->dirty+i)) {break ;
Signature · 1 line
1.8.3.1