Message ID | 1538295197-23704-16-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=2001:4830:134:3::11; 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="AOy1cf+G"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NJF41sTgz9s5c for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:17:44 +1000 (AEST) Received: from localhost ([::1]:54228 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 1g6Wv7-0004rW-KC for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:17:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WrA-00027y-9N for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wr8-00007e-R8 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wr8-00005r-Ih for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:34 -0400 Received: by mail-wm1-x332.google.com with SMTP id s12-v6so5813172wmc.0 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:13:34 -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; bh=GUO347Pf5gF5wPOOSFQyo6giS3ymDQqMfCL6e5MXYD0=; b=AOy1cf+GVVyiyZnh6RZ5fyNT5w8XQz7fnz19eYjbkHW3bb22D+UXB3SYsi0DRbymzC 74yY0/HXcZzVAGTN8O51ENTMwjkWlr7qd2X3Jn0er8dg09quhbXP2qjsqb6gqyzmXe+c HUhZ6OUANRRmpBgufbBTSsuNmQXCwN6scbV/CcprC5zOVu1eJ1DBAr77y4uUBqqycbKr RnRWW24qnZrq9g3nmCrLXXzO5XPGJVo8lc2WZjc6nU0q0BKmDDWVbLa6+9HifgUF/ZCj gcLuMo7Ri6vE0q6Vc2uSYqzOXM00ss6edEF/yW7Z43LmrXK/hgTht1TEwbOD+biqA2ak C/lg== 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; bh=GUO347Pf5gF5wPOOSFQyo6giS3ymDQqMfCL6e5MXYD0=; b=uhdyjDm6FMefBbtqgHmv0iN6MMYjGBR52XIsqSCZnLWEHWfVlvLSlp2aQiag5b++DF pnPOozzAlHdubH6oUY0ei9uLnkJwW2MFrg9WSIaT95up0LjKZkHkQVq//tYrOrgNOBM3 YjYN6JNtxwLJAwvchDXio8HwYq15SCAcPTFgw9CzOscxZny86ZbttThUQ1PO1Uw4fa7o KQ2jUMRnA4aef47MTHGTG9qcC8IUtTfWibHa8nPiwGKfY3O6nBFWc62zN7MxwPem3Yis 8/IqFcD84P494pliquQ13NjTkrI5AmBKfDH6/GFf/8orvuWpplhghbaZ5YRAXD2xJTrO hjow== X-Gm-Message-State: ABuFfojIME/Oi+vaxigyKLSl9CqT1jH3cz17HGMRcj/4U0kn0xwaytf7 Mxten6bWlWn6N3sHRw4LeMUEzDwR X-Google-Smtp-Source: ACcGV61onbsQVvq7wW2JmCbqsqmnI0/1Wdqh4u9+rKue9ZXEix3oobYwPxp7UCezHWIZNG/0sv92/w== X-Received: by 2002:a7b:c0d3:: with SMTP id s19-v6mr5970286wmh.119.1538295213281; Sun, 30 Sep 2018 01:13:33 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:32 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:13 +0200 Message-Id: <1538295197-23704-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 15/79] dump: fix Windows dump memory run mapping 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: Viktor Prutyanov <viktor.prutyanov@virtuozzo.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,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/win_dump.c b/win_dump.c index b15c191..e10a783 100644 --- a/win_dump.c +++ b/win_dump.c @@ -30,28 +30,32 @@ static size_t write_run(WinDumpPhyMemRun64 *run, int fd, Error **errp) void *buf; uint64_t addr = run->BasePage << TARGET_PAGE_BITS; uint64_t size = run->PageCount << TARGET_PAGE_BITS; - uint64_t len = size; + uint64_t len, l; + size_t total = 0; - buf = cpu_physical_memory_map(addr, &len, false); - if (!buf) { - error_setg(errp, "win-dump: failed to map run"); - return 0; - } - if (len != size) { - error_setg(errp, "win-dump: failed to map entire run"); - len = 0; - goto out_unmap; - } + while (size) { + len = size; - len = qemu_write_full(fd, buf, len); - if (len != size) { - error_setg(errp, QERR_IO_ERROR); - } + buf = cpu_physical_memory_map(addr, &len, false); + if (!buf) { + error_setg(errp, "win-dump: failed to map physical range" + " 0x%016" PRIx64 "-0x%016" PRIx64, addr, addr + size - 1); + return 0; + } + + l = qemu_write_full(fd, buf, len); + cpu_physical_memory_unmap(buf, addr, false, len); + if (l != len) { + error_setg(errp, QERR_IO_ERROR); + return 0; + } -out_unmap: - cpu_physical_memory_unmap(buf, addr, false, len); + addr += l; + size -= l; + total += l; + } - return len; + return total; } static void write_runs(DumpState *s, WinDumpHeader64 *h, Error **errp)