From patchwork Thu Sep 3 15:39:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 514189 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 C22E71402A9 for ; Fri, 4 Sep 2015 02:05:11 +1000 (AEST) Received: from localhost ([::1]:49699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXX0f-0007eO-JF for incoming@patchwork.ozlabs.org; Thu, 03 Sep 2015 12:05:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXWdZ-0005oL-G2 for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXWdY-0008KN-5F for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXWdX-0008K1-VD for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:16 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id A81C2C0AAB16 for ; Thu, 3 Sep 2015 15:41:15 +0000 (UTC) Received: from localhost.localdomain.com (vpn1-7-209.ams2.redhat.com [10.36.7.209]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t83FdjWA029453; Thu, 3 Sep 2015 11:41:13 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 3 Sep 2015 16:39:24 +0100 Message-Id: <1441294768-8712-43-git-send-email-berrange@redhat.com> In-Reply-To: <1441294768-8712-1-git-send-email-berrange@redhat.com> References: <1441294768-8712-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Juan Quintela , "Dr. David Alan Gilbert" , Gerd Hoffmann , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH FYI 42/46] migration: convert savevm to use QIOChannel for writing to files 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 Convert the exec savevm code to use QIOChannel and QEMUFileChannel, instead of the stdio APIs. Signed-off-by: Daniel P. Berrange --- migration/savevm.c | 8 +++++--- tests/Makefile | 4 ++-- tests/test-vmstate.c | 11 ++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6071215..82febef 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -48,6 +48,7 @@ #include "qemu/iov.h" #include "block/snapshot.h" #include "block/qapi.h" +#include "io/channel-file.h" #ifndef ETH_P_RARP @@ -1389,6 +1390,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) void qmp_xen_save_devices_state(const char *filename, Error **errp) { QEMUFile *f; + QIOChannelFile *ioc; int saved_vm_running; int ret; @@ -1396,11 +1398,11 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp) vm_stop(RUN_STATE_SAVE_VM); global_state_store_running(); - f = qemu_fopen(filename, "wb"); - if (!f) { - error_setg_file_open(errp, errno, filename); + ioc = qio_channel_file_new_path(filename, O_WRONLY | O_CREAT, 0660, errp); + if (!ioc) { goto the_end; } + f = qemu_fopen_channel_output(QIO_CHANNEL(ioc)); ret = qemu_save_device_state(f); qemu_fclose(f); if (ret < 0) { diff --git a/tests/Makefile b/tests/Makefile index 3d1e83c..32b9eac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -321,8 +321,8 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ $(test-qapi-obj-y) tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ migration/vmstate.o migration/qemu-file.o \ - migration/qemu-file-unix.o qjson.o \ - $(test-qom-obj-y) + migration/qemu-file-channel.o qjson.o \ + $(test-io-obj-y) tests/test-qapi-types.c tests/test-qapi-types.h :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 0f943d5..6bbda8a 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -28,6 +28,7 @@ #include "migration/migration.h" #include "migration/vmstate.h" #include "qemu/coroutine.h" +#include "io/channel-file.h" static char temp_file[] = "/tmp/vmst.test.XXXXXX"; static int temp_fd; @@ -48,11 +49,17 @@ void yield_until_fd_readable(int fd) static QEMUFile *open_test_file(bool write) { int fd = dup(temp_fd); + QIOChannel *ioc; lseek(fd, 0, SEEK_SET); if (write) { g_assert_cmpint(ftruncate(fd, 0), ==, 0); } - return qemu_fdopen(fd, write ? "wb" : "rb"); + ioc = QIO_CHANNEL(qio_channel_file_new_fd(fd)); + if (write) { + return qemu_fopen_channel_output(ioc); + } else { + return qemu_fopen_channel_input(ioc); + } } #define SUCCESS(val) \ @@ -468,6 +475,8 @@ int main(int argc, char **argv) { temp_fd = mkstemp(temp_file); + module_call_init(MODULE_INIT_QOM); + g_test_init(&argc, &argv, NULL); g_test_add_func("/vmstate/simple/primitive", test_simple_primitive); g_test_add_func("/vmstate/versioned/load/v1", test_load_v1);