mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-30 15:00:34 +00:00
1f51470d04
The commit's purpose is laudable:
The only way for chardev drivers to communicate an error was to
return a NULL pointer, which resulted in an error message that
said _that_ something went wrong, but not _why_.
It attempts to achieve it by changing the interface to return 0/-errno
and update qemu_chr_open_opts() to use strerror() to display a more
helpful error message. Unfortunately, it has serious flaws:
1. Backends "socket" and "udp" return bogus error codes, because
qemu_chr_open_socket() and qemu_chr_open_udp() assume that
unix_listen_opts(), unix_connect_opts(), inet_listen_opts(),
inet_connect_opts() and inet_dgram_opts() fail with errno set
appropriately. That assumption is wrong, and the commit turns
unspecific error messages into misleading error messages. For
instance:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: No such file or directory
ENOENT is what happens to be in my errno when the backend returns
-errno. Let's put ERANGE there just for giggles:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx -drive if=none,iops=99999999999999999999
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: Numerical result out of range
Worse: when errno happens to be zero, return -errno erroneously
signals success, and qemu_chr_new_from_opts() dies dereferencing
uninitialized chr. I observe this with "-serial unix:".
2. All qemu_chr_open_opts() knows about the error is an errno error
code. That's simply not enough for a decent message. For instance,
when inet_dgram() can't resolve the parameter host, which errno code
should it use? What if it can't resolve parameter localaddr?
Clue: many backends already report errors in their open methods.
Let's revert the flawed commit along with its dependencies, and fix up
the silent error paths instead.
This reverts commit 6e1db57b2a.
Conflicts:
console.c
hw/baum.c
qemu-char.c
This reverts commit aad04cd024.
The parts of commit db418a0a "Add stdio char device on windows" that
depend on the reverted change fixed up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
81 lines
2.4 KiB
C
81 lines
2.4 KiB
C
/*
|
|
* Copyright (C) 2010 Red Hat, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 or
|
|
* (at your option) version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef QEMU_SPICE_H
|
|
#define QEMU_SPICE_H
|
|
|
|
#ifdef CONFIG_SPICE
|
|
|
|
#include <spice.h>
|
|
|
|
#include "qemu-option.h"
|
|
#include "qemu-config.h"
|
|
#include "qemu-char.h"
|
|
#include "monitor.h"
|
|
|
|
extern int using_spice;
|
|
|
|
void qemu_spice_init(void);
|
|
void qemu_spice_input_init(void);
|
|
void qemu_spice_audio_init(void);
|
|
void qemu_spice_display_init(DisplayState *ds);
|
|
int qemu_spice_display_add_client(int csock, int skipauth, int tls);
|
|
int qemu_spice_add_interface(SpiceBaseInstance *sin);
|
|
int qemu_spice_set_passwd(const char *passwd,
|
|
bool fail_if_connected, bool disconnect_if_connected);
|
|
int qemu_spice_set_pw_expire(time_t expires);
|
|
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
|
|
const char *subject,
|
|
MonitorCompletion cb, void *opaque);
|
|
|
|
void do_info_spice_print(Monitor *mon, const QObject *data);
|
|
void do_info_spice(Monitor *mon, QObject **ret_data);
|
|
|
|
CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
|
|
|
|
#else /* CONFIG_SPICE */
|
|
#include "monitor.h"
|
|
|
|
#define using_spice 0
|
|
static inline int qemu_spice_set_passwd(const char *passwd,
|
|
bool fail_if_connected,
|
|
bool disconnect_if_connected)
|
|
{
|
|
return -1;
|
|
}
|
|
static inline int qemu_spice_set_pw_expire(time_t expires)
|
|
{
|
|
return -1;
|
|
}
|
|
static inline int qemu_spice_migrate_info(const char *h, int p, int t,
|
|
const char *s,
|
|
MonitorCompletion cb, void *opaque)
|
|
{
|
|
cb(opaque, NULL);
|
|
return -1;
|
|
}
|
|
|
|
static inline int qemu_spice_display_add_client(int csock, int skipauth,
|
|
int tls)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
#endif /* CONFIG_SPICE */
|
|
|
|
#endif /* QEMU_SPICE_H */
|