From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Hongyang Subject: [PATCH v4 --for 4.6 COLOPre 25/25] tools/libxl: seperate device init/cleanup from checkpoint device layer Date: Wed, 15 Jul 2015 15:45:51 +0800 Message-ID: <1436946351-21118-26-git-send-email-yanghy@cn.fujitsu.com> References: <1436946351-21118-1-git-send-email-yanghy@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436946351-21118-1-git-send-email-yanghy@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, wency@cn.fujitsu.com, andrew.cooper3@citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, guijianfeng@cn.fujitsu.com, rshriram@cs.ubc.ca, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org we call (init|cleanup)_subkind_nic and (init|cleanup)_subkind_drbd_disk directly in checkpoint device. Move them to libxl_remus.c, Call them before calling libxl__checkpoint_devices_setup() or after calling libxl__checkpoint_devices_teardown(). it is pure refactoring and no functional changes. Signed-off-by: Wen Congyang Signed-off-by: Yang Hongyang --- tools/libxl/libxl_checkpoint_device.c | 42 ++--------------------------------- tools/libxl/libxl_remus.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl_checkpoint_device.c b/tools/libxl/libxl_checkpoint_device.c index bbc6dc4..0a16dbb 100644 --- a/tools/libxl/libxl_checkpoint_device.c +++ b/tools/libxl/libxl_checkpoint_device.c @@ -17,38 +17,6 @@ #include "libxl_internal.h" -/*----- helper functions -----*/ - -static int init_device_subkind(libxl__checkpoint_devices_state *cds) -{ - /* init device subkind-specific state in the libxl ctx */ - int rc; - STATE_AO_GC(cds->ao); - - if (libxl__netbuffer_enabled(gc)) { - rc = init_subkind_nic(cds); - if (rc) goto out; - } - - rc = init_subkind_drbd_disk(cds); - if (rc) goto out; - - rc = 0; -out: - return rc; -} - -static void cleanup_device_subkind(libxl__checkpoint_devices_state *cds) -{ - /* cleanup device subkind-specific state in the libxl ctx */ - STATE_AO_GC(cds->ao); - - if (libxl__netbuffer_enabled(gc)) - cleanup_subkind_nic(cds); - - cleanup_subkind_drbd_disk(cds); -} - /*----- setup() and teardown() -----*/ /* callbacks */ @@ -86,14 +54,10 @@ static void checkpoint_devices_setup(libxl__egc *egc, void libxl__checkpoint_devices_setup(libxl__egc *egc, libxl__checkpoint_devices_state *cds) { - int i, rc; + int i; STATE_AO_GC(cds->ao); - rc = init_device_subkind(cds); - if (rc) - goto out; - cds->num_devices = 0; cds->num_nics = 0; cds->num_disks = 0; @@ -126,7 +90,7 @@ void libxl__checkpoint_devices_setup(libxl__egc *egc, return; out: - cds->callback(egc, cds, rc); + cds->callback(egc, cds, 0); } static void checkpoint_devices_setup(libxl__egc *egc, @@ -263,8 +227,6 @@ static void devices_teardown_cb(libxl__egc *egc, cds->disks = NULL; cds->num_disks = 0; - cleanup_device_subkind(cds); - cds->callback(egc, cds, rc); } diff --git a/tools/libxl/libxl_remus.c b/tools/libxl/libxl_remus.c index 91abf8e..46dcc3c 100644 --- a/tools/libxl/libxl_remus.c +++ b/tools/libxl/libxl_remus.c @@ -26,6 +26,38 @@ static const libxl__checkpoint_device_instance_ops *remus_ops[] = { NULL, }; +/*----- helper functions -----*/ + +static int init_device_subkind(libxl__checkpoint_devices_state *cds) +{ + /* init device subkind-specific state in the libxl ctx */ + int rc; + STATE_AO_GC(cds->ao); + + if (libxl__netbuffer_enabled(gc)) { + rc = init_subkind_nic(cds); + if (rc) goto out; + } + + rc = init_subkind_drbd_disk(cds); + if (rc) goto out; + + rc = 0; +out: + return rc; +} + +static void cleanup_device_subkind(libxl__checkpoint_devices_state *cds) +{ + /* cleanup device subkind-specific state in the libxl ctx */ + STATE_AO_GC(cds->ao); + + if (libxl__netbuffer_enabled(gc)) + cleanup_subkind_nic(cds); + + cleanup_subkind_drbd_disk(cds); +} + /*-------------------- Remus setup and teardown ---------------------*/ static void remus_setup_done(libxl__egc *egc, @@ -60,6 +92,12 @@ void libxl__remus_setup(libxl__egc *egc, libxl__remus_state *rs) cds->ops = remus_ops; rs->interval = info->interval; + if (init_device_subkind(cds)) { + LOG(ERROR, "Remus: failed to init device subkind for guest %u", + dss->domid); + goto out; + } + libxl__checkpoint_devices_setup(egc, cds); return; @@ -94,6 +132,8 @@ static void remus_setup_failed(libxl__egc *egc, LOG(ERROR, "Remus: failed to teardown device after setup failed" " for guest with domid %u, rc %d", dss->domid, rc); + cleanup_device_subkind(cds); + dss->callback(egc, dss, rc); } @@ -123,6 +163,8 @@ static void remus_teardown_done(libxl__egc *egc, LOG(ERROR, "Remus: failed to teardown device for guest with domid %u," " rc %d", dss->domid, rc); + cleanup_device_subkind(cds); + dss->callback(egc, dss, rc); } -- 1.9.1