[Qemu-devel] [PULL 1.1] spice patch queue

[Qemu-devel] [PULL 1.1] spice patch queue

[Gerd Hoffmann]

  Hi,

Single little bugfix for 1.1 ...

please pull,
  Gerd

The following changes since commit 94d1991445fa3582c042ee4e5b72606e2fc39cc2:

  sun4u: implement interrupt clearing registers (2012-05-12 09:49:19 +0000)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v55

Uri Lublin (1):
      qxl: set size of PCI IO BAR correctly (16) for revision 2

 hw/qxl.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

[Qemu-devel] [PATCH 1.1] qxl: set size of PCI IO BAR correctly (16) for revision 2

[Gerd Hoffmann]

From: Uri Lublin <uril@redhat.com>

Also move it up into switch(qxl->revision) block

Signed-off-by: Uri Lublin <uril@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index 6c11e70..3da3399 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1746,13 +1746,16 @@ static int qxl_init_common(PCIQXLDevice *qxl)
     switch (qxl->revision) {
     case 1: /* spice 0.4 -- qxl-1 */
         pci_device_rev = QXL_REVISION_STABLE_V04;
+        io_size = 8;
         break;
     case 2: /* spice 0.6 -- qxl-2 */
         pci_device_rev = QXL_REVISION_STABLE_V06;
+        io_size = 16;
         break;
     case 3: /* qxl-3 */
     default:
         pci_device_rev = QXL_DEFAULT_REVISION;
+        io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
         break;
     }
 
@@ -1770,11 +1773,6 @@ static int qxl_init_common(PCIQXLDevice *qxl)
     memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar,
                              0, qxl->vram32_size);
 
-    io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
-    if (qxl->revision == 1) {
-        io_size = 8;
-    }
-
     memory_region_init_io(&qxl->io_bar, &qxl_io_ops, qxl,
                           "qxl-ioports", io_size);
     if (qxl->id == 0) {
-- 
1.7.1

Re: [Qemu-devel] [PULL 1.1] spice patch queue

[Anthony Liguori]

On 05/14/2012 03:25 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Single little bugfix for 1.1 ...
>
> please pull,
>    Gerd

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> The following changes since commit 94d1991445fa3582c042ee4e5b72606e2fc39cc2:
>
>    sun4u: implement interrupt clearing registers (2012-05-12 09:49:19 +0000)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v55
>
> Uri Lublin (1):
>        qxl: set size of PCI IO BAR correctly (16) for revision 2
>
>   hw/qxl.c |    8 +++-----
>   1 files changed, 3 insertions(+), 5 deletions(-)
>
>