[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 0/9] Migration mini-cleanup
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v5 0/9] Migration mini-cleanup |
Date: |
Thu, 18 May 2017 18:16:46 +0200 |
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 <address@hidden>
+ * Daniel P. Berrange <address@hidden>
*
* 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 <address@hidden>
+ * Daniel P. Berrange <address@hidden>
*
* 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.
*/
#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 <address@hidden>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * 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 OTHER
+ * 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.
*/
#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 interpreter)
- untangle qemu-file.h, vmstate.h and migration.h. Now none include the other
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 => 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 => migration}/qjson.h (100%)
create mode 100644 migration/vmstate-types.c
create mode 100644 migration/xbzrle.h
--
2.9.3
- [Qemu-devel] [PATCH v5 0/9] Migration mini-cleanup,
Juan Quintela <=
- [Qemu-devel] [PATCH 1/9] migration: Create migration/xbzrle.h, Juan Quintela, 2017/05/18
- [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations, Juan Quintela, 2017/05/18
- [Qemu-devel] [PATCH 3/9] migration: Export qemu-file-channel.c functions in its own file, Juan Quintela, 2017/05/18
- [Qemu-devel] [PATCH 5/9] migration: Move qjson.h to migration/, Juan Quintela, 2017/05/18
- [Qemu-devel] [PATCH 4/9] migration: Remove migration.h from colo.h, Juan Quintela, 2017/05/18