From patchwork Fri Jan 15 18:00:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8043731 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECA3CBEEE5 for ; Fri, 15 Jan 2016 18:00:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FBF2203F4 for ; Fri, 15 Jan 2016 18:00:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB414202E5 for ; Fri, 15 Jan 2016 18:00:32 +0000 (UTC) Received: from localhost ([::1]:48448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK8fm-0001RJ-Go for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Jan 2016 13:00:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK8fe-0001Qx-Mc for qemu-devel@nongnu.org; Fri, 15 Jan 2016 13:00:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK8fa-0000Yx-MA for qemu-devel@nongnu.org; Fri, 15 Jan 2016 13:00:22 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:35395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK8fa-0000Yq-BD for qemu-devel@nongnu.org; Fri, 15 Jan 2016 13:00:18 -0500 Received: by mail-wm0-x233.google.com with SMTP id f206so30275565wmf.0 for ; Fri, 15 Jan 2016 10:00:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id; bh=T0SxiDa1DSWb2bg1zWo9Lwk4/CqyE/MkZSBfiC94PqE=; b=Kgvg+qikyW05B2yf7BT2X3mWOUtRRdfP9yGYpOkKxS1euEXMyKhSEdtJT11PigEzSU NinDL8ZM6D/XH/Vh9uHAWnScXXz1/Ivl8iCA6UKLDw9bramQAveZ2WiLQU9ystHYYf6s U9ACga/wWF/tNlcX0GKvLfkEH2zMHjM3XR/LvhgXd1zpGcILQphHTzLfPw65oCDYZHnz qTFDKkcDB5voInxh9blT+KOLZMx0UnRslMv8Q79tErDhax5QBSeJAw5hvT/jCzT41MUY UXdqUwzm+bE8VVVTUj6WpuE2hHbT8pKwH5s305MzYVq7FPCg1CAYprYDgnXOp6aFXpDM 0OIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=T0SxiDa1DSWb2bg1zWo9Lwk4/CqyE/MkZSBfiC94PqE=; b=GLjlt+oEHV1QMm6I7QHkfu0XNBQZAstg6DX1pC/5bU/BLVLjXnvuvbSvEn6Uc4nPqr tlqbzaTbAx7dRfIy2hRsvVHI7DXG3QHq0Y7nrlvNozOH+1bEdTU7soUllQGacng4K82C iHDZiTpJXdWEuL/EJ9YstmUjOYvN/IsdpPXN3wPG75Fdvv1Tbvg0b+nFG0NFlB0cUjBe xR/Oo9Bjs/iwzVtOfpUs6SbtL3KUGgEMNwQduPMLG7w2Jq5LvT69Mgysxj9wby8q/0eE 4lp3CYFwwp1VqE1F8srgZAWjous49Bkm+u2D7N6aVfbkDYLtgaq1Bvug/IKMyBMMVAYi tlzg== X-Gm-Message-State: ALoCoQkLebk2hNw4+OufcZyrPJ7sPedEXRzUlES0+FCHv6fwVMOOp64r1aqN9Wg92yLlgQtjtqI4eIf+ll8F8wwHTOg5pjgJGA== X-Received: by 10.194.110.106 with SMTP id hz10mr11390392wjb.135.1452880817421; Fri, 15 Jan 2016 10:00:17 -0800 (PST) Received: from 640k.lan (94-39-195-126.adsl-ull.clienti.tiscali.it. [94.39.195.126]) by smtp.gmail.com with ESMTPSA id y124sm3539263wmg.3.2016.01.15.10.00.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 10:00:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Jan 2016 19:00:12 +0100 Message-Id: <1452880813-141591-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL v2 00/15] NBD, chardev, SCSI patches for 2015-01-15 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following changes since commit 5a57acb66f19ee52723aa05b8afbbc41c3e9ec99: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160115' into staging (2016-01-15 15:49:43 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to fefd749ce29837d399a38d6052ca9968fa7352e7: qemu-char: do not leak QemuMutex when freeing a character device (2016-01-15 18:58:02 +0100) ---------------------------------------------------------------- * qemu-char logfile facility * NBD coroutine based negotiation * bugfixes ---------------------------------------------------------------- Cao jin (1): SCSI device: fix to incomplete QOMify Daniel P. Berrange (2): qemu-char: delete send_all/recv_all helper methods qemu-char: add logfile facility to all chardev backends Fam Zheng (3): nbd: Always call "close_fn" in nbd_client_new nbd: Split nbd.c nbd-server: Coroutine based negotiation P J P (2): i386: avoid null pointer dereference scsi: initialise info object with appropriate size Paolo Bonzini (5): scsi: revert change to scsi_req_cancel_async and add assertions target-i386: do not duplicate page protection checks nbd-server: do not check request length except for reads and writes nbd-server: do not exit on failed memory allocation qemu-char: do not leak QemuMutex when freeing a character device Shmulik Ladkani (1): vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific Zhu Lingshan (1): iscsi: send readcapacity10 when readcapacity16 failed MAINTAINERS | 5 +- Makefile.objs | 3 +- backends/baum.c | 7 +- backends/msmouse.c | 6 +- block/block-backend.c | 5 + block/iscsi.c | 7 +- blockdev-nbd.c | 5 +- gdbstub.c | 3 +- hw/i386/kvmvapic.c | 15 +- hw/scsi/megasas.c | 14 +- hw/scsi/scsi-bus.c | 15 +- hw/scsi/virtio-scsi.c | 2 +- hw/tpm/tpm_passthrough.c | 29 +- include/block/nbd.h | 3 +- include/hw/compat.h | 17 +- include/qemu/sockets.h | 2 - include/sysemu/block-backend.h | 1 + include/sysemu/char.h | 9 +- nbd/Makefile.objs | 1 + nbd/client.c | 361 ++++++++++++++++++++++++ nbd/common.c | 64 +++++ nbd/nbd-internal.h | 113 ++++++++ nbd.c => nbd/server.c | 608 ++++++++--------------------------------- qapi-schema.json | 49 +++- qemu-char.c | 320 ++++++++++++++-------- qemu-nbd.c | 10 +- qemu-options.hx | 48 ++-- spice-qemu-char.c | 20 +- target-i386/helper.c | 65 ++--- tests/qemu-iotests/083 | 2 +- ui/console.c | 6 +- 31 files changed, 1077 insertions(+), 738 deletions(-) create mode 100644 nbd/Makefile.objs create mode 100644 nbd/client.c create mode 100644 nbd/common.c create mode 100644 nbd/nbd-internal.h rename nbd.c => nbd/server.c (62%) diff --git a/target-i386/helper.c b/target-i386/helper.c index bf58242..6b10019 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -927,7 +927,7 @@ do_check_protect_pse36: /* only set write access if already dirty... otherwise wait for dirty access */ assert(!is_write); - prot &= ~PROT_WRITE; + prot &= ~PAGE_WRITE; } do_mapping: