motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui/vdagent: replace Buffer with GByteArray

Browse source 
Buffer is slightly more advanced than GByteArray, since it has a
cursor/position. But vdagent code doesn't need it. This simplify a bit
the code, and migration state.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-03-10 15:26:25 +04:00
parent c967ff606b
commit ac5e2bc910
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ui/vdagent.c
View file

@ -47,7 +47,7 @@ struct VDAgentChardev {
uint32_t msgsize; uint32_t msgsize;
uint8_t *xbuf; uint8_t *xbuf;
uint32_t xoff, xsize; uint32_t xoff, xsize;
Buffer outbuf; GByteArray *outbuf;
/* mouse */ /* mouse */
DeviceState mouse_dev; DeviceState mouse_dev;
@ -142,16 +142,16 @@ static void vdagent_send_buf(VDAgentChardev *vd)
{ {
uint32_t len; uint32_t len;
while (!buffer_empty(&vd->outbuf)) { while (vd->outbuf->len) {
len = qemu_chr_be_can_write(CHARDEV(vd)); len = qemu_chr_be_can_write(CHARDEV(vd));
if (len == 0) { if (len == 0) {
return; return;
} }
if (len > vd->outbuf.offset) { if (len > vd->outbuf->len) {
len = vd->outbuf.offset; len = vd->outbuf->len;
} }
qemu_chr_be_write(CHARDEV(vd), vd->outbuf.buffer, len); qemu_chr_be_write(CHARDEV(vd), vd->outbuf->data, len);
buffer_advance(&vd->outbuf, len); g_byte_array_remove_range(vd->outbuf, 0, len);
} }
} }
@ -166,7 +166,7 @@ static void vdagent_send_msg(VDAgentChardev *vd, VDAgentMessage *msg)
msg->protocol = VD_AGENT_PROTOCOL; msg->protocol = VD_AGENT_PROTOCOL;
if (vd->outbuf.offset + msgsize > VDAGENT_BUFFER_LIMIT) { if (vd->outbuf->len + msgsize > VDAGENT_BUFFER_LIMIT) {
error_report("buffer full, dropping message"); error_report("buffer full, dropping message");
return; return;
} }
@ -177,9 +177,8 @@ static void vdagent_send_msg(VDAgentChardev *vd, VDAgentMessage *msg)
if (chunk.size > 1024) { if (chunk.size > 1024) {
chunk.size = 1024; chunk.size = 1024;
} }
buffer_reserve(&vd->outbuf, sizeof(chunk) + chunk.size); g_byte_array_append(vd->outbuf, (void *)&chunk, sizeof(chunk));
buffer_append(&vd->outbuf, &chunk, sizeof(chunk)); g_byte_array_append(vd->outbuf, msgbuf + msgoff, chunk.size);
buffer_append(&vd->outbuf, msgbuf + msgoff, chunk.size);
msgoff += chunk.size; msgoff += chunk.size;
} }
vdagent_send_buf(vd); vdagent_send_buf(vd);
@ -859,7 +858,7 @@ static void vdagent_disconnect(VDAgentChardev *vd)
{ {
trace_vdagent_disconnect(); trace_vdagent_disconnect();
buffer_reset(&vd->outbuf); g_byte_array_set_size(vd->outbuf, 0);
vdagent_reset_bufs(vd); vdagent_reset_bufs(vd);
vd->caps = 0; vd->caps = 0;
if (vd->mouse_hs) { if (vd->mouse_hs) {
@ -920,7 +919,7 @@ static void vdagent_chr_init(Object *obj)
{ {
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj); VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj);
buffer_init(&vd->outbuf, "vdagent-outbuf"); vd->outbuf = g_byte_array_new();
error_setg(&vd->migration_blocker, error_setg(&vd->migration_blocker,
"The vdagent chardev doesn't yet support migration"); "The vdagent chardev doesn't yet support migration");
} }
@ -934,7 +933,7 @@ static void vdagent_chr_fini(Object *obj)
if (vd->mouse_hs) { if (vd->mouse_hs) {
qemu_input_handler_unregister(vd->mouse_hs); qemu_input_handler_unregister(vd->mouse_hs);
} }
buffer_free(&vd->outbuf); g_clear_pointer(&vd->outbuf, g_byte_array_unref);
} }
static const TypeInfo vdagent_chr_type_info = { static const TypeInfo vdagent_chr_type_info = {