[Spice-commits] 2 commits - spice/protocol.h spice/qxl_dev.h

[Søren Sandmann Pedersen]

 spice/protocol.h |    1 +
 spice/qxl_dev.h  |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 361fd166b26b4450617b1f7175be9aaa7d8f6a7e
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Fri Aug 24 17:53:13 2012 -0400

    Add new client_present and client capabilities fields to QXLRom
    
    The client_present field is a byte that is set of non-zero when a
    client is connected and to zero when no client is connected.
    
    The client_capabilities[58] array contains 464 bits that indicate the
    capabilities of the client. Each bit corresponds to a
    SPICE_DISPLAY_CAP_* capability. In particular, if the client has
    capability C, then bit (C % 8) in byte (C / 8) is set. The capability
    bits only have a defined meaning when a client is connected, ie., when
    client_present is non-zero. The number 58 was chosen to fill out a
    cache line in QXLRom.
    
    A new QXL_INTERRUPT_CLIENT interrupt is defined, which will be raised
    whenever a client connects or disconnects.

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 1292767..50784dc 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -148,7 +148,9 @@ typedef struct SPICE_ATTR_PACKED QXLRom {
     uint8_t slot_gen_bits;
     uint8_t slot_id_bits;
     uint8_t slot_generation;
-    uint8_t padding[3]; /* Padding to 32bit align */
+    /* appended for qxl-4 */
+    uint8_t client_present;
+    uint8_t client_capabilities[58];
 } QXLRom;
 
 /* qxl-1 compat: fixed */
@@ -231,6 +233,7 @@ SPICE_RING_DECLARE(QXLReleaseRing, uint64_t, QXL_RELEASE_RING_SIZE);
 #define QXL_INTERRUPT_CURSOR (1 << 1)
 #define QXL_INTERRUPT_IO_CMD (1 << 2)
 #define QXL_INTERRUPT_ERROR  (1 << 3)
+#define QXL_INTERRUPT_CLIENT (1 << 4)
 
 /* qxl-1 compat: append only */
 typedef struct SPICE_ATTR_PACKED QXLRam {
commit 8459b35ec0a2c1cddd7dab8b726e752bcde4c609
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Sat Sep 1 11:19:41 2012 -0400

    Add A8 surface capability
    
    Even though the ability to handle a8 surfaces was added at the same
    time as the composite command, they are logically separate, so add a
    capability bit to indicate the presence of a8 surfaces.

diff --git a/spice/protocol.h b/spice/protocol.h
index 7008399..0671292 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -128,6 +128,7 @@ enum {
     SPICE_DISPLAY_CAP_SIZED_STREAM,
     SPICE_DISPLAY_CAP_MONITORS_CONFIG,
     SPICE_DISPLAY_CAP_COMPOSITE,
+    SPICE_DISPLAY_CAP_A8_SURFACE,
 };
 
 enum {