From nobody Fri May 17 09:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.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=phystech.edu ARC-Seal: i=1; a=rsa-sha256; t=1629231774; cv=none; d=zohomail.com; s=zohoarc; b=eh2XsCc2akyaagxcmyQmhN63/1URRA/yM8V48tQ3aF/pdSRQPhEiGi91FmLQ6mf0S/0t1bYX5Uz27IgMCCfFCy4emYwLzxFHTwYwCr63QNgCYGXy48waTBIZe1P54Tnw5BzR1v6E1CyqIju/OMLogcKgMgLOQfrXNz35qP/2BwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629231774; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=i8TghbAcE8h2Fg6KJh7I87Ii2ieHvqsHc9xw+sPl8FM=; b=DQ3E4OcOhSFB8IvkcWn7Lp3wmnNssEBfmsmZ/YR9LquUyYL7oHA340k2R68nij3vjobslOycpTK1QcMhmkJRB7HoVLF4w4ylfpsbHsKoNK66TE8w4Wjb1sQxc6D2wDLdzpqJ+NCDyQoOynmETQ9n1DDPiXVmbZoLdPDuhJR4mUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629231774862799.6599702310103; Tue, 17 Aug 2021 13:22:54 -0700 (PDT) Received: from localhost ([::1]:42644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mG5bn-0005Qo-Ch for importer@patchew.org; Tue, 17 Aug 2021 16:22:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mG5af-0004ba-T7 for qemu-devel@nongnu.org; Tue, 17 Aug 2021 16:21:41 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:33527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mG5aa-0003dy-Ma for qemu-devel@nongnu.org; Tue, 17 Aug 2021 16:21:40 -0400 Received: by mail-lf1-x133.google.com with SMTP id p38so43903296lfa.0 for ; Tue, 17 Aug 2021 13:21:36 -0700 (PDT) Received: from 192.168.1.2 ([2a00:1370:810e:b7ea:7e3d:4f4b:921e:b1ff]) by smtp.gmail.com with ESMTPSA id y17sm280971lfh.246.2021.08.17.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 13:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=phystech-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i8TghbAcE8h2Fg6KJh7I87Ii2ieHvqsHc9xw+sPl8FM=; b=XRI9tg5iXR0laH0Z4hEkzgaElF2gdsfCsUSScqWomCycHRn5LVosfD5zK6GFyhrQme m8Uf6iIHJTBncM4NihikEm+94KwFuZNHOLfV4uoS3T3MDa3tMKG+N4ePr/jffJ/vsQhK owsXK165C+dmkfAww642URaU9OL5NTvDZQnqRe4cAm2CYSyYD1HNgpGhxgHky27S7zlB hvSeh4X2z6ztPTYnha4fRtEJCnyL3qq3xGVVMp5/jF4YFD5oQqkmMGPTJ3FmqeXTLE8Y chlkfAKeXLRlcNvmWpKjtFgCIZHzgbt3xP4LWywDc9UhdSsXr5rMa+AKPIlo684kBNXt 4QCg== 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:mime-version :content-transfer-encoding; bh=i8TghbAcE8h2Fg6KJh7I87Ii2ieHvqsHc9xw+sPl8FM=; b=X7fX1pBzonCeHsLOaQuOw+VU7n8lWCjeTBBMsh9N7VCSNgK6bpqSgTG9sI2rhna88z F7m6z8BlQFJwNmLHY2llxkQtxwjBXSylrwQH/0rnTmT0JfviCml58g112JqkCGgTazxd uMJ85vmXHi10FLV9My6z2yS4HEDWccmyiUw3aFsPrMC6N8+9oOjumg9EYhkAf3Lblkbm KikqZHOviUAgyvGwp8ac8Cg3HAq8t7NfNepQ+Y4DciFD2yPLWI8AtfmCe2W658EECtf3 DyD3BHVWHae02mZGCFZY/WuOqHRGxPKLCeZzYo/+PQRaHLgEPlkJfOuqoLnKR5zHjFm7 tZ0Q== X-Gm-Message-State: AOAM533CZ44qVBcswmgvPCea3yUZFgo+CjPV+dYpQXbLj23aPwhNr7mR RgZsTGYCg6+CVhsp5axo/RvFoA== X-Google-Smtp-Source: ABdhPJyMTludIfjhzIyppCZM15wPEOdqR03kk5+/1tUusR0wne8h9jMQMeYbYI0S7y5EvZBQ2qsbVw== X-Received: by 2002:a05:6512:3e0b:: with SMTP id i11mr3590086lfv.45.1629231694612; Tue, 17 Aug 2021 13:21:34 -0700 (PDT) From: Viktor Prutyanov To: philmd@redhat.com, kwolf@redhat.com, hreitz@redhat.com, sw@weilnetz.de, qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v3] block/file-win32: add reopen handlers Date: Tue, 17 Aug 2021 23:21:15 +0300 Message-Id: <20210817202115.16771-1-viktor.prutyanov@phystech.edu> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=viktor.prutyanov@phystech.edu; helo=mail-lf1-x133.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Viktor Prutyanov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @phystech-edu.20150623.gappssmtp.com) X-ZM-MESSAGEID: 1629231778649100001 Content-Type: text/plain; charset="utf-8" Make 'qemu-img commit' work on Windows. Command 'commit' requires reopening backing file in RW mode. So, add reopen prepare/commit/abort handlers and change dwShareMode for CreateFile call in order to allow further read/write reopening. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/418 Suggested-by: Hanna Reitz Signed-off-by: Viktor Prutyanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Helge Konetzka --- v2: - fix indentation in raw_reopen_prepare - free rs if raw_reopen_prepare fails v3: - restore suggested-by field missed in v2 block/file-win32.c | 90 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/block/file-win32.c b/block/file-win32.c index 2642088bd6..9dcbb2b53b 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -58,6 +58,10 @@ typedef struct BDRVRawState { QEMUWin32AIOState *aio; } BDRVRawState; =20 +typedef struct BDRVRawReopenState { + HANDLE hfile; +} BDRVRawReopenState; + /* * Read/writes the data to/from a given linear buffer. * @@ -392,7 +396,7 @@ static int raw_open(BlockDriverState *bs, QDict *option= s, int flags, } =20 s->hfile =3D CreateFile(filename, access_flags, - FILE_SHARE_READ, NULL, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, overlapped, NULL); if (s->hfile =3D=3D INVALID_HANDLE_VALUE) { int err =3D GetLastError(); @@ -634,6 +638,86 @@ static int coroutine_fn raw_co_create_opts(BlockDriver= *drv, return raw_co_create(&options, errp); } =20 +static int raw_reopen_prepare(BDRVReopenState *state, + BlockReopenQueue *queue, Error **errp) +{ + BDRVRawState *s =3D state->bs->opaque; + BDRVRawReopenState *rs; + int access_flags; + DWORD overlapped; + int ret =3D 0; + + rs =3D g_new0(BDRVRawReopenState, 1); + + raw_parse_flags(state->flags, s->aio !=3D NULL, &access_flags, &overla= pped); + rs->hfile =3D CreateFile(state->bs->filename, access_flags, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, overlapped, NULL); + + if (rs->hfile =3D=3D INVALID_HANDLE_VALUE) { + int err =3D GetLastError(); + + error_setg_win32(errp, err, "Could not reopen '%s'", + state->bs->filename); + if (err =3D=3D ERROR_ACCESS_DENIED) { + ret =3D -EACCES; + } else { + ret =3D -EINVAL; + } + goto fail; + } + + if (s->aio) { + ret =3D win32_aio_attach(s->aio, rs->hfile); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not enable AIO"); + goto fail; + } + } + + state->opaque =3D rs; + + return 0; + +fail: + g_free(rs); + state->opaque =3D NULL; + + return ret; +} + +static void raw_reopen_commit(BDRVReopenState *state) +{ + BDRVRawState *s =3D state->bs->opaque; + BDRVRawReopenState *rs =3D state->opaque; + + if (!rs) { + return; + } + + CloseHandle(s->hfile); + s->hfile =3D rs->hfile; + + g_free(rs); + state->opaque =3D NULL; +} + +static void raw_reopen_abort(BDRVReopenState *state) +{ + BDRVRawReopenState *rs =3D state->opaque; + + if (!rs) { + return; + } + + if (rs->hfile !=3D INVALID_HANDLE_VALUE) { + CloseHandle(rs->hfile); + } + + g_free(rs); + state->opaque =3D NULL; +} + static QemuOptsList raw_create_opts =3D { .name =3D "raw-create-opts", .head =3D QTAILQ_HEAD_INITIALIZER(raw_create_opts.head), @@ -659,6 +743,10 @@ BlockDriver bdrv_file =3D { .bdrv_co_create_opts =3D raw_co_create_opts, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, =20 + .bdrv_reopen_prepare =3D raw_reopen_prepare, + .bdrv_reopen_commit =3D raw_reopen_commit, + .bdrv_reopen_abort =3D raw_reopen_abort, + .bdrv_aio_preadv =3D raw_aio_preadv, .bdrv_aio_pwritev =3D raw_aio_pwritev, .bdrv_aio_flush =3D raw_aio_flush, --=20 2.21.0