Patchwork spice: fix 32bit build

login
register
mail settings
Submitter Gerd Hoffmann
Date March 20, 2012, 11:26 a.m.
Message ID <1332242812-6993-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/147783/
State New
Headers show

Comments

Gerd Hoffmann - March 20, 2012, 11:26 a.m.
New 32bit warnings sneaked in, this time in
ui/spice-display.c, fix them.

This gets annonying, /me sets up a ubuntu buildbot
slave for 32bit spice testbuilds.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/seabios       |    2 +-
 ui/spice-display.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
Peter Maydell - March 20, 2012, 11:42 a.m.
On 20 March 2012 11:26, Gerd Hoffmann <kraxel@redhat.com> wrote:
> New 32bit warnings sneaked in, this time in
> ui/spice-display.c, fix them.
>
> This gets annonying, /me sets up a ubuntu buildbot
> slave for 32bit spice testbuilds.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  roms/seabios       |    2 +-
>  ui/spice-display.c |   12 ++++++------

What's the roms/seabios change doing here?

Also, isn't the ui/spice-display.c patch the same as this one from
me from a couple of weeks back?
http://patchwork.ozlabs.org/patch/145269/

-- PMM
Gerd Hoffmann - March 20, 2012, 12:13 p.m.
Hi,

> What's the roms/seabios change doing here?

Just a missing "git submodule update" and the diff from that sneaking in.

> Also, isn't the ui/spice-display.c patch the same as this one from
> me from a couple of weeks back?
> http://patchwork.ozlabs.org/patch/145269/

It is.  Picked that one up instead.

/me is confused, I through I had that one already and we just got new
warnings, sorry.

cheers,
  Gerd
Peter Maydell - March 20, 2012, 12:14 p.m.
On 20 March 2012 12:13, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> Also, isn't the ui/spice-display.c patch the same as this one from
>> me from a couple of weeks back?
>> http://patchwork.ozlabs.org/patch/145269/
>
> It is.  Picked that one up instead.
>
> /me is confused, I through I had that one already and we just got new
> warnings, sorry.

No problem. (I was under the impression that had been committed
already as well for some reason...)

-- PMM
Michael Tokarev - March 20, 2012, 12:45 p.m.
20.03.2012 15:26, Gerd Hoffmann wrote:
> New 32bit warnings sneaked in, this time in
> ui/spice-display.c, fix them.
>
> This gets annonying, /me sets up a ubuntu buildbot
> slave for 32bit spice testbuilds.

Um, is it worth to watch/fix?  Note that spice does
not work on 32bits anyway, qemu segfaults at startup...
http://bugs.debian.org/640139 (the bug was still valid
when 1.0 was released).

Thanks,

/mjt
Alon Levy - March 20, 2012, 1:19 p.m.
On Tue, Mar 20, 2012 at 04:45:26PM +0400, Michael Tokarev wrote:
> 20.03.2012 15:26, Gerd Hoffmann wrote:
> >New 32bit warnings sneaked in, this time in
> >ui/spice-display.c, fix them.
> >
> >This gets annonying, /me sets up a ubuntu buildbot
> >slave for 32bit spice testbuilds.
> 
> Um, is it worth to watch/fix?  Note that spice does
> not work on 32bits anyway, qemu segfaults at startup...
> http://bugs.debian.org/640139 (the bug was still valid
> when 1.0 was released).

Hmm, my bad - I only tested with Xspice, that doesn't go through the
slots. So at least it means most of it works fine for 32 bit. I'll try
to fix this part. Thanks for the link.

> 
> Thanks,
> 
> /mjt
>
Peter Maydell - March 20, 2012, 1:38 p.m.
On 20 March 2012 12:45, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Um, is it worth to watch/fix?  Note that spice does
> not work on 32bits anyway, qemu segfaults at startup...

I've had conflicting answers about this -- the Spice FAQ says
it doesn't work on 32 bits but in this message:
http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg00944.html
Gerd said it should work on 32 bit systems now.

(If it is now OK on 32 bits it would be nice to get the
FAQ fixed...)

-- PMM

Patch

diff --git a/roms/seabios b/roms/seabios
index 2e8bd61..80d11e8 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@ 
-Subproject commit 2e8bd611ce4e1e36b5a80c9ca6e256e23802f095
+Subproject commit 80d11e8577bf03e98f2eb1b0cb3a281ab2879c9e
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 28d6d4a..6d7563f 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -80,8 +80,8 @@  void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
 
     if (async != QXL_SYNC) {
         spice_qxl_add_memslot_async(&ssd->qxl, memslot,
-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
-                                         QXL_IO_MEMSLOT_ADD_ASYNC));
+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
+                                          QXL_IO_MEMSLOT_ADD_ASYNC));
     } else {
         ssd->worker->add_memslot(ssd->worker, memslot);
     }
@@ -100,8 +100,8 @@  void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,
     trace_qemu_spice_create_primary_surface(ssd->qxl.id, id, surface, async);
     if (async != QXL_SYNC) {
         spice_qxl_create_primary_surface_async(&ssd->qxl, id, surface,
-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
-                                         QXL_IO_CREATE_PRIMARY_ASYNC));
+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
+                                          QXL_IO_CREATE_PRIMARY_ASYNC));
     } else {
         ssd->worker->create_primary_surface(ssd->worker, id, surface);
     }
@@ -113,8 +113,8 @@  void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,
     trace_qemu_spice_destroy_primary_surface(ssd->qxl.id, id, async);
     if (async != QXL_SYNC) {
         spice_qxl_destroy_primary_surface_async(&ssd->qxl, id,
-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
-                                         QXL_IO_DESTROY_PRIMARY_ASYNC));
+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
+                                          QXL_IO_DESTROY_PRIMARY_ASYNC));
     } else {
         ssd->worker->destroy_primary_surface(ssd->worker, id);
     }