From patchwork Mon Oct 24 13:47:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 685874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t2djh2VMMz9sf9 for ; Tue, 25 Oct 2016 01:20:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=RzPT/Zvp; dkim-atps=neutral Received: from localhost ([::1]:47031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byg7A-0006De-Ga for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2016 10:20:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byfbz-0004PU-R6 for qemu-devel@nongnu.org; Mon, 24 Oct 2016 09:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byfbz-0006ZY-6L for qemu-devel@nongnu.org; Mon, 24 Oct 2016 09:48:23 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1byfbz-0006ZG-03 for qemu-devel@nongnu.org; Mon, 24 Oct 2016 09:48:23 -0400 Received: by mail-wm0-x242.google.com with SMTP id d199so9948034wmd.1 for ; Mon, 24 Oct 2016 06:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+y2CH+gIENwqEmZD1aVObbr4JYoB+noD/Zavl5ycurU=; b=RzPT/ZvpFZ4uG6ISDnOkOQ1kqCphlT1LurXmnd1m6llo0AHwxIVRxXxdc9IkOmKsEx 5B9uuhyY3IaeCkrdSjj/Rx7Cz4/kM0DBpJ7LGFoONlcytpI4ud761M4wIPOPjC0T/cyq C/U2/HWkaHcUWnAlO31iSRt4R/d2C3QOUmyV5emoi4vH9c90t+Z8ocwknUzCBZk8J3TY 16Zkyd3Tl5z1ZjK94X/bebRm5V4jkTJ6oWMFv9jMU72LLGieaU34p7ik2s2AGAM1TSXJ tjYL/6f6RI68I1/hvGIG1It7Jnj1PGNxM9EjXQ3s9D9cZNHRezMzU1WDuc1X9yp6LHIS 3S7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+y2CH+gIENwqEmZD1aVObbr4JYoB+noD/Zavl5ycurU=; b=GGfuk9gGqK5EDj6H5XAbPsSLMqgoLLDz0J7bqEWN8g9+rLa5bo1Kxc60II/K2kmV89 Ga6TEkXxg5pKO2jM03D7zgmCVbgvZdIRDAnaFvvkpD5sP+pEQtjPNtg+SQ73tPT3uw2S dRv/b5RSQM8XjnmsYGKpjhhHye9x6KZdvYibiBnplCMRhtRdGKYafsP82A0aEh8w56MP NEfL85scnjtZUW9PO3A1CeZjFZhs7zllkCwqHi6vGMNbktJ83vhgVxUFAnLHJYAjsJSU lc8BIDWb/AoCi5LfIlhQik0xX9qDM1UMU+K4BNayDSkEqTStrIo9rYkoDmggbWr/DKfz kXSg== X-Gm-Message-State: ABUngvchpHFX87RteF0oDS1ZMijOslhHCiZMNYTtGTUfwe4TC0lY0ePZaymLvh3opCnoHw== X-Received: by 10.194.68.106 with SMTP id v10mr12003093wjt.149.1477316901747; Mon, 24 Oct 2016 06:48:21 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-178.clienti.tiscali.it. [78.12.246.178]) by smtp.gmail.com with ESMTPSA id us3sm19434867wjb.32.2016.10.24.06.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2016 06:48:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2016 15:47:18 +0200 Message-Id: <1477316855-42218-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1477316855-42218-1-git-send-email-pbonzini@redhat.com> References: <1477316855-42218-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 33/50] colo: claim in find_and_check_chardev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau 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 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);