From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322549; cv=none; d=zohomail.com; s=zohoarc; b=c6tJMW4YXBcdSBnSWK3opAtvpO6y/7f/pdjui5WyFFhELUCFLlcbY5rTBY+jmt0EY9IP4b76kZYhWcjXT5Z1M7apVysEu+mq8mj8VZJGVStx9fcqH24XBMsqGYiqqLrfcLYgPzUcCFEoxhGG5EADw6kyDge1hQ0jxpkxmcgttdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322549; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8yUy2od8jmlo+ij62SPFyh2R7CK8Hv7caNbM0yYSL4M=; b=aKmHQ9nGX5HSwolpW/bsJTqvelUEIf10Y1YotoWXshiVZZ9NHz6nkZ8SxZF63r3l5SyThTxYxMk6u1PRz+IKxuJ4Tc4zmmLsB7HFvz74vlnC3sBH0B8VzOzsPbjFNwoVnbOhn647dO1KMxyw/UDXSvR8uTA1whivQIDP03b4qSw= 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=pass 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 1585322549120250.3154865731857; Fri, 27 Mar 2020 08:22:29 -0700 (PDT) Received: from localhost ([::1]:42980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqoV-0001r5-Sr for importer@patchew.org; Fri, 27 Mar 2020 11:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41426) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmH-0006qR-My for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmG-00050P-Ic for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:09 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:36939) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmG-0004zi-Es for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:08 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-363-FKllr7WSNGih7SbO-mS-Zw-1; Fri, 27 Mar 2020 11:20:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE40A800D50; Fri, 27 Mar 2020 15:20:04 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AE83177E5; Fri, 27 Mar 2020 15:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8yUy2od8jmlo+ij62SPFyh2R7CK8Hv7caNbM0yYSL4M=; b=Yf0FOyM197E5OVdsNRoanUIyGVittRZink23Rj1bxKZV/SB0XaKgoKu0DN/barU4jeLCpA Tw9Hk2rh0uU+IasgPHeOTPiWrx7gxRR0PuqBb3F6VjvB0uDWp408SXHwLaN/RNtENb1dtR LSER3IJQjaWBFCSjRrn63fTs4zhxPyw= X-MC-Unique: FKllr7WSNGih7SbO-mS-Zw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 1/6] block/iscsi:use the flags in iscsi_open() prevent Clang warning Date: Fri, 27 Mar 2020 16:19:45 +0100 Message-Id: <20200327151950.11820-2-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Chen Qun Clang static code analyzer show warning: block/iscsi.c:1920:9: warning: Value stored to 'flags' is never read flags &=3D ~BDRV_O_RDWR; ^ ~~~~~~~~~~~~ In iscsi_allocmap_init() only checks BDRV_O_NOCACHE, which is the same in both of flags and bs->open_flags. We can use the flags instead bs->open_flags to prevent Clang warning. Reported-by: Euler Robot Signed-off-by: Chen Qun Reviewed-by: Kevin Wolf Message-Id: <20200311032927.35092-1-kuhn.chenqun@huawei.com> Signed-off-by: Kevin Wolf --- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 14680a436a..4e216bd8aa 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2002,7 +2002,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *op= tions, int flags, iscsilun->cluster_size =3D iscsilun->bl.opt_unmap_gran * iscsilun->block_size; if (iscsilun->lbprz) { - ret =3D iscsi_allocmap_init(iscsilun, bs->open_flags); + ret =3D iscsi_allocmap_init(iscsilun, flags); } } =20 --=20 2.20.1 From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322651; cv=none; d=zohomail.com; s=zohoarc; b=AU0vfzp98W9ARAyazIdPHq86CDR1w417JQ1JSCGv8pnIETBmUqeNQUNKjZ0eppubRbuhSVufe/N0ou6dNRgh0rDiGWVdu0BfgwDXUQStEPmCV2wH6wSKqsP85p7HiyeHcpCTQGTHTjfqfkE6bIvPsaGJCewxSw09T/lvmKyPk9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fk0sEoSyk8D0WdjxUBUaxLMY5WyOh3Tqo/eYf9My26Y=; b=XJxlw3ILpS1JcNocwtpXd0K/f8s7Mav16wd9DQ2BfPxgGgJLALRn86dBhNXTK7f1fw4toZyldjanHMu8yODGDlJsebktuNm5810C/Oa/e8UJZzqhzDsjZohsCTupFuSOX7k+gJ04huxtxiwxt9UgKPR48MdtlK6u2OTWFvYi9P0= 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=pass 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 1585322651060718.9472135047099; Fri, 27 Mar 2020 08:24:11 -0700 (PDT) Received: from localhost ([::1]:43008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqq9-0004eM-VO for importer@patchew.org; Fri, 27 Mar 2020 11:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41484) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmL-0006vx-4k for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmK-0005Gr-1d for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:12 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:37970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmJ-0005Br-TS for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-KVAwSHTqNcubNw_Y5A92cA-1; Fri, 27 Mar 2020 11:20:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3275800D53; Fri, 27 Mar 2020 15:20:07 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40AA9177E5; Fri, 27 Mar 2020 15:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fk0sEoSyk8D0WdjxUBUaxLMY5WyOh3Tqo/eYf9My26Y=; b=g4tuTwkvSHJJal0z9T3aP+juxxdR8Ms9MMVzPnTYli38IIlUkSJJcNvsd+alwLfzeyTUet 08VF8fRrlGiK2zKNRjq4LgzdwviUyWwc1bpe+P4JoIvwlsPUB1V336aDiuzt8/175qpm/A AMiv6DIjS6m2rgByYKnBH2LwKrGjfhg= X-MC-Unique: KVAwSHTqNcubNw_Y5A92cA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 2/6] block: fix bdrv_root_attach_child forget to unref child_bs Date: Fri, 27 Mar 2020 16:19:46 +0100 Message-Id: <20200327151950.11820-3-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy bdrv_root_attach_child promises to drop child_bs reference on failure. It does it on first handled failure path, but not on the second. Fix that. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200324155921.23822-1-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf --- block.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block.c b/block.c index af3faf664e..2e3905c99e 100644 --- a/block.c +++ b/block.c @@ -2617,6 +2617,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *c= hild_bs, error_propagate(errp, local_err); g_free(child); bdrv_abort_perm_update(child_bs); + bdrv_unref(child_bs); return NULL; } } --=20 2.20.1 From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322723; cv=none; d=zohomail.com; s=zohoarc; b=R5DprSRgCn/LxzlofTA8QcHyVbC/Dfmvo/O/060U3pXGFFM7u00slZkvNmKDeA3Ty02Quckrkw5vppOT6Dr4MPOrYnZsEviR7HVTdOTRSPLkWNbwCXKzC72fFeL2Nwr4zxeX4XPF0OIo53yRmU+4fwyArpnt2wckNOQV2li9WNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a260PcX5ZP8azlfxdqQzYQNlsh8Xo00rhXrMyOcYqUg=; b=cjZKEfMqamo65B6Z8rrulwmn+dNwyrZWDQ+r9NwTotxhzTrxhOfSvlswkGlgy4eS7AM07FQ4j2irh2sQ2yeEs5KbDDFfMWU95gmkin4yX1APn7Vgc+LISs2jlmY2IGylzttJh+qvOO2Y0SSXmnt1lK7EjCVV/NoaCujexsR3Xac= 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=pass 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 1585322723613475.2177261068073; Fri, 27 Mar 2020 08:25:23 -0700 (PDT) Received: from localhost ([::1]:43028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqrK-0006Rm-9A for importer@patchew.org; Fri, 27 Mar 2020 11:25:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41507) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmM-0006yY-BR for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmL-0005N1-37 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:14 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:26510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmK-0005KX-Ug for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-440-k780iwY-PeO68ffKiFTePg-1; Fri, 27 Mar 2020 11:20:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59CB88017CE; Fri, 27 Mar 2020 15:20:09 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A03F177E5; Fri, 27 Mar 2020 15:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a260PcX5ZP8azlfxdqQzYQNlsh8Xo00rhXrMyOcYqUg=; b=L/+PPtZgSYyQvwTKKSalNGLw2CuCskUluiKHNwkajizKbYhcGEg0CknvWfQljRy1wMrb/A 5uIacmJ9JL3poI0yp7/C+5WUSFnHAZeA2Djh8dEJTj80YksAZUgYqM4uQPACmz3A4yiRyn ChKTQGoFF+YluG7W2c8U4S9VwHhnNZE= X-MC-Unique: k780iwY-PeO68ffKiFTePg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 3/6] nvme: Print 'cqid' for nvme_del_cq Date: Fri, 27 Mar 2020 16:19:47 +0100 Message-Id: <20200327151950.11820-4-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Minwoo Im The given argument for this trace should be cqid, not sqid. Signed-off-by: Minwoo Im Message-Id: <20200324140646.8274-1-minwoo.im.dev@gmail.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella Signed-off-by: Kevin Wolf --- hw/block/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/trace-events b/hw/block/trace-events index f78939fa9d..bf6d11b58b 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -37,7 +37,7 @@ nvme_rw(const char *verb, uint32_t blk_count, uint64_t by= te_count, uint64_t lba) nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize= , uint16_t qflags) "create submission queue, addr=3D0x%"PRIx64", sqid=3D%"P= RIu16", cqid=3D%"PRIu16", qsize=3D%"PRIu16", qflags=3D%"PRIu16"" nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t siz= e, uint16_t qflags, int ien) "create completion queue, addr=3D0x%"PRIx64", = cqid=3D%"PRIu16", vector=3D%"PRIu16", qsize=3D%"PRIu16", qflags=3D%"PRIu16"= , ien=3D%d" nvme_del_sq(uint16_t qid) "deleting submission queue sqid=3D%"PRIu16"" -nvme_del_cq(uint16_t cqid) "deleted completion queue, sqid=3D%"PRIu16"" +nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=3D%"PRIu16"" nvme_identify_ctrl(void) "identify controller" nvme_identify_ns(uint16_t ns) "identify namespace, nsid=3D%"PRIu16"" nvme_identify_nslist(uint16_t ns) "identify namespace list, nsid=3D%"PRIu1= 6"" --=20 2.20.1 From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322519; cv=none; d=zohomail.com; s=zohoarc; b=UfdOdSH8baXF8NUPEy+mUFMjm0i1e06EH7ldi++dCn3//IheZMw1JzJzcKR8K1EWchpIJHNCrahui7uj1JCI+t+eMRlbrTnsgPM5rr2CUhEscD6TvNviasf6f9a8gV0lB36HkOtgga0ii/0zQLrWX7C8UWjRTMkQbnn3HSrGNnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v9Dwt/l/3f/NkOpjSpxk8goKSC0gIUVj2nMxQnoV/Os=; b=fFvLA0QsqLedKsdG3ez/ratqSqGSdVyOlb0ay3q4H+PhezpxcywN9gNKh8X7F7s/MrVAcLpIRwjnogD85kKLBe347u96w5OUcDlv+Gi5pfUsXACEalKK4rx82zdTsYYqXlzY9J3EOXuMRKgmLh0uHF8n8/vKEWKl8LiZ4dP6gA8= 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=pass 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 1585322519932610.8239577966798; Fri, 27 Mar 2020 08:21:59 -0700 (PDT) Received: from localhost ([::1]:42976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqo0-0000gl-KZ for importer@patchew.org; Fri, 27 Mar 2020 11:21:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmP-00074L-8T for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmN-0005VQ-MO for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:16 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:43404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmN-0005UD-IV for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-emo1VSGQPqOd-2MtOsgUAQ-1; Fri, 27 Mar 2020 11:20:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E5AB1005512; Fri, 27 Mar 2020 15:20:10 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id A13752CE63; Fri, 27 Mar 2020 15:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v9Dwt/l/3f/NkOpjSpxk8goKSC0gIUVj2nMxQnoV/Os=; b=QgwnxmLuDUsMX0gz6Lyl05MsNtSeBztRfA69JdMIwexBE5Hy3uBx3eneSdksmoGBwYzdJY NG5Vh7z0tTMMh8M+VjIn/yK3hYED/7DvWjylK9jErZfHn0bThcVHiEPatB/K66/FmuHb5F Kr6m9ZvEu+JAaqJJA+xKJ0cuosii9F4= X-MC-Unique: emo1VSGQPqOd-2MtOsgUAQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 4/6] Revert "mirror: Don't let an operation wait for itself" Date: Fri, 27 Mar 2020 16:19:48 +0100 Message-Id: <20200327151950.11820-5-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This reverts commit 7e6c4ff792734e196c8ca82564c56b5e7c6288ca. The fix was incomplete as it only protected against requests waiting for themselves, but not against requests waiting for each other. We need a different solution. Signed-off-by: Kevin Wolf Message-Id: <20200326153628.4869-2-kwolf@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/mirror.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 6203e5946e..5879e63473 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -283,14 +283,11 @@ static int mirror_cow_align(MirrorBlockJob *s, int64_= t *offset, } =20 static inline void coroutine_fn -mirror_wait_for_any_operation(MirrorBlockJob *s, MirrorOp *self, bool acti= ve) +mirror_wait_for_any_operation(MirrorBlockJob *s, bool active) { MirrorOp *op; =20 QTAILQ_FOREACH(op, &s->ops_in_flight, next) { - if (self =3D=3D op) { - continue; - } /* Do not wait on pseudo ops, because it may in turn wait on * some other operation to start, which may in fact be the * caller of this function. Since there is only one pseudo op @@ -305,10 +302,10 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, Mirr= orOp *self, bool active) } =20 static inline void coroutine_fn -mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s, MirrorOp *self) +mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s) { /* Only non-active operations use up in-flight slots */ - mirror_wait_for_any_operation(s, self, false); + mirror_wait_for_any_operation(s, false); } =20 /* Perform a mirror copy operation. @@ -351,7 +348,7 @@ static void coroutine_fn mirror_co_read(void *opaque) =20 while (s->buf_free_count < nb_chunks) { trace_mirror_yield_in_flight(s, op->offset, s->in_flight); - mirror_wait_for_free_in_flight_slot(s, op); + mirror_wait_for_free_in_flight_slot(s); } =20 /* Now make a QEMUIOVector taking enough granularity-sized chunks @@ -558,7 +555,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlo= ckJob *s) =20 while (s->in_flight >=3D MAX_IN_FLIGHT) { trace_mirror_yield_in_flight(s, offset, s->in_flight); - mirror_wait_for_free_in_flight_slot(s, pseudo_op); + mirror_wait_for_free_in_flight_slot(s); } =20 if (s->ret < 0) { @@ -612,7 +609,7 @@ static void mirror_free_init(MirrorBlockJob *s) static void coroutine_fn mirror_wait_for_all_io(MirrorBlockJob *s) { while (s->in_flight > 0) { - mirror_wait_for_free_in_flight_slot(s, NULL); + mirror_wait_for_free_in_flight_slot(s); } } =20 @@ -810,7 +807,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJo= b *s) if (s->in_flight >=3D MAX_IN_FLIGHT) { trace_mirror_yield(s, UINT64_MAX, s->buf_free_count, s->in_flight); - mirror_wait_for_free_in_flight_slot(s, NULL); + mirror_wait_for_free_in_flight_slot(s); continue; } =20 @@ -963,7 +960,7 @@ static int coroutine_fn mirror_run(Job *job, Error **er= rp) /* Do not start passive operations while there are active * writes in progress */ while (s->in_active_write_counter) { - mirror_wait_for_any_operation(s, NULL, true); + mirror_wait_for_any_operation(s, true); } =20 if (s->ret < 0) { @@ -989,7 +986,7 @@ static int coroutine_fn mirror_run(Job *job, Error **er= rp) if (s->in_flight >=3D MAX_IN_FLIGHT || s->buf_free_count =3D= =3D 0 || (cnt =3D=3D 0 && s->in_flight > 0)) { trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight= ); - mirror_wait_for_free_in_flight_slot(s, NULL); + mirror_wait_for_free_in_flight_slot(s); continue; } else if (cnt !=3D 0) { delay_ns =3D mirror_iteration(s); --=20 2.20.1 From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322525; cv=none; d=zohomail.com; s=zohoarc; b=bLU0cUOjKEgZY2+fT1NCLXThUK8dy4naUSG/fBQ4+OntLVrouwxyV4iBaXCA+bQytkrtL113JKUrX98x4RmOwYw11+CRwQhSfUMXS1ZTKvi9coM47WqCYvCE5hs6b6l3n0AvXGz01RJhrZ7tbu5g9eBdz33qka5zNjMh3ItqldI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322525; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LpFx3xbDjLHgnld7KEsJo+oSoeRXqHdzp2xWL/JMMOs=; b=P6iIJRCHOqOzp04s1O1rTePE4NclIOf7TVlX8Wn2UxbjtuWe0TfCwfVLCgxGW7awNyWPrki4ZeLqQ6VZ/OEnavlaIs8q+ev3tv6s8ZWUKPO5wUTW6kpu3hRAZ52i80Az34QBhqhcv9i75EFEUeyumWblGPeZIe1HX2L+0zGcHpA= 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=pass 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 1585322525192857.8519203628098; Fri, 27 Mar 2020 08:22:05 -0700 (PDT) Received: from localhost ([::1]:42978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqo8-00014v-2y for importer@patchew.org; Fri, 27 Mar 2020 11:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41597) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmP-00075U-VJ for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmO-0005YN-Fr for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:24279) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmO-0005WA-Aj for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:16 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-ujUbC-szOW66SbZrDsrcFQ-1; Fri, 27 Mar 2020 11:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA95A801E72; Fri, 27 Mar 2020 15:20:11 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id E65CF5C28F; Fri, 27 Mar 2020 15:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LpFx3xbDjLHgnld7KEsJo+oSoeRXqHdzp2xWL/JMMOs=; b=iEcBh5fJDBxwNJ448jdPi5E7itAA19L3d6IAmkcUit01MBzf5h1aao+Ek6PXz7mKJXZgMr Zez24PPiPmOGYUultRddz/dXfDuG4W57fEZDWpqhxOGERfoDLHfU+RMqDrtR/utYYB8LdQ uxzZAJatr59MGPAI6FDUl+GkOYnrOXI= X-MC-Unique: ujUbC-szOW66SbZrDsrcFQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 5/6] mirror: Wait only for in-flight operations Date: Fri, 27 Mar 2020 16:19:49 +0100 Message-Id: <20200327151950.11820-6-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" mirror_wait_for_free_in_flight_slot() just picks a random operation to wait for. However, a MirrorOp is already in s->ops_in_flight when mirror_co_read() waits for free slots, so if not enough slots are immediately available, an operation can end up waiting for itself, or two or more operations can wait for each other to complete, which results in a hang. Fix this by adding a flag to MirrorOp that tells us if the request is already in flight (and therefore occupies slots that it will later free), and picking only such operations for waiting. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1794692 Signed-off-by: Kevin Wolf Message-Id: <20200326153628.4869-3-kwolf@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/mirror.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 5879e63473..c26fd9260d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -102,6 +102,7 @@ struct MirrorOp { =20 bool is_pseudo_op; bool is_active_write; + bool is_in_flight; CoQueue waiting_requests; Coroutine *co; =20 @@ -293,7 +294,9 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, bool a= ctive) * caller of this function. Since there is only one pseudo op * at any given time, we will always find some real operation * to wait on. */ - if (!op->is_pseudo_op && op->is_active_write =3D=3D active) { + if (!op->is_pseudo_op && op->is_in_flight && + op->is_active_write =3D=3D active) + { qemu_co_queue_wait(&op->waiting_requests, NULL); return; } @@ -367,6 +370,7 @@ static void coroutine_fn mirror_co_read(void *opaque) /* Copy the dirty cluster. */ s->in_flight++; s->bytes_in_flight +=3D op->bytes; + op->is_in_flight =3D true; trace_mirror_one_iteration(s, op->offset, op->bytes); =20 ret =3D bdrv_co_preadv(s->mirror_top_bs->backing, op->offset, op->byte= s, @@ -382,6 +386,7 @@ static void coroutine_fn mirror_co_zero(void *opaque) op->s->in_flight++; op->s->bytes_in_flight +=3D op->bytes; *op->bytes_handled =3D op->bytes; + op->is_in_flight =3D true; =20 ret =3D blk_co_pwrite_zeroes(op->s->target, op->offset, op->bytes, op->s->unmap ? BDRV_REQ_MAY_UNMAP : 0); @@ -396,6 +401,7 @@ static void coroutine_fn mirror_co_discard(void *opaque) op->s->in_flight++; op->s->bytes_in_flight +=3D op->bytes; *op->bytes_handled =3D op->bytes; + op->is_in_flight =3D true; =20 ret =3D blk_co_pdiscard(op->s->target, op->offset, op->bytes); mirror_write_complete(op, ret); @@ -1319,6 +1325,7 @@ static MirrorOp *coroutine_fn active_write_prepare(Mi= rrorBlockJob *s, .offset =3D offset, .bytes =3D bytes, .is_active_write =3D true, + .is_in_flight =3D true, }; qemu_co_queue_init(&op->waiting_requests); QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next); --=20 2.20.1 From nobody Mon Apr 29 01:53:39 2024 Delivered-To: importer@patchew.org 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; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322609; cv=none; d=zohomail.com; s=zohoarc; b=Yx+S88dgQzUFTOYJGjYTVQTPE3qqw5u3rILUJKegwCNyn+1Zf6aLOIcJg9/j/IwNFwT6FAyz19BtGWdROQ+vIgZX4GLLMyg2S3DLfz2vuE9h3tw5OAUo/x7rmYmXTbbEq99q3FjiOlkDwwsSHFxpWyHH3MmoNYuPB8jBCi4Rpt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9CGBWC4c2QdM3PaT19uZbr2BjwnTY3bkj2aVcI89BVU=; b=Kk6rwc4wfnBFQ0VJnn0Z9IGPsKVyWqZ91aDzFvpP8t0gdV1fa5y8Jzv3VfoBRtNirrcxPCHQ3oHE8ItTrPv/q5O7Uxhg0GdSixRiYcpL4pkMVOQCsAbTUPl2/M8nGGGmA/w+SvK21L4rsaIEBOLz1Io7s2Gt5ieYMcS825H4olk= 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=pass 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 1585322609645214.33609292592075; Fri, 27 Mar 2020 08:23:29 -0700 (PDT) Received: from localhost ([::1]:43005 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqpU-0003iO-EH for importer@patchew.org; Fri, 27 Mar 2020 11:23:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmQ-00075s-9Y for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmP-0005bE-3y for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:18 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:50160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmO-0005ZJ-UA for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-EEIjfD_9NreaGg1TXIOilA-1; Fri, 27 Mar 2020 11:20:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 48AE313F6; Fri, 27 Mar 2020 15:20:13 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2BE5F709; Fri, 27 Mar 2020 15:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9CGBWC4c2QdM3PaT19uZbr2BjwnTY3bkj2aVcI89BVU=; b=DIX8aE2p2d5IOSfSS/Nfc2PoC34ozZsJQxKv++UbsBvU3PkdHnzjQoNNMcRW6AvaS9bo8F bKs9ol+9AQecWcZVcZKhD/qGFLna5ii0hjkUJBZMxfha+kCue07NFoCVb3SZtb1ooqfMK9 RSiaZ39fg8iYELH5dKAteK0+gyFZ3Lw= X-MC-Unique: EEIjfD_9NreaGg1TXIOilA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 6/6] qcow2: Remove unused fields from BDRVQcow2State Date: Fri, 27 Mar 2020 16:19:50 +0100 Message-Id: <20200327151950.11820-7-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These fields were already removed in commit c3c10f72, but then commit b58deb34 revived them probably due to bad merge conflict resolution. They are still unused, so remove them again. Fixes: b58deb344ddff3b9d8b265bf73a65274767ee5f4 Signed-off-by: Kevin Wolf Message-Id: <20200326170757.12344-1-kwolf@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Kevin Wolf --- block/qcow2.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 0942126232..f4de0a27d5 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -301,9 +301,6 @@ typedef struct BDRVQcow2State { QEMUTimer *cache_clean_timer; unsigned cache_clean_interval; =20 - uint8_t *cluster_cache; - uint8_t *cluster_data; - uint64_t cluster_cache_offset; QLIST_HEAD(, QCowL2Meta) cluster_allocs; =20 uint64_t *refcount_table; --=20 2.20.1