From fbf3cc3a67a7131e258764aa1f19d5324e9e9f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sat, 22 Oct 2016 12:52:54 +0300 Subject: colo: claim in find_and_check_chardev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-Id: <20161022095318.17775-15-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- 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 efcd15e9ae..b11546520b 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); -- cgit v1.2.3