mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
![Stefan Hajnoczi](/assets/img/avatar_default.png)
but it'll come in the next pull request. * use GDB XML register description for x86 * use _Static_assert in QEMU_BUILD_BUG_ON * add "R:" to MAINTAINERS and get_maintainers * checkpatch improvements * dump threading fixes * first part of vhost-user-scsi support * QemuMutex tracing * vmw_pvscsi and megasas fixes * sgabios module update * use Rev3 (ACPI 2.0) FADT * deprecate -hdachs * improve -accel documentation * hax fix * qemu-char GSource bugfix -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJZDE+gAAoJEL/70l94x66DIpYH/1IOz3u8ObD8D4Lor07LkCCZ vWFnTBMgGi9gTL5JQDnukRR3cmNp9EVOtAP5Yf+v+/Xqyq/FNGnoVWxCxEby7LtN zrIXbsKMCaEcGzRNJFcbKV+KZnzkJrz92J0NHy29ruCK1AsslOXAWf4Qb1MV+fQl 6w2Upsh35usvWCNpFm2o8arzMEmNuE2xJDPKUB11GMrZT6TExq4Zqa8Zj1Ihc0sX XcDr+eeBmb65Vv3jQLntOhSWAy0Xxf/fDXYTQx+JLHFgvpSOIWMiS+fqIVXtT0bH 0E4hQrBr0qjes8n8+9WGGQW2k8Ak0QlDvrZnQ97hTeV1k6SxW+2ATO2mLeJp9TM= =5hf2 -----END PGP SIGNATURE----- Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging A large set of small patches. I have not included yet vhost-user-scsi, but it'll come in the next pull request. * use GDB XML register description for x86 * use _Static_assert in QEMU_BUILD_BUG_ON * add "R:" to MAINTAINERS and get_maintainers * checkpatch improvements * dump threading fixes * first part of vhost-user-scsi support * QemuMutex tracing * vmw_pvscsi and megasas fixes * sgabios module update * use Rev3 (ACPI 2.0) FADT * deprecate -hdachs * improve -accel documentation * hax fix * qemu-char GSource bugfix # gpg: Signature made Fri 05 May 2017 06:10:40 AM EDT # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * bonzini/tags/for-upstream: (21 commits) vhost-scsi: create a vhost-scsi-common abstraction libvhost-user: replace vasprintf() to fix build get_maintainer: add subsystem to reviewer output get_maintainer: --r (list reviewer) is on by default get_maintainer: it's '--pattern-depth', not '-pattern-depth' get_maintainer: Teach get_maintainer.pl about the new "R:" tag MAINTAINERS: Add "R:" tag for self-appointed reviewers Fix the -accel parameter and the documentation for 'hax' dump: Acquire BQL around vm_start() in dump thread hax: Fix memory mapping de-duplication logic checkpatch: Disallow glib asserts in main code trace: add qemu mutex lock and unlock trace events vmw_pvscsi: check message ring page count at initialisation sgabios: update for "fix wrong video attrs for int 10h,ah==13h" scsi: avoid an off-by-one error in megasas_mmio_write vl: deprecate the "-hdachs" option use _Static_assert in QEMU_BUILD_BUG_ON target/i386: Add GDB XML register description support char: Fix removing wrong GSource that be found by fd_in_tag hw/i386: Build-time assertion on pc/q35 reset register being identical. ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
301 lines
8.3 KiB
C
301 lines
8.3 KiB
C
/*
|
|
* QEMU System Emulator
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu/char.h"
|
|
#include "io/channel-file.h"
|
|
#include "qemu/sockets.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "char-io.h"
|
|
|
|
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
|
|
|| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
|
|
|| defined(__GLIBC__)
|
|
|
|
typedef struct {
|
|
Chardev parent;
|
|
QIOChannel *ioc;
|
|
int read_bytes;
|
|
|
|
/* Protected by the Chardev chr_write_lock. */
|
|
int connected;
|
|
guint timer_tag;
|
|
guint open_tag;
|
|
} PtyChardev;
|
|
|
|
#define PTY_CHARDEV(obj) OBJECT_CHECK(PtyChardev, (obj), TYPE_CHARDEV_PTY)
|
|
|
|
static void pty_chr_update_read_handler_locked(Chardev *chr);
|
|
static void pty_chr_state(Chardev *chr, int connected);
|
|
|
|
static gboolean pty_chr_timer(gpointer opaque)
|
|
{
|
|
struct Chardev *chr = CHARDEV(opaque);
|
|
PtyChardev *s = PTY_CHARDEV(opaque);
|
|
|
|
qemu_mutex_lock(&chr->chr_write_lock);
|
|
s->timer_tag = 0;
|
|
s->open_tag = 0;
|
|
if (!s->connected) {
|
|
/* Next poll ... */
|
|
pty_chr_update_read_handler_locked(chr);
|
|
}
|
|
qemu_mutex_unlock(&chr->chr_write_lock);
|
|
return FALSE;
|
|
}
|
|
|
|
/* Called with chr_write_lock held. */
|
|
static void pty_chr_rearm_timer(Chardev *chr, int ms)
|
|
{
|
|
PtyChardev *s = PTY_CHARDEV(chr);
|
|
char *name;
|
|
|
|
if (s->timer_tag) {
|
|
g_source_remove(s->timer_tag);
|
|
s->timer_tag = 0;
|
|
}
|
|
|
|
if (ms == 1000) {
|
|
name = g_strdup_printf("pty-timer-secs-%s", chr->label);
|
|
s->timer_tag = g_timeout_add_seconds(1, pty_chr_timer, chr);
|
|
} else {
|
|
name = g_strdup_printf("pty-timer-ms-%s", chr->label);
|
|
s->timer_tag = g_timeout_add(ms, pty_chr_timer, chr);
|
|
}
|
|
g_source_set_name_by_id(s->timer_tag, name);
|
|
g_free(name);
|
|
}
|
|
|
|
/* Called with chr_write_lock held. */
|
|
static void pty_chr_update_read_handler_locked(Chardev *chr)
|
|
{
|
|
PtyChardev *s = PTY_CHARDEV(chr);
|
|
GPollFD pfd;
|
|
int rc;
|
|
QIOChannelFile *fioc = QIO_CHANNEL_FILE(s->ioc);
|
|
|
|
pfd.fd = fioc->fd;
|
|
pfd.events = G_IO_OUT;
|
|
pfd.revents = 0;
|
|
do {
|
|
rc = g_poll(&pfd, 1, 0);
|
|
} while (rc == -1 && errno == EINTR);
|
|
assert(rc >= 0);
|
|
|
|
if (pfd.revents & G_IO_HUP) {
|
|
pty_chr_state(chr, 0);
|
|
} else {
|
|
pty_chr_state(chr, 1);
|
|
}
|
|
}
|
|
|
|
static void pty_chr_update_read_handler(Chardev *chr,
|
|
GMainContext *context)
|
|
{
|
|
qemu_mutex_lock(&chr->chr_write_lock);
|
|
pty_chr_update_read_handler_locked(chr);
|
|
qemu_mutex_unlock(&chr->chr_write_lock);
|
|
}
|
|
|
|
/* Called with chr_write_lock held. */
|
|
static int char_pty_chr_write(Chardev *chr, const uint8_t *buf, int len)
|
|
{
|
|
PtyChardev *s = PTY_CHARDEV(chr);
|
|
|
|
if (!s->connected) {
|
|
/* guest sends data, check for (re-)connect */
|
|
pty_chr_update_read_handler_locked(chr);
|
|
if (!s->connected) {
|
|
return len;
|
|
}
|
|
}
|
|
return io_channel_send(s->ioc, buf, len);
|
|
}
|
|
|
|
static GSource *pty_chr_add_watch(Chardev *chr, GIOCondition cond)
|
|
{
|
|
PtyChardev *s = PTY_CHARDEV(chr);
|
|
if (!s->connected) {
|
|
return NULL;
|
|
}
|
|
return qio_channel_create_watch(s->ioc, cond);
|
|
}
|
|
|
|
static int pty_chr_read_poll(void *opaque)
|
|
{
|
|
Chardev *chr = CHARDEV(opaque);
|
|
PtyChardev *s = PTY_CHARDEV(opaque);
|
|
|
|
s->read_bytes = qemu_chr_be_can_write(chr);
|
|
return s->read_bytes;
|
|
}
|
|
|
|
static gboolean pty_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
|
|
{
|
|
Chardev *chr = CHARDEV(opaque);
|
|
PtyChardev *s = PTY_CHARDEV(opaque);
|
|
gsize len;
|
|
uint8_t buf[CHR_READ_BUF_LEN];
|
|
ssize_t ret;
|
|
|
|
len = sizeof(buf);
|
|
if (len > s->read_bytes) {
|
|
len = s->read_bytes;
|
|
}
|
|
if (len == 0) {
|
|
return TRUE;
|
|
}
|
|
ret = qio_channel_read(s->ioc, (char *)buf, len, NULL);
|
|
if (ret <= 0) {
|
|
pty_chr_state(chr, 0);
|
|
return FALSE;
|
|
} else {
|
|
pty_chr_state(chr, 1);
|
|
qemu_chr_be_write(chr, buf, ret);
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean qemu_chr_be_generic_open_func(gpointer opaque)
|
|
{
|
|
Chardev *chr = CHARDEV(opaque);
|
|
PtyChardev *s = PTY_CHARDEV(opaque);
|
|
|
|
s->open_tag = 0;
|
|
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
|
|
return FALSE;
|
|
}
|
|
|
|
/* Called with chr_write_lock held. */
|
|
static void pty_chr_state(Chardev *chr, int connected)
|
|
{
|
|
PtyChardev *s = PTY_CHARDEV(chr);
|
|
|
|
if (!connected) {
|
|
if (s->open_tag) {
|
|
g_source_remove(s->open_tag);
|
|
s->open_tag = 0;
|
|
}
|
|
remove_fd_in_watch(chr);
|
|
s->connected = 0;
|
|
/* (re-)connect poll interval for idle guests: once per second.
|
|
* We check more frequently in case the guests sends data to
|
|
* the virtual device linked to our pty. */
|
|
pty_chr_rearm_timer(chr, 1000);
|
|
} else {
|
|
if (s->timer_tag) {
|
|
g_source_remove(s->timer_tag);
|
|
s->timer_tag = 0;
|
|
}
|
|
if (!s->connected) {
|
|
g_assert(s->open_tag == 0);
|
|
s->connected = 1;
|
|
s->open_tag = g_idle_add(qemu_chr_be_generic_open_func, chr);
|
|
}
|
|
if (!chr->gsource) {
|
|
chr->gsource = io_add_watch_poll(chr, s->ioc,
|
|
pty_chr_read_poll,
|
|
pty_chr_read,
|
|
chr, NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void char_pty_finalize(Object *obj)
|
|
{
|
|
Chardev *chr = CHARDEV(obj);
|
|
PtyChardev *s = PTY_CHARDEV(obj);
|
|
|
|
qemu_mutex_lock(&chr->chr_write_lock);
|
|
pty_chr_state(chr, 0);
|
|
object_unref(OBJECT(s->ioc));
|
|
if (s->timer_tag) {
|
|
g_source_remove(s->timer_tag);
|
|
s->timer_tag = 0;
|
|
}
|
|
qemu_mutex_unlock(&chr->chr_write_lock);
|
|
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
|
|
}
|
|
|
|
static void char_pty_open(Chardev *chr,
|
|
ChardevBackend *backend,
|
|
bool *be_opened,
|
|
Error **errp)
|
|
{
|
|
PtyChardev *s;
|
|
int master_fd, slave_fd;
|
|
char pty_name[PATH_MAX];
|
|
char *name;
|
|
|
|
master_fd = qemu_openpty_raw(&slave_fd, pty_name);
|
|
if (master_fd < 0) {
|
|
error_setg_errno(errp, errno, "Failed to create PTY");
|
|
return;
|
|
}
|
|
|
|
close(slave_fd);
|
|
qemu_set_nonblock(master_fd);
|
|
|
|
chr->filename = g_strdup_printf("pty:%s", pty_name);
|
|
error_report("char device redirected to %s (label %s)",
|
|
pty_name, chr->label);
|
|
|
|
s = PTY_CHARDEV(chr);
|
|
s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
|
|
name = g_strdup_printf("chardev-pty-%s", chr->label);
|
|
qio_channel_set_name(QIO_CHANNEL(s->ioc), name);
|
|
g_free(name);
|
|
s->timer_tag = 0;
|
|
*be_opened = false;
|
|
}
|
|
|
|
static void char_pty_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
ChardevClass *cc = CHARDEV_CLASS(oc);
|
|
|
|
cc->open = char_pty_open;
|
|
cc->chr_write = char_pty_chr_write;
|
|
cc->chr_update_read_handler = pty_chr_update_read_handler;
|
|
cc->chr_add_watch = pty_chr_add_watch;
|
|
}
|
|
|
|
static const TypeInfo char_pty_type_info = {
|
|
.name = TYPE_CHARDEV_PTY,
|
|
.parent = TYPE_CHARDEV,
|
|
.instance_size = sizeof(PtyChardev),
|
|
.instance_finalize = char_pty_finalize,
|
|
.class_init = char_pty_class_init,
|
|
};
|
|
|
|
static void register_types(void)
|
|
{
|
|
type_register_static(&char_pty_type_info);
|
|
}
|
|
|
|
type_init(register_types);
|
|
|
|
#endif
|