mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 02:44:53 +00:00
purge error_is_set()
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTfINgAAoJEEy22O7T6HE4OYEP/ivFyUP2zh40BjOGS5ZaBBc4 hkBueBWD+MHSD7nl5dZzC1syxrbCjgaImME+EcC5t80Zqovn9mKS4b/B0T5GPOQT sfyLQ+YKcA+iXnaCgn3L/3N1eW6ynOBJtLyu54Ql69VZF7A01d+sjFnCIet1g7ov VNw6KEs6IQ3au/SVtBKJV0y+qICbHE8vbyPK+/vPReJfDcEtu7xyYd0a+gMXHmzF zR2qKdJgB1QO+PV5tg3b3lQQgrEHtHPmQgv1oXvYxE2swRy2yHRfgcjiq/RHIymk 42M3FOPWulwOo2/nSiV7yWjfvoOLy/OkwoG0Qtr3UpT8SKSw8gzAIDJUyhR8k24v ne9uHM8ji290xa+wG91/iAuCWNgOYdYhgIi6HOJu9O0jUPbXR7eJp8SSBZUvk9LJ MykKRPBSKmny7m2Qt/3oW6mDmrf5kULioFdgVippRdl+8Qynxo/F/Ae3576kHI+5 HYEaF3w1vDcdxypRnn5Yp0stYIhvqV6GF3UvEiPL7TeJbwuYyXsHkBT3+AkIGvgv dKQLPF8DP++pAvdgirKsoaXSmFLhHzLp8QI+bdvAYV1ctrXfrcuio9WSzMjcco6y etxZjeDmWyCOIsuHXvwRsvVOfh/OpBSe2yYh4n2Z2JxZPhs/HvoDQbANyY/0eNfm gYbUSZ/M5nXjdazxnncl =Jla5 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-2' into staging purge error_is_set() # gpg: Signature made Wed 21 May 2014 11:43:44 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-chardev-2: error: error_is_set() is finally unused; remove char: Explain qmp_chardev_add()'s unusual error handling char: Clean up fragile use of error_is_set() char: Use return values instead of error_is_set(errp) qemu-socket: Clean up inet_connect_opts() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
6054d883d6
|
@ -67,12 +67,6 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
|
||||||
*/
|
*/
|
||||||
void error_setg_file_open(Error **errp, int os_errno, const char *filename);
|
void error_setg_file_open(Error **errp, int os_errno, const char *filename);
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if an indirect pointer to an error is pointing to a valid
|
|
||||||
* error object.
|
|
||||||
*/
|
|
||||||
bool error_is_set(Error **errp);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the error class of an error object.
|
* Get the error class of an error object.
|
||||||
*/
|
*/
|
||||||
|
|
32
qemu-char.c
32
qemu-char.c
|
@ -3204,6 +3204,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
|
||||||
void (*init)(struct CharDriverState *s),
|
void (*init)(struct CharDriverState *s),
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
Error *local_err = NULL;
|
||||||
CharDriver *cd;
|
CharDriver *cd;
|
||||||
CharDriverState *chr;
|
CharDriverState *chr;
|
||||||
GSList *i;
|
GSList *i;
|
||||||
|
@ -3245,13 +3246,14 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
|
||||||
chr = NULL;
|
chr = NULL;
|
||||||
backend->kind = cd->kind;
|
backend->kind = cd->kind;
|
||||||
if (cd->parse) {
|
if (cd->parse) {
|
||||||
cd->parse(opts, backend, errp);
|
cd->parse(opts, backend, &local_err);
|
||||||
if (error_is_set(errp)) {
|
if (local_err) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
goto qapi_out;
|
goto qapi_out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ret = qmp_chardev_add(bid ? bid : id, backend, errp);
|
ret = qmp_chardev_add(bid ? bid : id, backend, errp);
|
||||||
if (error_is_set(errp)) {
|
if (!ret) {
|
||||||
goto qapi_out;
|
goto qapi_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3263,7 +3265,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
|
||||||
backend->kind = CHARDEV_BACKEND_KIND_MUX;
|
backend->kind = CHARDEV_BACKEND_KIND_MUX;
|
||||||
backend->mux->chardev = g_strdup(bid);
|
backend->mux->chardev = g_strdup(bid);
|
||||||
ret = qmp_chardev_add(id, backend, errp);
|
ret = qmp_chardev_add(id, backend, errp);
|
||||||
if (error_is_set(errp)) {
|
if (!ret) {
|
||||||
chr = qemu_chr_find(bid);
|
chr = qemu_chr_find(bid);
|
||||||
qemu_chr_delete(chr);
|
qemu_chr_delete(chr);
|
||||||
chr = NULL;
|
chr = NULL;
|
||||||
|
@ -3620,18 +3622,18 @@ static int qmp_chardev_open_file_source(char *src, int flags,
|
||||||
|
|
||||||
static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
|
static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
|
||||||
{
|
{
|
||||||
int flags, in = -1, out = -1;
|
int flags, in = -1, out;
|
||||||
|
|
||||||
flags = O_WRONLY | O_TRUNC | O_CREAT | O_BINARY;
|
flags = O_WRONLY | O_TRUNC | O_CREAT | O_BINARY;
|
||||||
out = qmp_chardev_open_file_source(file->out, flags, errp);
|
out = qmp_chardev_open_file_source(file->out, flags, errp);
|
||||||
if (error_is_set(errp)) {
|
if (out < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (file->has_in) {
|
if (file->has_in) {
|
||||||
flags = O_RDONLY;
|
flags = O_RDONLY;
|
||||||
in = qmp_chardev_open_file_source(file->in, flags, errp);
|
in = qmp_chardev_open_file_source(file->in, flags, errp);
|
||||||
if (error_is_set(errp)) {
|
if (in < 0) {
|
||||||
qemu_close(out);
|
qemu_close(out);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -3647,7 +3649,7 @@ static CharDriverState *qmp_chardev_open_serial(ChardevHostdev *serial,
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = qmp_chardev_open_file_source(serial->device, O_RDWR, errp);
|
fd = qmp_chardev_open_file_source(serial->device, O_RDWR, errp);
|
||||||
if (error_is_set(errp)) {
|
if (fd < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
qemu_set_nonblock(fd);
|
qemu_set_nonblock(fd);
|
||||||
|
@ -3665,7 +3667,7 @@ static CharDriverState *qmp_chardev_open_parallel(ChardevHostdev *parallel,
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = qmp_chardev_open_file_source(parallel->device, O_RDWR, errp);
|
fd = qmp_chardev_open_file_source(parallel->device, O_RDWR, errp);
|
||||||
if (error_is_set(errp)) {
|
if (fd < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return qemu_chr_open_pp_fd(fd);
|
return qemu_chr_open_pp_fd(fd);
|
||||||
|
@ -3692,7 +3694,7 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock,
|
||||||
} else {
|
} else {
|
||||||
fd = socket_connect(addr, errp, NULL, NULL);
|
fd = socket_connect(addr, errp, NULL, NULL);
|
||||||
}
|
}
|
||||||
if (error_is_set(errp)) {
|
if (fd < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return qemu_chr_open_socket_fd(fd, do_nodelay, is_listen,
|
return qemu_chr_open_socket_fd(fd, do_nodelay, is_listen,
|
||||||
|
@ -3705,7 +3707,7 @@ static CharDriverState *qmp_chardev_open_udp(ChardevUdp *udp,
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = socket_dgram(udp->remote, udp->local, errp);
|
fd = socket_dgram(udp->remote, udp->local, errp);
|
||||||
if (error_is_set(errp)) {
|
if (fd < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return qemu_chr_open_udp_fd(fd);
|
return qemu_chr_open_udp_fd(fd);
|
||||||
|
@ -3796,7 +3798,13 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chr == NULL && !error_is_set(errp)) {
|
/*
|
||||||
|
* Character backend open hasn't been fully converted to the Error
|
||||||
|
* API. Some opens fail without setting an error. Set a generic
|
||||||
|
* error then.
|
||||||
|
* TODO full conversion to Error API
|
||||||
|
*/
|
||||||
|
if (chr == NULL && errp && !*errp) {
|
||||||
error_setg(errp, "Failed to create chardev");
|
error_setg(errp, "Failed to create chardev");
|
||||||
}
|
}
|
||||||
if (chr) {
|
if (chr) {
|
||||||
|
|
|
@ -142,11 +142,6 @@ Error *error_copy(const Error *err)
|
||||||
return err_new;
|
return err_new;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool error_is_set(Error **errp)
|
|
||||||
{
|
|
||||||
return (errp && *errp);
|
|
||||||
}
|
|
||||||
|
|
||||||
ErrorClass error_get_class(const Error *err)
|
ErrorClass error_get_class(const Error *err)
|
||||||
{
|
{
|
||||||
return err->err_class;
|
return err->err_class;
|
||||||
|
|
|
@ -354,6 +354,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp)
|
||||||
int inet_connect_opts(QemuOpts *opts, Error **errp,
|
int inet_connect_opts(QemuOpts *opts, Error **errp,
|
||||||
NonBlockingConnectHandler *callback, void *opaque)
|
NonBlockingConnectHandler *callback, void *opaque)
|
||||||
{
|
{
|
||||||
|
Error *local_err = NULL;
|
||||||
struct addrinfo *res, *e;
|
struct addrinfo *res, *e;
|
||||||
int sock = -1;
|
int sock = -1;
|
||||||
bool in_progress;
|
bool in_progress;
|
||||||
|
@ -372,24 +373,27 @@ int inet_connect_opts(QemuOpts *opts, Error **errp,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (e = res; e != NULL; e = e->ai_next) {
|
for (e = res; e != NULL; e = e->ai_next) {
|
||||||
if (error_is_set(errp)) {
|
error_free(local_err);
|
||||||
error_free(*errp);
|
local_err = NULL;
|
||||||
*errp = NULL;
|
|
||||||
}
|
|
||||||
if (connect_state != NULL) {
|
if (connect_state != NULL) {
|
||||||
connect_state->current_addr = e;
|
connect_state->current_addr = e;
|
||||||
}
|
}
|
||||||
sock = inet_connect_addr(e, &in_progress, connect_state, errp);
|
sock = inet_connect_addr(e, &in_progress, connect_state, &local_err);
|
||||||
if (in_progress) {
|
if (sock >= 0) {
|
||||||
return sock;
|
|
||||||
} else if (sock >= 0) {
|
|
||||||
/* non blocking socket immediate success, call callback */
|
|
||||||
if (callback != NULL) {
|
|
||||||
callback(sock, opaque);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sock < 0) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
|
} else if (in_progress) {
|
||||||
|
/* wait_for_connect() will do the rest */
|
||||||
|
return sock;
|
||||||
|
} else {
|
||||||
|
if (callback) {
|
||||||
|
callback(sock, opaque);
|
||||||
|
}
|
||||||
|
}
|
||||||
g_free(connect_state);
|
g_free(connect_state);
|
||||||
freeaddrinfo(res);
|
freeaddrinfo(res);
|
||||||
return sock;
|
return sock;
|
||||||
|
|
Loading…
Reference in a new issue