From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4D64C433E0 for ; Mon, 8 Feb 2021 22:07:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 737DC64E82 for ; Mon, 8 Feb 2021 22:07:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 737DC64E82 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Egd-0005Ne-A4 for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 17:07:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9BCQ-00039t-CW for qemu-devel@nongnu.org; Mon, 08 Feb 2021 13:23:50 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9BCO-00068K-Qj for qemu-devel@nongnu.org; Mon, 08 Feb 2021 13:23:50 -0500 Received: by mail-wr1-x431.google.com with SMTP id b3so18382209wrj.5 for ; Mon, 08 Feb 2021 10:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+gYBA8EOP9voo6st9l/tKav/btWR7A0x68POX4fuYnY=; b=KSFRiRzSCcTb7KhJzJZ746g1L0bHQMoEO2I2fcSPp5kXxxMnNfOZExDWEC4GHtsoOu zrM1Pt+Dk+D4Lw0sfXPHCMA/O74FzrpXVY8PKi302hIAF6Mz/5DkOJV+UfjzWlUQcuuc EPMg6z1XlRm+m7H+lIP1A8dZIrfPnXfXfbWX3TU6Hs4De0qAQuu/bD5plr5PrqZOAw3p mv3zMopdi873m1ugly6kRWtJBGhAAYLRMYZwqYV4ri7Rfx2X5NBf/lS/8fbFyHChhV9h wFwbG1FVDsw4iEb0C8xGq9b5OfUs4pfaKEoV+msq9W8fxB9jvg3GfLfvjLLzADhy64Ld Pi2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+gYBA8EOP9voo6st9l/tKav/btWR7A0x68POX4fuYnY=; b=o9VHbZ+eqktNDimkjMIKZ9wrciTmcwYy9/dkWTC77kNdS9EykQuXrwF68AdxjC+FUd FIpUvWr9zk+VxQtoQ7SmJDMiUeCay5OJP8u+MbsSD16Rfcu/rfGF/NJQscYNUfzj53v3 ediF8BItkqkuXVRld4lzGn5+3sRjcvbfQ173APToI75DtpeAsHMsAsVTjJ2l7xDQtVyV JrJ6OnnXx/5Gjln1eRgPRLk3NHgb/W6lGpJyAWCvhqb15I9cxgLhRAtwwgJly/etvXz4 Q24aTBVp8FLmlypG+/pCzyhpbRTw7XaMUw9jdyfI0Q3XWlHZisg2kaACCVGzRo0gIhJq lwQg== X-Gm-Message-State: AOAM533j59eJ5pNGQ5rCZvToqDcoIg3yXg2NRO8XL7WZB4eiJBsoPO33 Sgqfc3r/CfoVFMhwxlhBQqWwghywOeOEeg== X-Google-Smtp-Source: ABdhPJyNdbgmQv1yK+MpgE7dMpqmNKLUBg3VaA8FGQlJP8YwlrVY3D7+2TBJvbJWOAAOw8V+mthAXQ== X-Received: by 2002:adf:a196:: with SMTP id u22mr2669895wru.416.1612808627580; Mon, 08 Feb 2021 10:23:47 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x22sm19670wmc.25.2021.02.08.10.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 10:23:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/46] virtio-scsi: don't uninitialize queues that we didn't initialize Date: Mon, 8 Feb 2021 19:23:00 +0100 Message-Id: <20210208182331.58897-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210208182331.58897-1-pbonzini@redhat.com> References: <20210208182331.58897-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Maxim Levitsky Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Maxim Levitsky Count number of queues that we initialized and only deinitialize these that we initialized successfully. Signed-off-by: Maxim Levitsky Message-Id: <20201217150040.906961-3-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi-dataplane.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index b995bab3a2..2c83a0ab1f 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -126,6 +126,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) { int i; int rc; + int vq_init_count = 0; BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); @@ -153,17 +154,22 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) if (rc) { goto fail_vrings; } + + vq_init_count++; rc = virtio_scsi_vring_init(s, vs->event_vq, 1, virtio_scsi_data_plane_handle_event); if (rc) { goto fail_vrings; } + + vq_init_count++; for (i = 0; i < vs->conf.num_queues; i++) { rc = virtio_scsi_vring_init(s, vs->cmd_vqs[i], i + 2, virtio_scsi_data_plane_handle_cmd); if (rc) { goto fail_vrings; } + vq_init_count++; } s->dataplane_starting = false; @@ -174,7 +180,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) fail_vrings: aio_wait_bh_oneshot(s->ctx, virtio_scsi_dataplane_stop_bh, s); aio_context_release(s->ctx); - for (i = 0; i < vs->conf.num_queues + 2; i++) { + for (i = 0; i < vq_init_count; i++) { virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false); virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i); } -- 2.29.2