35106c2df2
In the old spice-vmc device we used to have: last_out = virtio_serial_write(&svc->port, p, MIN(len, VMC_MAX_HOST_WRITE)); if (last_out > 0) ... Now in the chardev backend we have: last_out = MIN(len, VMC_MAX_HOST_WRITE); qemu_chr_read(scd->chr, p, last_out); if (last_out > 0) { ... Which causes us to no longer detect if the virtio port is not ready to receive data from us. chardev actually has a mechanism to detect this, but it requires a separate call to qemu_chr_can_read, before calling qemu_chr_read (which return void). This patch uses qemu_chr_can_read to fix the flow control from client to guest. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
204 lines
5.6 KiB
C
204 lines
5.6 KiB
C
#include "config-host.h"
|
|
#include "trace.h"
|
|
#include "ui/qemu-spice.h"
|
|
#include <spice.h>
|
|
#include <spice-experimental.h>
|
|
|
|
#include "osdep.h"
|
|
|
|
#define dprintf(_scd, _level, _fmt, ...) \
|
|
do { \
|
|
static unsigned __dprintf_counter = 0; \
|
|
if (_scd->debug >= _level) { \
|
|
fprintf(stderr, "scd: %3d: " _fmt, ++__dprintf_counter, ## __VA_ARGS__);\
|
|
} \
|
|
} while (0)
|
|
|
|
#define VMC_MAX_HOST_WRITE 2048
|
|
|
|
typedef struct SpiceCharDriver {
|
|
CharDriverState* chr;
|
|
SpiceCharDeviceInstance sin;
|
|
char *subtype;
|
|
bool active;
|
|
uint8_t *buffer;
|
|
uint8_t *datapos;
|
|
ssize_t bufsize, datalen;
|
|
uint32_t debug;
|
|
} SpiceCharDriver;
|
|
|
|
static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
|
|
{
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
ssize_t out = 0;
|
|
ssize_t last_out;
|
|
uint8_t* p = (uint8_t*)buf;
|
|
|
|
while (len > 0) {
|
|
last_out = MIN(len, VMC_MAX_HOST_WRITE);
|
|
if (qemu_chr_can_read(scd->chr) < last_out) {
|
|
break;
|
|
}
|
|
qemu_chr_read(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);
|
|
trace_spice_vmc_write(out, len + out);
|
|
return out;
|
|
}
|
|
|
|
static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
|
|
{
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
int bytes = MIN(len, scd->datalen);
|
|
|
|
dprintf(scd, 2, "%s: %p %d/%d/%zd\n", __func__, scd->datapos, len, bytes, scd->datalen);
|
|
if (bytes > 0) {
|
|
memcpy(buf, scd->datapos, bytes);
|
|
scd->datapos += bytes;
|
|
scd->datalen -= bytes;
|
|
assert(scd->datalen >= 0);
|
|
if (scd->datalen == 0) {
|
|
scd->datapos = 0;
|
|
}
|
|
}
|
|
trace_spice_vmc_read(bytes, len);
|
|
return bytes;
|
|
}
|
|
|
|
static SpiceCharDeviceInterface vmc_interface = {
|
|
.base.type = SPICE_INTERFACE_CHAR_DEVICE,
|
|
.base.description = "spice virtual channel char device",
|
|
.base.major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR,
|
|
.base.minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR,
|
|
.write = vmc_write,
|
|
.read = vmc_read,
|
|
};
|
|
|
|
|
|
static void vmc_register_interface(SpiceCharDriver *scd)
|
|
{
|
|
if (scd->active) {
|
|
return;
|
|
}
|
|
dprintf(scd, 1, "%s\n", __func__);
|
|
scd->sin.base.sif = &vmc_interface.base;
|
|
qemu_spice_add_interface(&scd->sin.base);
|
|
scd->active = true;
|
|
trace_spice_vmc_register_interface(scd);
|
|
}
|
|
|
|
static void vmc_unregister_interface(SpiceCharDriver *scd)
|
|
{
|
|
if (!scd->active) {
|
|
return;
|
|
}
|
|
dprintf(scd, 1, "%s\n", __func__);
|
|
spice_server_remove_interface(&scd->sin.base);
|
|
scd->active = false;
|
|
trace_spice_vmc_unregister_interface(scd);
|
|
}
|
|
|
|
|
|
static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
|
|
{
|
|
SpiceCharDriver *s = chr->opaque;
|
|
|
|
dprintf(s, 2, "%s: %d\n", __func__, len);
|
|
vmc_register_interface(s);
|
|
assert(s->datalen == 0);
|
|
if (s->bufsize < len) {
|
|
s->bufsize = len;
|
|
s->buffer = qemu_realloc(s->buffer, s->bufsize);
|
|
}
|
|
memcpy(s->buffer, buf, len);
|
|
s->datapos = s->buffer;
|
|
s->datalen = len;
|
|
spice_server_char_device_wakeup(&s->sin);
|
|
return len;
|
|
}
|
|
|
|
static void spice_chr_close(struct CharDriverState *chr)
|
|
{
|
|
SpiceCharDriver *s = chr->opaque;
|
|
|
|
printf("%s\n", __func__);
|
|
vmc_unregister_interface(s);
|
|
qemu_free(s);
|
|
}
|
|
|
|
static void spice_chr_guest_open(struct CharDriverState *chr)
|
|
{
|
|
SpiceCharDriver *s = chr->opaque;
|
|
vmc_register_interface(s);
|
|
}
|
|
|
|
static void spice_chr_guest_close(struct CharDriverState *chr)
|
|
{
|
|
SpiceCharDriver *s = chr->opaque;
|
|
vmc_unregister_interface(s);
|
|
}
|
|
|
|
static void print_allowed_subtypes(void)
|
|
{
|
|
const char** psubtype;
|
|
int i;
|
|
|
|
fprintf(stderr, "allowed names: ");
|
|
for(i=0, psubtype = spice_server_char_device_recognized_subtypes();
|
|
*psubtype != NULL; ++psubtype, ++i) {
|
|
if (i == 0) {
|
|
fprintf(stderr, "%s", *psubtype);
|
|
} else {
|
|
fprintf(stderr, ", %s", *psubtype);
|
|
}
|
|
}
|
|
fprintf(stderr, "\n");
|
|
}
|
|
|
|
CharDriverState *qemu_chr_open_spice(QemuOpts *opts)
|
|
{
|
|
CharDriverState *chr;
|
|
SpiceCharDriver *s;
|
|
const char* name = qemu_opt_get(opts, "name");
|
|
uint32_t debug = qemu_opt_get_number(opts, "debug", 0);
|
|
const char** psubtype = spice_server_char_device_recognized_subtypes();
|
|
const char *subtype = NULL;
|
|
|
|
if (name == NULL) {
|
|
fprintf(stderr, "spice-qemu-char: missing name parameter\n");
|
|
print_allowed_subtypes();
|
|
return NULL;
|
|
}
|
|
for(;*psubtype != NULL; ++psubtype) {
|
|
if (strcmp(name, *psubtype) == 0) {
|
|
subtype = *psubtype;
|
|
break;
|
|
}
|
|
}
|
|
if (subtype == NULL) {
|
|
fprintf(stderr, "spice-qemu-char: unsupported name\n");
|
|
print_allowed_subtypes();
|
|
return NULL;
|
|
}
|
|
|
|
chr = qemu_mallocz(sizeof(CharDriverState));
|
|
s = qemu_mallocz(sizeof(SpiceCharDriver));
|
|
s->chr = chr;
|
|
s->debug = debug;
|
|
s->active = false;
|
|
s->sin.subtype = subtype;
|
|
chr->opaque = s;
|
|
chr->chr_write = spice_chr_write;
|
|
chr->chr_close = spice_chr_close;
|
|
chr->chr_guest_open = spice_chr_guest_open;
|
|
chr->chr_guest_close = spice_chr_guest_close;
|
|
|
|
qemu_chr_generic_open(chr);
|
|
|
|
return chr;
|
|
}
|