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

qmp: Clean up design of memchar-read

Browse source 
The data returned has a well-defined size, which makes the size
returned along with it redundant at best.  Drop it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2013-02-06 21:27:15 +01:00 • committed by Anthony Liguori
parent 82e59a676c
commit 3ab651fc81
4 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
qemu-char.c
View file

@ -2788,14 +2788,14 @@ void qmp_memchar_write(const char *device, const char *data,
}
}
MemCharRead *qmp_memchar_read(const char *device, int64_t size,
bool has_format, enum DataFormat format,
Error **errp)
char *qmp_memchar_read(const char *device, int64_t size,
bool has_format, enum DataFormat format,
Error **errp)
{
CharDriverState *chr;
guchar *read_data;
MemCharRead *meminfo;
size_t count;
char *data;
chr = qemu_chr_find(device);
if (!chr) {
@ -2813,26 +2813,23 @@ MemCharRead *qmp_memchar_read(const char *device, int64_t size,
return NULL;
}
meminfo = g_malloc0(sizeof(MemCharRead));
count = qemu_chr_cirmem_count(chr);
if (count == 0) {
meminfo->data = g_strdup("");
return meminfo;
return g_strdup("");
}
size = size > count ? count : size;
read_data = g_malloc0(size + 1);
meminfo->count = cirmem_chr_read(chr, read_data, size);
cirmem_chr_read(chr, read_data, size);
if (has_format && (format == DATA_FORMAT_BASE64)) {
meminfo->data = g_base64_encode(read_data, (size_t)meminfo->count);
data = g_base64_encode(read_data, size);
} else {
meminfo->data = (char *)read_data;
data = (char *)read_data;
}
return meminfo;
return data;
}
QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)