mirror of
https://github.com/qemu/qemu.git
synced 2025-08-02 12:45:00 +00:00

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>
238 lines
6.8 KiB
C
238 lines
6.8 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 "sysemu/char.h"
|
|
#include "io/channel-socket.h"
|
|
#include "qapi/error.h"
|
|
|
|
#include "char-io.h"
|
|
|
|
/***********************************************************/
|
|
/* UDP Net console */
|
|
|
|
typedef struct {
|
|
Chardev parent;
|
|
QIOChannel *ioc;
|
|
uint8_t buf[CHR_READ_BUF_LEN];
|
|
int bufcnt;
|
|
int bufptr;
|
|
int max_size;
|
|
} UdpChardev;
|
|
|
|
#define UDP_CHARDEV(obj) OBJECT_CHECK(UdpChardev, (obj), TYPE_CHARDEV_UDP)
|
|
|
|
/* Called with chr_write_lock held. */
|
|
static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len)
|
|
{
|
|
UdpChardev *s = UDP_CHARDEV(chr);
|
|
|
|
return qio_channel_write(
|
|
s->ioc, (const char *)buf, len, NULL);
|
|
}
|
|
|
|
static void udp_chr_flush_buffer(UdpChardev *s)
|
|
{
|
|
Chardev *chr = CHARDEV(s);
|
|
|
|
while (s->max_size > 0 && s->bufptr < s->bufcnt) {
|
|
int n = MIN(s->max_size, s->bufcnt - s->bufptr);
|
|
qemu_chr_be_write(chr, &s->buf[s->bufptr], n);
|
|
s->bufptr += n;
|
|
s->max_size = qemu_chr_be_can_write(chr);
|
|
}
|
|
}
|
|
|
|
static int udp_chr_read_poll(void *opaque)
|
|
{
|
|
Chardev *chr = CHARDEV(opaque);
|
|
UdpChardev *s = UDP_CHARDEV(opaque);
|
|
|
|
s->max_size = qemu_chr_be_can_write(chr);
|
|
|
|
/* If there were any stray characters in the queue process them
|
|
* first
|
|
*/
|
|
udp_chr_flush_buffer(s);
|
|
|
|
return s->max_size;
|
|
}
|
|
|
|
static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
|
|
{
|
|
Chardev *chr = CHARDEV(opaque);
|
|
UdpChardev *s = UDP_CHARDEV(opaque);
|
|
ssize_t ret;
|
|
|
|
if (s->max_size == 0) {
|
|
return TRUE;
|
|
}
|
|
ret = qio_channel_read(
|
|
s->ioc, (char *)s->buf, sizeof(s->buf), NULL);
|
|
if (ret <= 0) {
|
|
remove_fd_in_watch(chr);
|
|
return FALSE;
|
|
}
|
|
s->bufcnt = ret;
|
|
s->bufptr = 0;
|
|
udp_chr_flush_buffer(s);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static void udp_chr_update_read_handler(Chardev *chr,
|
|
GMainContext *context)
|
|
{
|
|
UdpChardev *s = UDP_CHARDEV(chr);
|
|
|
|
remove_fd_in_watch(chr);
|
|
if (s->ioc) {
|
|
chr->gsource = io_add_watch_poll(chr, s->ioc,
|
|
udp_chr_read_poll,
|
|
udp_chr_read, chr,
|
|
context);
|
|
}
|
|
}
|
|
|
|
static void char_udp_finalize(Object *obj)
|
|
{
|
|
Chardev *chr = CHARDEV(obj);
|
|
UdpChardev *s = UDP_CHARDEV(obj);
|
|
|
|
remove_fd_in_watch(chr);
|
|
if (s->ioc) {
|
|
object_unref(OBJECT(s->ioc));
|
|
}
|
|
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
|
|
}
|
|
|
|
static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend,
|
|
Error **errp)
|
|
{
|
|
const char *host = qemu_opt_get(opts, "host");
|
|
const char *port = qemu_opt_get(opts, "port");
|
|
const char *localaddr = qemu_opt_get(opts, "localaddr");
|
|
const char *localport = qemu_opt_get(opts, "localport");
|
|
bool has_local = false;
|
|
SocketAddress *addr;
|
|
ChardevUdp *udp;
|
|
|
|
backend->type = CHARDEV_BACKEND_KIND_UDP;
|
|
if (host == NULL || strlen(host) == 0) {
|
|
host = "localhost";
|
|
}
|
|
if (port == NULL || strlen(port) == 0) {
|
|
error_setg(errp, "chardev: udp: remote port not specified");
|
|
return;
|
|
}
|
|
if (localport == NULL || strlen(localport) == 0) {
|
|
localport = "0";
|
|
} else {
|
|
has_local = true;
|
|
}
|
|
if (localaddr == NULL || strlen(localaddr) == 0) {
|
|
localaddr = "";
|
|
} else {
|
|
has_local = true;
|
|
}
|
|
|
|
udp = backend->u.udp.data = g_new0(ChardevUdp, 1);
|
|
qemu_chr_parse_common(opts, qapi_ChardevUdp_base(udp));
|
|
|
|
addr = g_new0(SocketAddress, 1);
|
|
addr->type = SOCKET_ADDRESS_KIND_INET;
|
|
addr->u.inet.data = g_new(InetSocketAddress, 1);
|
|
*addr->u.inet.data = (InetSocketAddress) {
|
|
.host = g_strdup(host),
|
|
.port = g_strdup(port),
|
|
.has_ipv4 = qemu_opt_get(opts, "ipv4"),
|
|
.ipv4 = qemu_opt_get_bool(opts, "ipv4", 0),
|
|
.has_ipv6 = qemu_opt_get(opts, "ipv6"),
|
|
.ipv6 = qemu_opt_get_bool(opts, "ipv6", 0),
|
|
};
|
|
udp->remote = addr;
|
|
|
|
if (has_local) {
|
|
udp->has_local = true;
|
|
addr = g_new0(SocketAddress, 1);
|
|
addr->type = SOCKET_ADDRESS_KIND_INET;
|
|
addr->u.inet.data = g_new(InetSocketAddress, 1);
|
|
*addr->u.inet.data = (InetSocketAddress) {
|
|
.host = g_strdup(localaddr),
|
|
.port = g_strdup(localport),
|
|
};
|
|
udp->local = addr;
|
|
}
|
|
}
|
|
|
|
static void qmp_chardev_open_udp(Chardev *chr,
|
|
ChardevBackend *backend,
|
|
bool *be_opened,
|
|
Error **errp)
|
|
{
|
|
ChardevUdp *udp = backend->u.udp.data;
|
|
QIOChannelSocket *sioc = qio_channel_socket_new();
|
|
char *name;
|
|
UdpChardev *s = UDP_CHARDEV(chr);
|
|
|
|
if (qio_channel_socket_dgram_sync(sioc,
|
|
udp->local, udp->remote,
|
|
errp) < 0) {
|
|
object_unref(OBJECT(sioc));
|
|
return;
|
|
}
|
|
|
|
name = g_strdup_printf("chardev-udp-%s", chr->label);
|
|
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
|
g_free(name);
|
|
|
|
s->ioc = QIO_CHANNEL(sioc);
|
|
/* be isn't opened until we get a connection */
|
|
*be_opened = false;
|
|
}
|
|
|
|
static void char_udp_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
ChardevClass *cc = CHARDEV_CLASS(oc);
|
|
|
|
cc->parse = qemu_chr_parse_udp;
|
|
cc->open = qmp_chardev_open_udp;
|
|
cc->chr_write = udp_chr_write;
|
|
cc->chr_update_read_handler = udp_chr_update_read_handler;
|
|
}
|
|
|
|
static const TypeInfo char_udp_type_info = {
|
|
.name = TYPE_CHARDEV_UDP,
|
|
.parent = TYPE_CHARDEV,
|
|
.instance_size = sizeof(UdpChardev),
|
|
.instance_finalize = char_udp_finalize,
|
|
.class_init = char_udp_class_init,
|
|
};
|
|
|
|
static void register_types(void)
|
|
{
|
|
type_register_static(&char_udp_type_info);
|
|
}
|
|
|
|
type_init(register_types);
|