while (len > 0) {
last_out = MIN(len, VMC_MAX_HOST_WRITE);
- qemu_chr_read(scd->chr, p, last_out);
- if (last_out > 0) {
- out += last_out;
- len -= last_out;
- p += last_out;
- } else {
+ if (qemu_chr_be_can_write(scd->chr) < last_out) {
break;
}
+ qemu_chr_be_write(scd->chr, p, last_out);
+ out += last_out;
+ len -= last_out;
+ p += last_out;
}
- dprintf(scd, 3, "%s: %lu/%zd\n", __func__, out, len + out);
+ dprintf(scd, 3, "%s: %zu/%zd\n", __func__, out, len + out);
trace_spice_vmc_write(out, len + out);
return out;
}
assert(s->datalen == 0);
if (s->bufsize < len) {
s->bufsize = len;
- s->buffer = qemu_realloc(s->buffer, s->bufsize);
+ s->buffer = g_realloc(s->buffer, s->bufsize);
}
memcpy(s->buffer, buf, len);
s->datapos = s->buffer;
printf("%s\n", __func__);
vmc_unregister_interface(s);
- qemu_free(s);
+ g_free(s);
}
static void spice_chr_guest_open(struct CharDriverState *chr)
fprintf(stderr, "\n");
}
-CharDriverState *qemu_chr_open_spice(QemuOpts *opts)
+int qemu_chr_open_spice(QemuOpts *opts, CharDriverState **_chr)
{
CharDriverState *chr;
SpiceCharDriver *s;
if (name == NULL) {
fprintf(stderr, "spice-qemu-char: missing name parameter\n");
print_allowed_subtypes();
- return NULL;
+ return -EINVAL;
}
for(;*psubtype != NULL; ++psubtype) {
if (strcmp(name, *psubtype) == 0) {
if (subtype == NULL) {
fprintf(stderr, "spice-qemu-char: unsupported name\n");
print_allowed_subtypes();
- return NULL;
+ return -EINVAL;
}
- chr = qemu_mallocz(sizeof(CharDriverState));
- s = qemu_mallocz(sizeof(SpiceCharDriver));
+ chr = g_malloc0(sizeof(CharDriverState));
+ s = g_malloc0(sizeof(SpiceCharDriver));
s->chr = chr;
s->debug = debug;
s->active = false;
qemu_chr_generic_open(chr);
- return chr;
+ *_chr = chr;
+ return 0;
}