From nobody Sat Apr 27 05:47:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495124283174643.5312538294659; Thu, 18 May 2017 09:18:03 -0700 (PDT) Received: from localhost ([::1]:54674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBO7j-0003yI-AU for importer@patchew.org; Thu, 18 May 2017 12:17:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBO6t-0003dB-Nh for qemu-devel@nongnu.org; Thu, 18 May 2017 12:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBO6p-0006pZ-OV for qemu-devel@nongnu.org; Thu, 18 May 2017 12:17:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57868) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBO6p-0006pJ-Ej for qemu-devel@nongnu.org; Thu, 18 May 2017 12:17:03 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78C3BC056784 for ; Thu, 18 May 2017 16:17:02 +0000 (UTC) Received: from secure.mitica (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 504E27E5BF; Thu, 18 May 2017 16:16:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 78C3BC056784 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 78C3BC056784 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 18 May 2017 18:16:46 +0200 Message-Id: <20170518161655.30311-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 18 May 2017 16:17:02 +0000 (UTC) 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: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 0/9] Migration mini-cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Hi Changes from v3 Only copyright notices: included the diff to make it easier to see: - channel.{c,h} -> goes to Daniel Berrange - qemu-file-channel.h -> same one than qemu-file-channel.c I hope this is ok now. Thanks, Juan. diff --git a/migration/channel.c b/migration/channel.c index fed8563..124857d 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -1,10 +1,10 @@ /* - * QEMU live migration + * QEMU live migration channel operations * - * Copyright IBM, Corp. 2008 + * Copyright Red Hat, Inc. 2016 * * Authors: - * Anthony Liguori + * Daniel P. Berrange * * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. diff --git a/migration/channel.h b/migration/channel.h index 618acb7..2e0a7e3 100644 --- a/migration/channel.h +++ b/migration/channel.h @@ -1,14 +1,16 @@ /* - * QEMU live migration channel functions + * QEMU live migration channel operations * - * Copyright IBM, Corp. 2008 + * Copyright Red Hat, Inc. 2016 * * Authors: - * Anthony Liguori + * Daniel P. Berrange * * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. */ =20 #ifndef QEMU_MIGRATION_CHANNEL_H diff --git a/migration/qemu-file-channel.h b/migration/qemu-file-channel.h index d1bd5ff..0028a09 100644 --- a/migration/qemu-file-channel.h +++ b/migration/qemu-file-channel.h @@ -1,14 +1,25 @@ /* - * QEMU migration file channel operations + * QEMUFile backend for QIOChannel objects * - * Copyright IBM, Corp. 2008 + * Copyright (c) 2015-2016 Red Hat, Inc * - * Authors: - * Anthony Liguori + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. */ =20 #ifndef QEMU_FILE_CHANNEL_H [v3] - dropped movement of colo*h headers they are used in other palaces in patches outside the tree - Change the license of vmstate*c files to GPL v2+ Dave noted that I was using the wrong text - page_cache.c movement was already reviewd and it has no conflicts, moved to pull request. Please, review Thanks, Juan. [v3] Due to popular demand, and to make reviews easier, I just split the big cleanup series (41 patches) in small chunks. This chunk just include the easy patches: - create several include files foo.h for functcions exported from foo.c - split channel operations in channel.c - move colo headers to migration/ - split vmstate-types.c from vmstate.c (now it only contains the interprete= r) - untangle qemu-file.h, vmstate.h and migration.h. Now none include the ot= her fix all callers. - Remove uses of migration.h that are not needed Juan Quintela (9): migration: Create migration/xbzrle.h migration: Split migration/channel.c for channel operations migration: Export qemu-file-channel.c functions in its own file migration: Remove migration.h from colo.h migration: Move qjson.h to migration/ migration: Split vmstate-types.c from vmstate.c migration: Remove qemu-file.h from vmstate.h migration: Remove vmstate.h from migration.h migration: migration.h was not needed block/qed.c | 1 - hw/i386/pc_q35.c | 1 - hw/virtio/vhost-user.c | 1 - hw/virtio/vhost-vsock.c | 1 - hw/virtio/virtio.c | 1 - include/hw/hw.h | 1 + include/migration/colo.h | 1 - include/migration/migration.h | 13 +- include/migration/qemu-file.h | 4 - include/migration/vmstate.h | 3 - migration/Makefile.objs | 4 +- migration/block.c | 2 + migration/channel.c | 70 ++++ migration/channel.h | 27 ++ migration/colo-comm.c | 4 +- migration/colo.c | 3 + migration/exec.c | 1 + migration/fd.c | 1 + migration/migration.c | 52 +-- migration/postcopy-ram.c | 1 + migration/qemu-file-channel.c | 1 + migration/qemu-file-channel.h | 32 ++ migration/qjson.c | 2 +- {include/migration =3D> migration}/qjson.h | 0 migration/ram.c | 3 + migration/rdma.c | 1 + migration/savevm.c | 1 + migration/socket.c | 1 + migration/tls.c | 1 + migration/vmstate-types.c | 661 +++++++++++++++++++++++++++= ++++ migration/vmstate.c | 656 +--------------------------= --- migration/xbzrle.c | 2 +- migration/xbzrle.h | 21 + monitor.c | 1 - tests/Makefile.include | 2 +- tests/test-vmstate.c | 2 + tests/test-xbzrle.c | 2 +- 37 files changed, 855 insertions(+), 726 deletions(-) create mode 100644 migration/channel.c create mode 100644 migration/channel.h create mode 100644 migration/qemu-file-channel.h rename {include/migration =3D> migration}/qjson.h (100%) create mode 100644 migration/vmstate-types.c create mode 100644 migration/xbzrle.h --=20 2.9.3