From patchwork Tue Apr 25 22:04:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 755090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wCHxg5JVKz9s7M for ; Wed, 26 Apr 2017 08:31:35 +1000 (AEST) Received: from localhost ([::1]:51656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d38zc-0004F4-Vg for incoming@patchwork.ozlabs.org; Tue, 25 Apr 2017 18:31:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d38b6-0007mN-58 for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d38b3-0006AY-QJ for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:06:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d38b3-00069c-Gb for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:06:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 887C623E6D4 for ; Tue, 25 Apr 2017 22:06:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 887C623E6D4 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 887C623E6D4 Received: from secure.mitica (unknown [10.36.118.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id D29431714E; Tue, 25 Apr 2017 22:06:05 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 00:04:46 +0200 Message-Id: <20170425220451.6028-37-quintela@redhat.com> In-Reply-To: <20170425220451.6028-1-quintela@redhat.com> References: <20170425220451.6028-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 25 Apr 2017 22:06:08 +0000 (UTC) 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 36/41] migration: Move more exported functions to migration/misc.h 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela --- hw/i386/pc_piix.c | 2 +- hw/ppc/spapr.c | 2 +- include/migration/migration.h | 6 ------ include/migration/misc.h | 6 ++++++ migration/migration.c | 1 + qdev-monitor.c | 2 +- vl.c | 1 - xen-common.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6c72bd3..d68859e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -53,7 +53,7 @@ #include "hw/xen/xen_pt.h" #endif #include "migration/global_state.h" -#include "migration/migration.h" +#include "migration/misc.h" #include "kvm_i386.h" #define MAX_IDE_BUS 2 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f779c35..74cea96 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -38,7 +38,7 @@ #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "kvm_ppc.h" -#include "migration/migration.h" +#include "migration/misc.h" #include "migration/global_state.h" #include "migration/register.h" #include "mmu-hash64.h" diff --git a/include/migration/migration.h b/include/migration/migration.h index fc31f8e..1e18b24 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -127,8 +127,6 @@ void migrate_set_state(int *state, int old_state, int new_state); void migration_fd_process_incoming(QEMUFile *f); -void qemu_start_incoming_migration(const char *uri, Error **errp); - uint64_t migrate_max_downtime(void); void migrate_fd_error(MigrationState *s, const Error *error); @@ -140,7 +138,6 @@ void remove_migration_state_change_notifier(Notifier *notify); MigrationState *migrate_init(void); bool migration_is_blocked(Error **errp); bool migration_in_setup(MigrationState *); -bool migration_is_idle(void); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); /* True if outgoing migration has entered postcopy phase */ @@ -176,7 +173,4 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname, ram_addr_t start, size_t len); -void savevm_skip_section_footers(void); -void savevm_skip_configuration(void); - #endif diff --git a/include/migration/misc.h b/include/migration/misc.h index 21a9182..6709b15 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -35,5 +35,11 @@ int64_t self_announce_delay(int round) /* migration/savevm.c */ void dump_vmstate_json_to_file(FILE *out_fp); +void savevm_skip_section_footers(void); +void savevm_skip_configuration(void); + +/* migration/migration.c */ +void qemu_start_incoming_migration(const char *uri, Error **errp); +bool migration_is_idle(void); #endif diff --git a/migration/migration.c b/migration/migration.c index 4cda97c..287b762 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -24,6 +24,7 @@ #include "ram.h" #include "rdma.h" #include "migration/global_state.h" +#include "migration/misc.h" #include "migration/migration.h" #include "savevm.h" #include "qemu-file-channel.h" diff --git a/qdev-monitor.c b/qdev-monitor.c index e61d596..5ab468f 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/help_option.h" #include "sysemu/block-backend.h" -#include "migration/migration.h" +#include "migration/misc.h" /* * Aliases were a bad idea from the start. Let's keep them diff --git a/vl.c b/vl.c index c0796e4..d506c7e 100644 --- a/vl.c +++ b/vl.c @@ -92,7 +92,6 @@ int main(int argc, char **argv) #include "sysemu/tpm.h" #include "sysemu/dma.h" #include "audio/audio.h" -#include "migration/migration.h" #include "sysemu/cpus.h" #include "migration/colo.h" #include "sysemu/kvm.h" diff --git a/xen-common.c b/xen-common.c index 172131a..2daf2aa 100644 --- a/xen-common.c +++ b/xen-common.c @@ -13,7 +13,7 @@ #include "qmp-commands.h" #include "sysemu/char.h" #include "sysemu/accel.h" -#include "migration/migration.h" +#include "migration/misc.h" #include "migration/global_state.h" //#define DEBUG_XEN