From patchwork Mon Jan 16 11:31:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9518515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 31F0C600C5 for ; Mon, 16 Jan 2017 11:39:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 117E828339 for ; Mon, 16 Jan 2017 11:39:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04843283FF; Mon, 16 Jan 2017 11:39:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEB2E28339 for ; Mon, 16 Jan 2017 11:39:07 +0000 (UTC) Received: from localhost ([::1]:55889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cT5cx-0005Rj-0H for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Jan 2017 06:39:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cT5WQ-0000Dk-Hr for qemu-devel@nongnu.org; Mon, 16 Jan 2017 06:32:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cT5WP-0002eW-Q4 for qemu-devel@nongnu.org; Mon, 16 Jan 2017 06:32:22 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:34760) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cT5WP-0002e8-KF for qemu-devel@nongnu.org; Mon, 16 Jan 2017 06:32:21 -0500 Received: by mail-pg0-x241.google.com with SMTP id t6so1111405pgt.1 for ; Mon, 16 Jan 2017 03:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zV//s1qO+Xr9I1JVQFeF+BG25H/TsOgGMP/A573zt0Y=; b=KEVDs5QVT16PIeao297812RH8BGsrcTQd99co7s3g6c/Vpjq+RKohngdLIjAImxszN niuhLsn+QWqslPg4t8acyJ1jS+lXwtjEiH4sxKJEp4jLY7D71KuotxMTtb8dNPMv+/wQ pRUQLi7TlqSe2Zv+9C/5IwQfGtGKoYftnSTyMOPU/2N2ryGOMC45+71G06utPs1rs9Qn Bu9rvKMVJZJOrFU4gVjJhOczX68bkv4yWGftgWX+f87/McT3UryKY4MrM0ap6+e/mB// fkyjJCGaX2Y188CTDEWPj/w30p+UrXXI5GT0V2vMLHLLUguf44uIs1bhU+SkBh0LYPsX welA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zV//s1qO+Xr9I1JVQFeF+BG25H/TsOgGMP/A573zt0Y=; b=n8KpeOO63i/R+AVqkprQSO9mULEWnSLTo/aqWkGI8xdKpnpwj4Lim4Skg6I87+1Ayv 2bS/fQt0d782oVHWTSSaVgDStEruUk4vsUmaq2DAkUU7jxPi/Gx72p+zpcqqNrzU7rpv B6Lfff01EevpBaCkjnAu4i6he6bfEY8B7Z3M+f/VLyTuqoMU+OU4hmAebnP1MxCnFdZb 2olgWJiZHtty1jRr87jeQWdo6RqebyVu29Uoq8y9gv3Q5s6s3m8zBpz01/o4+0HM6X5A CMKkIYKx3ZK2w0uAMWE1ROJPD+pll2V7PmnOWZUjej8I+p6WLybPWHlWX46aIKuOUmDl aJQg== X-Gm-Message-State: AIkVDXL7L29E9sVSH4JYGK8xsBg8bmAKTiq6o5gKblbwOzcRa4YN5CFqLa5JXQ9V69Q/2A== X-Received: by 10.99.174.75 with SMTP id e11mr39067371pgp.89.1484566340805; Mon, 16 Jan 2017 03:32:20 -0800 (PST) Received: from linux.local ([27.251.197.196]) by smtp.gmail.com with ESMTPSA id e127sm47018810pfh.89.2017.01.16.03.32.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jan 2017 03:32:20 -0800 (PST) From: Ashijeet Acharya To: dgilbert@redhat.com Date: Mon, 16 Jan 2017 17:01:54 +0530 Message-Id: <1484566314-3987-6-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1484566314-3987-1-git-send-email-ashijeetacharya@gmail.com> References: <1484566314-3987-1-git-send-email-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v6 5/5] migration: Fail migration blocker for --only-migratable 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: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, qemu-devel@nongnu.org, mst@redhat.com, armbru@redhat.com, groug@kaod.org, aneesh.kumar@linux.vnet.ibm.com, Ashijeet Acharya , marcandre.lureau@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP migrate_add_blocker should rightly fail if the '--only-migratable' option was specified and the device in use should not be able to perform the action which results in an unmigratable VM. Make migrate_add_blocker return -EACCES in this case. Signed-off-by: Ashijeet Acharya Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- include/migration/migration.h | 2 +- migration/migration.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index bcbdb03..7881e89 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -291,7 +291,7 @@ int ram_postcopy_incoming_init(MigrationIncomingState *mis); * * @errp - [out] The reason (if any) we cannot block migration right now. * - * @returns - 0 on success, -EBUSY on failure, with errp set. + * @returns - 0 on success, -EBUSY/-EACCES on failure, with errp set. */ int migrate_add_blocker(Error *reason, Error **errp); diff --git a/migration/migration.c b/migration/migration.c index 0d88286..7dcb7d7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1113,6 +1113,13 @@ static GSList *migration_blockers; int migrate_add_blocker(Error *reason, Error **errp) { + if (only_migratable) { + error_propagate(errp, error_copy(reason)); + error_prepend(errp, "disallowing migration blocker " + "(--only_migratable) for: "); + return -EACCES; + } + if (migration_is_idle(NULL)) { migration_blockers = g_slist_prepend(migration_blockers, reason); return 0;