From nobody Wed Jun 26 05:48:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569879606; cv=none; d=zoho.com; s=zohoarc; b=UNSsaIopkHhjKF8wMJamopKmzVNlvt2He9V/BVyK+WZ7Gap17pUaiIjJajaVRHnVpayhgWPzE4Anns/nXHWdvi7+Zag78I9O9q+H7fI1D6Caz6gILYH0hwYu9uiAFCzRIhV/fY76u96dvN/AfJO73BPqLWI12Vsief/Sna86Tv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569879606; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=C6N81LocrxZwNC8yNJwyLV1L8250/XEo9jMZ7j/l3AI=; b=ddx+1hSaTTpUdUhU4uCBOJn0+U5JcMRDJhhA+oFfvIG7k+u/I8WvOipNamuL6rG7GrYQQVZYOOPz0WYPIgGYWbKvKZkyJsMKlKq46ERSJY2FWK9aqmjzwI5xAGN6iw0QysO0raS0G90TtsOUHrwDeE3SFXprtj/taBlju8rEwcg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569879606873609.3695748472119; Mon, 30 Sep 2019 14:40:06 -0700 (PDT) Received: from localhost ([::1]:57655 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF3Oi-0001RM-6F for importer@patchew.org; Mon, 30 Sep 2019 17:40:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54651) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF3NK-0000Rv-0p for qemu-devel@nongnu.org; Mon, 30 Sep 2019 17:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iF3NI-0003vO-3I for qemu-devel@nongnu.org; Mon, 30 Sep 2019 17:38:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iF3NE-0003s5-2c; Mon, 30 Sep 2019 17:38:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44EE085362; Mon, 30 Sep 2019 21:38:27 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97E7810013A1; Mon, 30 Sep 2019 21:38:25 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 1/1] nbd: add empty .bdrv_reopen_prepare Date: Tue, 1 Oct 2019 00:38:20 +0300 Message-Id: <20190930213820.29777-2-mlevitsk@redhat.com> In-Reply-To: <20190930213820.29777-1-mlevitsk@redhat.com> References: <20190930213820.29777-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Sep 2019 21:38:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Maxim Levitsky , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixes commit job / qemu-img commit, when commiting qcow2 file which is based on nbd export. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=3D1718727 Signed-off-by: Maxim Levitsky --- block/nbd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/nbd.c b/block/nbd.c index 813c40d8f0..fd78e5f330 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1158,6 +1158,18 @@ static int coroutine_fn nbd_client_co_block_status( BDRV_BLOCK_OFFSET_VALID; } =20 +static int nbd_client_reopen_prepare(BDRVReopenState *state, + BlockReopenQueue *queue, Error **errp) +{ + BDRVNBDState *s =3D (BDRVNBDState *)state->bs->opaque; + + if ((state->flags & BDRV_O_RDWR) && (s->info.flags & NBD_FLAG_READ_ONL= Y)) { + error_setg(errp, "Can't reopen read-only NBD mount as read/write"); + return -EACCES; + } + return 0; +} + static void nbd_client_close(BlockDriverState *bs) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; @@ -1798,6 +1810,7 @@ static BlockDriver bdrv_nbd =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, @@ -1820,6 +1833,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, @@ -1842,6 +1856,7 @@ static BlockDriver bdrv_nbd_unix =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, --=20 2.17.2