From patchwork Wed Oct 24 12:58:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 193808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3F52D2C0123 for ; Thu, 25 Oct 2012 01:38:49 +1100 (EST) Received: from localhost ([::1]:59770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR26Z-00047P-E3 for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 10:38:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0a9-0003bB-SP for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:01:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0a1-0003de-62 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:01:13 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:46646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0a1-0003DZ-07 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:01:05 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so330905pad.4 for ; Wed, 24 Oct 2012 06:01:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=rn/WdU0174APtlU6dk0cTqKYjnZD/CHiAFVgOhs2sLU=; b=iaZI+i/DTrDby7BAkmMrVKEGEaaYEDxtWjrL/bbb1lAf2WNpGVlLRStnoq5WS7snFx O74oQvxSXbHxoB9oQSGFUOmiV6m4KT7xRHD5iqf8aTroh4VZ2rgjh506viC1qbDPmdJM Vglc6GuZXJg+//DeZyKL/Url668VMJPFHCQr8Wc4OGZq4fa+c0EjroMFdPsTPJrIjONS 57WvGsG4tqOv12zFjZAa91wWJnSxEiOISG6EDIound6aRD6pUz65iCb3YOv2M8yt2yhb eif0EmjlYZ4Ons+VYefwQpTcWlZp1NsdbiN5cycAgwapLB3c9NLMN1ANdY34od/+3Wsm 5a4A== Received: by 10.68.224.69 with SMTP id ra5mr49434057pbc.114.1351083664385; Wed, 24 Oct 2012 06:01:04 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm9466138pav.26.2012.10.24.06.01.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 06:01:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2012 14:58:55 +0200 Message-Id: <1351083542-15272-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- arch_init.c | 4 ++-- block-migration.c | 4 ++-- block/qcow.c | 2 +- block/qed.c | 2 +- block/vdi.c | 2 +- block/vmdk.c | 2 +- block/vpc.c | 2 +- block/vvfat.c | 2 +- buffered_file.h | 2 +- hw/9pfs/virtio-9p.c | 2 +- hw/hid.h | 2 +- hw/hw.h | 4 ++-- hw/ivshmem.c | 2 +- hw/ptimer.h | 2 +- hw/shpc.h | 2 +- block-migration.h => include/migration/block.h | 0 qemu-file.h => include/migration/file.h | 0 migration.h => include/migration/migration.h | 2 +- include/{qemu => migration}/page_cache.h | 0 vmstate.h => include/migration/vmstate.h | 0 include/net/net.h | 2 +- migration-exec.c | 2 +- migration-fd.c | 2 +- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 4 ++-- monitor.c | 2 +- page_cache.c | 2 +- qemu-tool.c | 2 +- savevm.c | 2 +- ui/spice-core.c | 2 +- vl.c | 4 ++-- 32 files changed, 33 insertions(+), 33 deletions(-) rename block-migration.h => include/migration/block.h (100%) rename qemu-file.h => include/migration/file.h (100%) rename migration.h => include/migration/migration.h (99%) rename include/{qemu => migration}/page_cache.h (100%) rename vmstate.h => include/migration/vmstate.h (100%) diff --git a/arch_init.c b/arch_init.c index 4d3271b..d9aa752 100644 --- a/arch_init.c +++ b/arch_init.c @@ -39,12 +39,12 @@ #include "hw/pci.h" #include "hw/audiodev.h" #include "kvm.h" -#include "migration.h" +#include "migration/migration.h" #include "exec/gdbstub.h" #include "hw/smbios.h" #include "exec/exec-memory.h" #include "hw/pcspk.h" -#include "qemu/page_cache.h" +#include "migration/page_cache.h" #include "qemu-config.h" #include "qmp-commands.h" #include "trace.h" diff --git a/block-migration.c b/block-migration.c index c15de9f..2d2dcbd 100644 --- a/block-migration.c +++ b/block-migration.c @@ -18,8 +18,8 @@ #include "hw/hw.h" #include "qemu-queue.h" #include "qemu-timer.h" -#include "block-migration.h" -#include "migration.h" +#include "migration/block.h" +#include "migration/migration.h" #include "blockdev.h" #include diff --git a/block/qcow.c b/block/qcow.c index d13bd40..f366711 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -26,7 +26,7 @@ #include "module.h" #include #include "block/aes.h" -#include "migration.h" +#include "migration/migration.h" /**************************************************************/ /* QEMU COW block driver with compression and encryption support */ diff --git a/block/qed.c b/block/qed.c index 9f7a3f2..80c0748 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,7 +16,7 @@ #include "trace.h" #include "qed.h" #include "qobject/qerror.h" -#include "migration.h" +#include "migration/migration.h" static void qed_aio_cancel(BlockDriverAIOCB *blockacb) { diff --git a/block/vdi.c b/block/vdi.c index 73e3253..afedb5d 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -52,7 +52,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "module.h" -#include "migration.h" +#include "migration/migration.h" #if defined(CONFIG_UUID) #include diff --git a/block/vmdk.c b/block/vmdk.c index c7fc07a..800f554 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -26,7 +26,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "module.h" -#include "migration.h" +#include "migration/migration.h" #include #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D') diff --git a/block/vpc.c b/block/vpc.c index caa50db..499b237 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -25,7 +25,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "module.h" -#include "migration.h" +#include "migration/migration.h" /**************************************************************/ diff --git a/block/vvfat.c b/block/vvfat.c index fbabafc..a63c3ea 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -27,7 +27,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "module.h" -#include "migration.h" +#include "migration/migration.h" #ifndef S_IWGRP #define S_IWGRP 0 diff --git a/buffered_file.h b/buffered_file.h index ef010fe..86a7075 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -15,7 +15,7 @@ #define QEMU_BUFFERED_FILE_H #include "hw/hw.h" -#include "migration.h" +#include "migration/migration.h" QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 8b9cdc9..ede20ce 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -20,7 +20,7 @@ #include "virtio-9p-xattr.h" #include "virtio-9p-coth.h" #include "trace.h" -#include "migration.h" +#include "migration/migration.h" int open_fd_hw; int total_open_fd; diff --git a/hw/hid.h b/hw/hid.h index 5315cf7..100b121 100644 --- a/hw/hid.h +++ b/hw/hid.h @@ -1,7 +1,7 @@ #ifndef QEMU_HID_H #define QEMU_HID_H -#include "vmstate.h" +#include "migration/vmstate.h" #define HID_MOUSE 1 #define HID_TABLET 2 diff --git a/hw/hw.h b/hw/hw.h index cf93e93..1163673 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -10,8 +10,8 @@ #include "ioport.h" #include "irq.h" -#include "qemu-file.h" -#include "vmstate.h" +#include "migration/file.h" +#include "migration/vmstate.h" #include "qemu-log.h" #ifdef NEED_CPU_H diff --git a/hw/ivshmem.c b/hw/ivshmem.c index b4fdf49..16fec0c 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -21,7 +21,7 @@ #include "pci.h" #include "msix.h" #include "kvm.h" -#include "migration.h" +#include "migration/migration.h" #include "qobject/qerror.h" #include "event_notifier.h" #include "qemu-char.h" diff --git a/hw/ptimer.h b/hw/ptimer.h index 6638f61..9d172f7 100644 --- a/hw/ptimer.h +++ b/hw/ptimer.h @@ -10,7 +10,7 @@ #include "qemu-common.h" #include "qemu-timer.h" -#include "vmstate.h" +#include "migration/vmstate.h" /* ptimer.c */ typedef struct ptimer_state ptimer_state; diff --git a/hw/shpc.h b/hw/shpc.h index 130b71d..946c779 100644 --- a/hw/shpc.h +++ b/hw/shpc.h @@ -3,7 +3,7 @@ #include "qemu-common.h" #include "memory.h" -#include "vmstate.h" +#include "migration/vmstate.h" struct SHPCDevice { /* Capability offset in device's config space */ diff --git a/block-migration.h b/include/migration/block.h similarity index 100% rename from block-migration.h rename to include/migration/block.h diff --git a/qemu-file.h b/include/migration/file.h similarity index 100% rename from qemu-file.h rename to include/migration/file.h diff --git a/migration.h b/include/migration/migration.h similarity index 99% rename from migration.h rename to include/migration/migration.h index 1d18c21..900b09d 100644 --- a/migration.h +++ b/include/migration/migration.h @@ -18,7 +18,7 @@ #include "qemu-common.h" #include "notify.h" #include "qapi/error.h" -#include "vmstate.h" +#include "migration/vmstate.h" #include "qapi-types.h" struct MigrationParams { diff --git a/include/qemu/page_cache.h b/include/migration/page_cache.h similarity index 100% rename from include/qemu/page_cache.h rename to include/migration/page_cache.h diff --git a/vmstate.h b/include/migration/vmstate.h similarity index 100% rename from vmstate.h rename to include/migration/vmstate.h diff --git a/include/net/net.h b/include/net/net.h index 1a0e952..dd2f344 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -6,7 +6,7 @@ #include "qobject/qdict.h" #include "qemu-option.h" #include "net/queue.h" -#include "vmstate.h" +#include "migration/vmstate.h" #include "qapi-types.h" struct MACAddr { diff --git a/migration-exec.c b/migration-exec.c index b3d9964..8cbde63 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -17,7 +17,7 @@ #include "qemu-common.h" #include "qemu_socket.h" -#include "migration.h" +#include "migration/migration.h" #include "buffered_file.h" #include "block/block.h" #include diff --git a/migration-fd.c b/migration-fd.c index 7d293e8..6b501b4 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -15,7 +15,7 @@ #include "qemu-common.h" #include "qemu_socket.h" -#include "migration.h" +#include "migration/migration.h" #include "monitor/monitor.h" #include "buffered_file.h" #include "block/block.h" diff --git a/migration-tcp.c b/migration-tcp.c index 7b764de..1bc0aab 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -15,7 +15,7 @@ #include "qemu-common.h" #include "qemu_socket.h" -#include "migration.h" +#include "migration/migration.h" #include "buffered_file.h" #include "block/block.h" diff --git a/migration-unix.c b/migration-unix.c index 8a2c804..eadc1dc 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -15,7 +15,7 @@ #include "qemu-common.h" #include "qemu_socket.h" -#include "migration.h" +#include "migration/migration.h" #include "buffered_file.h" #include "block/block.h" diff --git a/migration.c b/migration.c index fb968ae..cfcf547 100644 --- a/migration.c +++ b/migration.c @@ -14,13 +14,13 @@ */ #include "qemu-common.h" -#include "migration.h" +#include "migration/migration.h" #include "monitor/monitor.h" #include "buffered_file.h" #include "sysemu.h" #include "block/block.h" #include "qemu_socket.h" -#include "block-migration.h" +#include "migration/block.h" #include "qmp-commands.h" //#define DEBUG_MIGRATION diff --git a/monitor.c b/monitor.c index d2cfa99..68d0a7c 100644 --- a/monitor.c +++ b/monitor.c @@ -44,7 +44,7 @@ #include "disas/disas.h" #include "balloon.h" #include "qemu-timer.h" -#include "migration.h" +#include "migration/migration.h" #include "kvm.h" #include "acl.h" #include "qobject/qint.h" diff --git a/page_cache.c b/page_cache.c index 0294f7e..ba5640b 100644 --- a/page_cache.c +++ b/page_cache.c @@ -24,7 +24,7 @@ #include #include "qemu-common.h" -#include "qemu/page_cache.h" +#include "migration/page_cache.h" #ifdef DEBUG_CACHE #define DPRINTF(fmt, ...) \ diff --git a/qemu-tool.c b/qemu-tool.c index 7870d9f..c9840c6 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -17,7 +17,7 @@ #include "monitor/monitor.h" #include "qemu-timer.h" #include "qemu-log.h" -#include "migration.h" +#include "migration/migration.h" #include "main-loop.h" #include "sysemu.h" #include "qemu_socket.h" diff --git a/savevm.c b/savevm.c index 01bdd8e..27ad7a5 100644 --- a/savevm.c +++ b/savevm.c @@ -77,7 +77,7 @@ #include "sysemu.h" #include "qemu-timer.h" #include "audio/audio.h" -#include "migration.h" +#include "migration/migration.h" #include "qemu_socket.h" #include "qemu-queue.h" #include "qemu-timer.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index c5c58ef..dd3057b 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -34,7 +34,7 @@ #include "qobject/qstring.h" #include "qobject/qjson.h" #include "notify.h" -#include "migration.h" +#include "migration/migration.h" #include "monitor/monitor.h" #include "hw/hw.h" #include "ui/spice-display.h" diff --git a/vl.c b/vl.c index c3dcaff..ba2f312 100644 --- a/vl.c +++ b/vl.c @@ -138,10 +138,10 @@ int main(int argc, char **argv) #include "cache-utils.h" #include "blockdev.h" #include "hw/block-common.h" -#include "block-migration.h" +#include "migration/block.h" #include "dma.h" #include "audio/audio.h" -#include "migration.h" +#include "migration/migration.h" #include "kvm.h" #include "qobject/qjson.h" #include "qemu-option.h"