Message ID | 1552323335-46779-7-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lQfH/2Eq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44J4Rb1zVvz9s4V for <incoming@patchwork.ozlabs.org>; Tue, 12 Mar 2019 04:12:43 +1100 (AEDT) Received: from localhost ([127.0.0.1]:37049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1h3OTh-0003Kh-4l for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2019 13:12:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODQ-0006wD-Fe for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:55:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODO-0002wJ-Kh for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:55:52 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODM-0002rG-LR for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:55:48 -0400 Received: by mail-wm1-x32a.google.com with SMTP id e74so5327198wmg.3 for <qemu-devel@nongnu.org>; Mon, 11 Mar 2019 09:55:46 -0700 (PDT) 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=rwjT2Kg2mtCpabPUiGcE4JLkN29GhylnXzHQM16bmss=; b=lQfH/2Eq+L1H8Y7vLnPtjF2eUM18zsdTqq8AogECTznY2FJrjDkKOKaTrGsr280hur nB/AgyQ4rGOlRu/m3nZt5l3LqAmJBE/SmlJQX7C0QsK/ICNNac6FuPjg5FuHZpuGuFqc B17nBS+hvmO9bYnIgD2SfmM79dFMS2bhPKsfizFFmdP6COyB+rCAs2Kr4MBZEOLZwKzs V9d4lc0cNGJSAhcEIIArVwJdGwy5HxBF0WeodZKwW+8Ia3/Qio8IFY1dphhG/smM+8ya sXWHH8w7d4e4wWmQAu0eDf188cdThLHQRWFaMJY0h4aOsW2qg8nKSuc6EyGG8XDgikqo GNpg== 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=rwjT2Kg2mtCpabPUiGcE4JLkN29GhylnXzHQM16bmss=; b=Ep1QUaREmbb0Zs/smPgFa4ua6DkbjxIMphlUBy5Vl+5yXd/lE9tWb5eiTi5UWqgZ+d 10drfIveQmY5ZVdQnRgaZSr034JNs94stN5bUWWxTVvi15wrJiaoAMuwzaBtkID4qwZF 5kIcM6l0uxXil0Zh/rkytGfW+mtI0wYV4NJGWrYW2j4NsDwx91R5E++0jffa9iTifwuh XOpndVjspfLrAGqogZmqDMnzCMBRl1uFTz130fyLhUq6pynwISaiKAApIKpdywWKKo0Z E1rYJPlzWlEafMkwS9mYIS00mjZUByr2pYR+YjMWmn5UNJpsnf30CM4iIPuzF8VC//q0 6wvw== X-Gm-Message-State: APjAAAVD+/XkLUY4nB5cd7mM7Kgq/nzZGseEDZx8dHG6pu9ZzFeGs7LV cW7neC4R6vldBKNlnywjKZm/e+UI X-Google-Smtp-Source: APXvYqwDfTzrROC6zc1+WFuPP0r90b9KEKWUDqXklCy43RzwjMMGGvaTleX6aouUIyastCXReKE3XA== X-Received: by 2002:a1c:228b:: with SMTP id i133mr432627wmi.105.1552323345007; Mon, 11 Mar 2019 09:55:45 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id e12sm6484836wrs.91.2019.03.11.09.55.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 09:55:44 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 17:55:10 +0100 Message-Id: <1552323335-46779-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> References: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PULL v2 06/31] block/iscsi: Restrict Linux-specific code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/31] memory: Do not update coalesced IO range in the case of NOP
|
expand
|
diff --git a/block/iscsi.c b/block/iscsi.c index a0c0084..f31c612 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -145,6 +145,8 @@ static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048, 8192, 32768} * unallocated. */ #define ISCSI_CHECKALLOC_THRES 64 +#ifdef __linux__ + static void iscsi_bh_cb(void *p) { @@ -172,6 +174,8 @@ iscsi_schedule_bh(IscsiAIOCB *acb) qemu_bh_schedule(acb->bh); } +#endif + static void iscsi_co_generic_bh_cb(void *opaque) { struct IscsiTask *iTask = opaque; @@ -290,6 +294,8 @@ static void iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask) }; } +#ifdef __linux__ + /* Called (via iscsi_service) with QemuMutex held. */ static void iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data, @@ -338,6 +344,7 @@ static const AIOCBInfo iscsi_aiocb_info = { .cancel_async = iscsi_aio_cancel, }; +#endif static void iscsi_process_read(void *arg); static void iscsi_process_write(void *arg);