|
 |
5d360b |
From e0406c32a13c399b646834089779c39341143253 Mon Sep 17 00:00:00 2001
|
|
|
5d360b |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
5d360b |
Date: Thu, 8 Feb 2018 17:50:20 +0100
|
|
|
5d360b |
Subject: [PATCH 06/27] buffer: add buffer_move
|
|
|
5d360b |
|
|
|
5d360b |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
5d360b |
Message-id: <20180208175041.5634-7-berrange@redhat.com>
|
|
|
5d360b |
Patchwork-id: 78944
|
|
|
5d360b |
O-Subject: [RHEL-7.5 qemu-kvm PATCH v1 06/27] buffer: add buffer_move
|
|
|
5d360b |
Bugzilla: 1527405
|
|
|
5d360b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5d360b |
Reviewed-by: Peter Lieven <pl@kamp.de>
|
|
|
5d360b |
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
5d360b |
Message-id: 1446203414-4013-5-git-send-email-kraxel@redhat.com
|
|
|
5d360b |
(cherry picked from commit 830a9583206a051c240b74c3f688a015dc5d2967)
|
|
|
5d360b |
|
|
|
5d360b |
Conflicts:
|
|
|
5d360b |
include/qemu/buffer.h
|
|
|
5d360b |
util/buffer.c - APIs are still in vnc.{c,h}
|
|
|
5d360b |
|
|
|
5d360b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
---
|
|
|
5d360b |
ui/vnc.c | 16 ++++++++++++++++
|
|
|
5d360b |
ui/vnc.h | 1 +
|
|
|
5d360b |
2 files changed, 17 insertions(+)
|
|
|
5d360b |
|
|
|
5d360b |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
5d360b |
index b520f58..95457ad 100644
|
|
|
5d360b |
--- a/ui/vnc.c
|
|
|
5d360b |
+++ b/ui/vnc.c
|
|
|
5d360b |
@@ -530,6 +530,22 @@ void buffer_move_empty(Buffer *to, Buffer *from)
|
|
|
5d360b |
from->buffer = NULL;
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
+void buffer_move(Buffer *to, Buffer *from)
|
|
|
5d360b |
+{
|
|
|
5d360b |
+ if (to->offset == 0) {
|
|
|
5d360b |
+ buffer_move_empty(to, from);
|
|
|
5d360b |
+ return;
|
|
|
5d360b |
+ }
|
|
|
5d360b |
+
|
|
|
5d360b |
+ buffer_reserve(to, from->offset);
|
|
|
5d360b |
+ buffer_append(to, from->buffer, from->offset);
|
|
|
5d360b |
+
|
|
|
5d360b |
+ g_free(from->buffer);
|
|
|
5d360b |
+ from->offset = 0;
|
|
|
5d360b |
+ from->capacity = 0;
|
|
|
5d360b |
+ from->buffer = NULL;
|
|
|
5d360b |
+}
|
|
|
5d360b |
+
|
|
|
5d360b |
|
|
|
5d360b |
static void vnc_desktop_resize(VncState *vs)
|
|
|
5d360b |
{
|
|
|
5d360b |
diff --git a/ui/vnc.h b/ui/vnc.h
|
|
|
5d360b |
index c300660..703fef9 100644
|
|
|
5d360b |
--- a/ui/vnc.h
|
|
|
5d360b |
+++ b/ui/vnc.h
|
|
|
5d360b |
@@ -549,6 +549,7 @@ void buffer_append(Buffer *buffer, const void *data, size_t len);
|
|
|
5d360b |
void buffer_advance(Buffer *buf, size_t len);
|
|
|
5d360b |
uint8_t *buffer_end(Buffer *buffer);
|
|
|
5d360b |
void buffer_move_empty(Buffer *to, Buffer *from);
|
|
|
5d360b |
+void buffer_move(Buffer *to, Buffer *from);
|
|
|
5d360b |
|
|
|
5d360b |
|
|
|
5d360b |
/* Misc helpers */
|
|
|
5d360b |
--
|
|
|
5d360b |
1.8.3.1
|
|
|
5d360b |
|