[Spice-commits] 2 commits - server/char-device.c server/dcc-send.c server/reds.c server/smartcard.c subprojects/spice-common

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Mar 18 12:44:03 UTC 2019


 server/char-device.c     |    2 +-
 server/dcc-send.c        |    2 +-
 server/reds.c            |    2 +-
 server/smartcard.c       |    2 +-
 subprojects/spice-common |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7f57ff018667322f8b59f8c8990cf2dbcf295683
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Feb 26 09:35:22 2019 +0000

    Remove support for 64 bit pointers on protocol
    
    Import "codegen: Remove support for --ptrsize" change from spice-common
    and update code accordingly.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/char-device.c b/server/char-device.c
index 0ebcc2e0..9ee25566 100644
--- a/server/char-device.c
+++ b/server/char-device.c
@@ -903,7 +903,7 @@ void red_char_device_migrate_data_marshall(RedCharDevice *dev,
     write_to_dev_size = 0;
     write_to_dev_tokens = 0;
 
-    m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
+    m2 = spice_marshaller_get_ptr_submarshaller(m);
     if (dev->priv->cur_write_buf) {
         uint32_t buf_remaining = dev->priv->cur_write_buf->buf + dev->priv->cur_write_buf->buf_used -
                                  dev->priv->cur_write_buf_pos;
diff --git a/server/dcc-send.c b/server/dcc-send.c
index e19ee19c..326e6fa8 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -1792,7 +1792,7 @@ static void display_channel_marshall_migrate_data_surfaces(DisplayChannelClient
                                                            SpiceMarshaller *m,
                                                            int lossy)
 {
-    SpiceMarshaller *m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
+    SpiceMarshaller *m2 = spice_marshaller_get_ptr_submarshaller(m);
     uint32_t num_surfaces_created;
     uint8_t *num_surfaces_created_ptr;
     uint32_t i;
diff --git a/server/reds.c b/server/reds.c
index 429f8142..bc043764 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1478,7 +1478,7 @@ void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m)
                          sizeof(VDIChunkHeader));
     spice_marshaller_add_uint8(m, mig_data.agent2client.msg_header_done);
     spice_marshaller_add_uint32(m, mig_data.agent2client.msg_header_partial_len);
-    m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
+    m2 = spice_marshaller_get_ptr_submarshaller(m);
     spice_marshaller_add(m2, agent_dev->priv->current_read_buf->data,
                          mig_data.agent2client.msg_header_partial_len);
     spice_marshaller_add_uint32(m, mig_data.agent2client.msg_remaining);
diff --git a/server/smartcard.c b/server/smartcard.c
index ef99056e..9ccfbc6b 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -409,7 +409,7 @@ static void smartcard_channel_send_migrate_data(RedChannelClient *rcc,
         red_char_device_migrate_data_marshall(RED_CHAR_DEVICE(dev), m);
         spice_marshaller_add_uint8(m, dev->priv->reader_added);
         spice_marshaller_add_uint32(m, dev->priv->buf_used);
-        m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
+        m2 = spice_marshaller_get_ptr_submarshaller(m);
         spice_marshaller_add(m2, dev->priv->buf, dev->priv->buf_used);
         spice_debug("reader added %d partial read size %u", dev->priv->reader_added, dev->priv->buf_used);
     }
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 92d5dfd4..302e30ff 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 92d5dfd4bfa7ae4857e96504a6f14c336ed85338
+Subproject commit 302e30ff43401d9b1e7043a5e5c4f186ca997f66
commit 2ad499ab1f0f1a2d0944a45a400acff5212be6ab
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Mar 8 12:22:21 2019 +0000

    Update spice-common submodule
    
    This brings in the following changes:
    
    Frediano Ziglio (11):
          codegen: Document ptr_array attribute
          codegen: Use a better type for pointer converted to integer
          codegen: Reduce indentation
          codegen: Fix c_type result for TypeAlias
          codegen: Check wrong attribute
          codegen: Add a test for attribute combination
          mem: Fix compile error if alignment-checks option is used
          log: Remove useless includes
          proto: Remove obsolete TunnelChannel
          protocol: Add a dummy TunnelChannel
          messages: Remove fields not used by the protocol
    
    Marc-André Lureau (1):
          docs: add spice URI scheme
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/subprojects/spice-common b/subprojects/spice-common
index 02530a80..92d5dfd4 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 02530a80dfa45c936215c47b8e3aa56720eb46b8
+Subproject commit 92d5dfd4bfa7ae4857e96504a6f14c336ed85338


More information about the Spice-commits mailing list