[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/38] colo: claim in find_and_check_chardev
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 14/38] colo: claim in find_and_check_chardev |
Date: |
Sat, 22 Oct 2016 12:52:54 +0300 |
This factors out claiming of chardev, and changes the call to
non-fatal to return an error like the rest of the chardev checks.
Signed-off-by: Marc-André Lureau <address@hidden>
---
net/colo-compare.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index efcd15e..b115465 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -589,6 +589,13 @@ static int find_and_check_chardev(CharDriverState **chr,
chr_name);
return 1;
}
+
+ if (qemu_chr_fe_claim(*chr) < 0) {
+ error_setg(errp, "chardev \"%s\" cannot be claimed",
+ chr_name);
+ return 1;
+ }
+
return 0;
}
@@ -646,12 +653,6 @@ static void colo_compare_complete(UserCreatable *uc, Error
**errp)
return;
}
- qemu_chr_fe_claim_no_fail(s->chr_pri_in.chr);
-
- qemu_chr_fe_claim_no_fail(s->chr_sec_in.chr);
-
- qemu_chr_fe_claim_no_fail(s->chr_out.chr);
-
net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);
net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize);
--
2.10.0
- [Qemu-devel] [PATCH 05/38] malta: replace chr init by CHR_EVENT_OPENED handler, (continued)
- [Qemu-devel] [PATCH 05/38] malta: replace chr init by CHR_EVENT_OPENED handler, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 07/38] xilinx: fix buffer overflow on realize, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 06/38] char: remove init callback, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 08/38] mux: split mux_chr_update_read_handler(), Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 10/38] char: start converting mux driver to use CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 09/38] char: introduce CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 11/38] char: replace PROP_CHR with CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 14/38] colo: claim in find_and_check_chardev,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 12/38] char: remaining switch to CharBackend in frontend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 13/38] char: rename some frontend functions, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 16/38] char: fold qemu_chr_set_handlers in qemu_chr_fe_set_handlers, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 17/38] vhost-user: only initialize queue 0 CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 15/38] char: use qemu_chr_fe* functions with CharBackend argument, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 18/38] char: replace qemu_chr_claim/release with qemu_chr_fe_init/deinit, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 19/38] char: make some qemu_chr_fe skip if no driver, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 20/38] tests: start chardev unit tests, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 21/38] char: move front end handlers in CharBackend, Marc-André Lureau, 2016/10/22