X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-actions.c;h=68f122aa2580b311e79993d3ffa4b55224712253;hp=d76010dfc2abf62584b6532357eb54c5765ced83;hb=aed0fa2c015e56a882fd6d4b759c82df08fc40d7;hpb=749708a7ec8930c34605ec58c18fefe0ed8e7981 diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c index d76010d..68f122a 100644 --- a/src/guestfs-actions.c +++ b/src/guestfs-actions.c @@ -126,6 +126,7 @@ int guestfs_mount (guestfs_h *g, int serial; if (check_state (g, "guestfs_mount") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -133,8 +134,10 @@ int guestfs_mount (guestfs_h *g, args.mountpoint = (char *) mountpoint; serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT, (xdrproc_t) xdr_guestfs_mount_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -143,17 +146,22 @@ int guestfs_mount (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_mount"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -197,12 +205,15 @@ int guestfs_sync (guestfs_h *g) int serial; if (check_state (g, "guestfs_sync") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_SYNC, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -211,17 +222,22 @@ int guestfs_sync (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_sync"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SYNC, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SYNC, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -267,14 +283,17 @@ int guestfs_touch (guestfs_h *g, int serial; if (check_state (g, "guestfs_touch") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_TOUCH, (xdrproc_t) xdr_guestfs_touch_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -283,17 +302,22 @@ int guestfs_touch (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_touch"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TOUCH, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TOUCH, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -344,14 +368,17 @@ char *guestfs_cat (guestfs_h *g, int serial; if (check_state (g, "guestfs_cat") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_CAT, (xdrproc_t) xdr_guestfs_cat_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -360,17 +387,22 @@ char *guestfs_cat (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_cat"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CAT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CAT, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); return ctx.ret.content; /* caller will free */ } @@ -421,14 +453,17 @@ char *guestfs_ll (guestfs_h *g, int serial; if (check_state (g, "guestfs_ll") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.directory = (char *) directory; serial = guestfs__send_sync (g, GUESTFS_PROC_LL, (xdrproc_t) xdr_guestfs_ll_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -437,17 +472,22 @@ char *guestfs_ll (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_ll"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LL, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); return ctx.ret.listing; /* caller will free */ } @@ -498,14 +538,17 @@ char **guestfs_ls (guestfs_h *g, int serial; if (check_state (g, "guestfs_ls") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.directory = (char *) directory; serial = guestfs__send_sync (g, GUESTFS_PROC_LS, (xdrproc_t) xdr_guestfs_ls_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -514,17 +557,22 @@ char **guestfs_ls (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_ls"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.listing.listing_val = safe_realloc (g, ctx.ret.listing.listing_val, @@ -578,12 +626,15 @@ char **guestfs_list_devices (guestfs_h *g) int serial; if (check_state (g, "guestfs_list_devices") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -592,17 +643,22 @@ char **guestfs_list_devices (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_list_devices"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.devices.devices_val = safe_realloc (g, ctx.ret.devices.devices_val, @@ -656,12 +712,15 @@ char **guestfs_list_partitions (guestfs_h *g) int serial; if (check_state (g, "guestfs_list_partitions") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -670,17 +729,22 @@ char **guestfs_list_partitions (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_list_partitions"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.partitions.partitions_val = safe_realloc (g, ctx.ret.partitions.partitions_val, @@ -734,12 +798,15 @@ char **guestfs_pvs (guestfs_h *g) int serial; if (check_state (g, "guestfs_pvs") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_PVS, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -748,17 +815,22 @@ char **guestfs_pvs (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_pvs"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.physvols.physvols_val = safe_realloc (g, ctx.ret.physvols.physvols_val, @@ -812,12 +884,15 @@ char **guestfs_vgs (guestfs_h *g) int serial; if (check_state (g, "guestfs_vgs") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_VGS, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -826,17 +901,22 @@ char **guestfs_vgs (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_vgs"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.volgroups.volgroups_val = safe_realloc (g, ctx.ret.volgroups.volgroups_val, @@ -890,12 +970,15 @@ char **guestfs_lvs (guestfs_h *g) int serial; if (check_state (g, "guestfs_lvs") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_LVS, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -904,17 +987,22 @@ char **guestfs_lvs (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_lvs"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.logvols.logvols_val = safe_realloc (g, ctx.ret.logvols.logvols_val, @@ -968,12 +1056,15 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g) int serial; if (check_state (g, "guestfs_pvs_full") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_PVS_FULL, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -982,17 +1073,22 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_pvs_full"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.physvols, sizeof (ctx.ret.physvols)); } @@ -1042,12 +1138,15 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g) int serial; if (check_state (g, "guestfs_vgs_full") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_VGS_FULL, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1056,17 +1155,22 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_vgs_full"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.volgroups, sizeof (ctx.ret.volgroups)); } @@ -1116,12 +1220,15 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g) int serial; if (check_state (g, "guestfs_lvs_full") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_LVS_FULL, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1130,17 +1237,22 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_lvs_full"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.logvols, sizeof (ctx.ret.logvols)); } @@ -1192,14 +1304,17 @@ char **guestfs_read_lines (guestfs_h *g, int serial; if (check_state (g, "guestfs_read_lines") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_READ_LINES, (xdrproc_t) xdr_guestfs_read_lines_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1208,17 +1323,22 @@ char **guestfs_read_lines (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_read_lines"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_READ_LINES, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_READ_LINES, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.lines.lines_val = safe_realloc (g, ctx.ret.lines.lines_val, @@ -1270,6 +1390,7 @@ int guestfs_aug_init (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_init") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1277,8 +1398,10 @@ int guestfs_aug_init (guestfs_h *g, args.flags = flags; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INIT, (xdrproc_t) xdr_guestfs_aug_init_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1287,17 +1410,22 @@ int guestfs_aug_init (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_init"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INIT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INIT, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -1341,12 +1469,15 @@ int guestfs_aug_close (guestfs_h *g) int serial; if (check_state (g, "guestfs_aug_close") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1355,17 +1486,22 @@ int guestfs_aug_close (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_close"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_CLOSE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_CLOSE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -1417,6 +1553,7 @@ int guestfs_aug_defvar (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_defvar") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1424,8 +1561,10 @@ int guestfs_aug_defvar (guestfs_h *g, args.expr = expr ? (char **) &expr : NULL; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFVAR, (xdrproc_t) xdr_guestfs_aug_defvar_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1434,17 +1573,22 @@ int guestfs_aug_defvar (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defvar"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFVAR, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFVAR, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.nrnodes; } @@ -1497,6 +1641,7 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_defnode") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1505,8 +1650,10 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g, args.val = (char *) val; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFNODE, (xdrproc_t) xdr_guestfs_aug_defnode_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1515,17 +1662,22 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defnode"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFNODE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFNODE, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller with free this */ return safe_memdup (g, &ctx.ret, sizeof (ctx.ret)); } @@ -1577,14 +1729,17 @@ char *guestfs_aug_get (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_get") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_GET, (xdrproc_t) xdr_guestfs_aug_get_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1593,17 +1748,22 @@ char *guestfs_aug_get (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_get"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_GET, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_GET, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); return ctx.ret.val; /* caller will free */ } @@ -1650,6 +1810,7 @@ int guestfs_aug_set (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_set") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1657,8 +1818,10 @@ int guestfs_aug_set (guestfs_h *g, args.val = (char *) val; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SET, (xdrproc_t) xdr_guestfs_aug_set_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1667,17 +1830,22 @@ int guestfs_aug_set (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_set"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SET, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SET, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -1725,6 +1893,7 @@ int guestfs_aug_insert (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_insert") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1733,8 +1902,10 @@ int guestfs_aug_insert (guestfs_h *g, args.before = before; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INSERT, (xdrproc_t) xdr_guestfs_aug_insert_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1743,17 +1914,22 @@ int guestfs_aug_insert (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_insert"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INSERT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INSERT, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -1804,14 +1980,17 @@ int guestfs_aug_rm (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_rm") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_RM, (xdrproc_t) xdr_guestfs_aug_rm_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1820,17 +1999,22 @@ int guestfs_aug_rm (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_rm"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_RM, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_RM, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.nrnodes; } @@ -1877,6 +2061,7 @@ int guestfs_aug_mv (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_mv") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -1884,8 +2069,10 @@ int guestfs_aug_mv (guestfs_h *g, args.dest = (char *) dest; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MV, (xdrproc_t) xdr_guestfs_aug_mv_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1894,17 +2081,22 @@ int guestfs_aug_mv (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_mv"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MV, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MV, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -1955,14 +2147,17 @@ char **guestfs_aug_match (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_match") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MATCH, (xdrproc_t) xdr_guestfs_aug_match_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -1971,17 +2166,22 @@ char **guestfs_aug_match (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_match"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MATCH, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MATCH, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.matches.matches_val = safe_realloc (g, ctx.ret.matches.matches_val, @@ -2030,12 +2230,15 @@ int guestfs_aug_save (guestfs_h *g) int serial; if (check_state (g, "guestfs_aug_save") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2044,17 +2247,22 @@ int guestfs_aug_save (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_save"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SAVE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SAVE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2098,12 +2306,15 @@ int guestfs_aug_load (guestfs_h *g) int serial; if (check_state (g, "guestfs_aug_load") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2112,17 +2323,22 @@ int guestfs_aug_load (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_load"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LOAD, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LOAD, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2173,14 +2389,17 @@ char **guestfs_aug_ls (guestfs_h *g, int serial; if (check_state (g, "guestfs_aug_ls") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LS, (xdrproc_t) xdr_guestfs_aug_ls_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2189,17 +2408,22 @@ char **guestfs_aug_ls (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_aug_ls"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.matches.matches_val = safe_realloc (g, ctx.ret.matches.matches_val, @@ -2250,14 +2474,17 @@ int guestfs_rm (guestfs_h *g, int serial; if (check_state (g, "guestfs_rm") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_RM, (xdrproc_t) xdr_guestfs_rm_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2266,17 +2493,22 @@ int guestfs_rm (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_rm"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2322,14 +2554,17 @@ int guestfs_rmdir (guestfs_h *g, int serial; if (check_state (g, "guestfs_rmdir") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_RMDIR, (xdrproc_t) xdr_guestfs_rmdir_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2338,17 +2573,22 @@ int guestfs_rmdir (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_rmdir"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RMDIR, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RMDIR, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2394,14 +2634,17 @@ int guestfs_rm_rf (guestfs_h *g, int serial; if (check_state (g, "guestfs_rm_rf") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_RM_RF, (xdrproc_t) xdr_guestfs_rm_rf_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2410,17 +2653,22 @@ int guestfs_rm_rf (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_rm_rf"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM_RF, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM_RF, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2466,14 +2714,17 @@ int guestfs_mkdir (guestfs_h *g, int serial; if (check_state (g, "guestfs_mkdir") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR, (xdrproc_t) xdr_guestfs_mkdir_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2482,17 +2733,22 @@ int guestfs_mkdir (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2538,14 +2794,17 @@ int guestfs_mkdir_p (guestfs_h *g, int serial; if (check_state (g, "guestfs_mkdir_p") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR_P, (xdrproc_t) xdr_guestfs_mkdir_p_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2554,17 +2813,22 @@ int guestfs_mkdir_p (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir_p"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR_P, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR_P, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2611,6 +2875,7 @@ int guestfs_chmod (guestfs_h *g, int serial; if (check_state (g, "guestfs_chmod") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -2618,8 +2883,10 @@ int guestfs_chmod (guestfs_h *g, args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_CHMOD, (xdrproc_t) xdr_guestfs_chmod_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2628,17 +2895,22 @@ int guestfs_chmod (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_chmod"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHMOD, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHMOD, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2686,6 +2958,7 @@ int guestfs_chown (guestfs_h *g, int serial; if (check_state (g, "guestfs_chown") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -2694,8 +2967,10 @@ int guestfs_chown (guestfs_h *g, args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_CHOWN, (xdrproc_t) xdr_guestfs_chown_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2704,17 +2979,22 @@ int guestfs_chown (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_chown"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHOWN, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHOWN, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -2765,14 +3045,17 @@ int guestfs_exists (guestfs_h *g, int serial; if (check_state (g, "guestfs_exists") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_EXISTS, (xdrproc_t) xdr_guestfs_exists_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2781,17 +3064,22 @@ int guestfs_exists (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_exists"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EXISTS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EXISTS, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.existsflag; } @@ -2842,14 +3130,17 @@ int guestfs_is_file (guestfs_h *g, int serial; if (check_state (g, "guestfs_is_file") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_IS_FILE, (xdrproc_t) xdr_guestfs_is_file_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2858,17 +3149,22 @@ int guestfs_is_file (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_is_file"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_FILE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_FILE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.fileflag; } @@ -2919,14 +3215,17 @@ int guestfs_is_dir (guestfs_h *g, int serial; if (check_state (g, "guestfs_is_dir") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_IS_DIR, (xdrproc_t) xdr_guestfs_is_dir_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -2935,17 +3234,22 @@ int guestfs_is_dir (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_is_dir"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_DIR, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_DIR, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.dirflag; } @@ -2991,14 +3295,17 @@ int guestfs_pvcreate (guestfs_h *g, int serial; if (check_state (g, "guestfs_pvcreate") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_PVCREATE, (xdrproc_t) xdr_guestfs_pvcreate_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3007,17 +3314,22 @@ int guestfs_pvcreate (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_pvcreate"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVCREATE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVCREATE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3064,6 +3376,7 @@ int guestfs_vgcreate (guestfs_h *g, int serial; if (check_state (g, "guestfs_vgcreate") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3072,8 +3385,10 @@ int guestfs_vgcreate (guestfs_h *g, for (args.physvols.physvols_len = 0; physvols[args.physvols.physvols_len]; args.physvols.physvols_len++) ; serial = guestfs__send_sync (g, GUESTFS_PROC_VGCREATE, (xdrproc_t) xdr_guestfs_vgcreate_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3082,17 +3397,22 @@ int guestfs_vgcreate (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_vgcreate"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGCREATE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGCREATE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3140,6 +3460,7 @@ int guestfs_lvcreate (guestfs_h *g, int serial; if (check_state (g, "guestfs_lvcreate") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3148,8 +3469,10 @@ int guestfs_lvcreate (guestfs_h *g, args.mbytes = mbytes; serial = guestfs__send_sync (g, GUESTFS_PROC_LVCREATE, (xdrproc_t) xdr_guestfs_lvcreate_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3158,17 +3481,22 @@ int guestfs_lvcreate (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_lvcreate"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVCREATE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVCREATE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3215,6 +3543,7 @@ int guestfs_mkfs (guestfs_h *g, int serial; if (check_state (g, "guestfs_mkfs") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3222,8 +3551,10 @@ int guestfs_mkfs (guestfs_h *g, args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_MKFS, (xdrproc_t) xdr_guestfs_mkfs_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3232,17 +3563,22 @@ int guestfs_mkfs (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_mkfs"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFS, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3292,6 +3628,7 @@ int guestfs_sfdisk (guestfs_h *g, int serial; if (check_state (g, "guestfs_sfdisk") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3303,8 +3640,10 @@ int guestfs_sfdisk (guestfs_h *g, for (args.lines.lines_len = 0; lines[args.lines.lines_len]; args.lines.lines_len++) ; serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK, (xdrproc_t) xdr_guestfs_sfdisk_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3313,17 +3652,22 @@ int guestfs_sfdisk (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3371,6 +3715,7 @@ int guestfs_write_file (guestfs_h *g, int serial; if (check_state (g, "guestfs_write_file") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3379,8 +3724,10 @@ int guestfs_write_file (guestfs_h *g, args.size = size; serial = guestfs__send_sync (g, GUESTFS_PROC_WRITE_FILE, (xdrproc_t) xdr_guestfs_write_file_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3389,17 +3736,22 @@ int guestfs_write_file (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_write_file"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WRITE_FILE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WRITE_FILE, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3445,14 +3797,17 @@ int guestfs_umount (guestfs_h *g, int serial; if (check_state (g, "guestfs_umount") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.pathordevice = (char *) pathordevice; serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT, (xdrproc_t) xdr_guestfs_umount_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3461,17 +3816,22 @@ int guestfs_umount (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_umount"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3520,12 +3880,15 @@ char **guestfs_mounts (guestfs_h *g) int serial; if (check_state (g, "guestfs_mounts") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNTS, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3534,17 +3897,22 @@ char **guestfs_mounts (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_mounts"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNTS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNTS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.devices.devices_val = safe_realloc (g, ctx.ret.devices.devices_val, @@ -3593,12 +3961,15 @@ int guestfs_umount_all (guestfs_h *g) int serial; if (check_state (g, "guestfs_umount_all") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3607,17 +3978,22 @@ int guestfs_umount_all (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_umount_all"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT_ALL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT_ALL, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3661,12 +4037,15 @@ int guestfs_lvm_remove_all (guestfs_h *g) int serial; if (check_state (g, "guestfs_lvm_remove_all") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); serial = guestfs__send_sync (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3675,17 +4054,22 @@ int guestfs_lvm_remove_all (guestfs_h *g) guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_lvm_remove_all"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVM_REMOVE_ALL, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVM_REMOVE_ALL, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -3736,14 +4120,17 @@ char *guestfs_file (guestfs_h *g, int serial; if (check_state (g, "guestfs_file") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_FILE, (xdrproc_t) xdr_guestfs_file_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3752,17 +4139,22 @@ char *guestfs_file (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_file"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FILE, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FILE, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); return ctx.ret.description; /* caller will free */ } @@ -3813,6 +4205,7 @@ char *guestfs_command (guestfs_h *g, int serial; if (check_state (g, "guestfs_command") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3820,8 +4213,10 @@ char *guestfs_command (guestfs_h *g, for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ; serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND, (xdrproc_t) xdr_guestfs_command_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3830,17 +4225,22 @@ char *guestfs_command (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_command"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); return ctx.ret.output; /* caller will free */ } @@ -3891,6 +4291,7 @@ char **guestfs_command_lines (guestfs_h *g, int serial; if (check_state (g, "guestfs_command_lines") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -3898,8 +4299,10 @@ char **guestfs_command_lines (guestfs_h *g, for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ; serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND_LINES, (xdrproc_t) xdr_guestfs_command_lines_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3908,17 +4311,22 @@ char **guestfs_command_lines (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_command_lines"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND_LINES, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND_LINES, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.lines.lines_val = safe_realloc (g, ctx.ret.lines.lines_val, @@ -3974,14 +4382,17 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g, int serial; if (check_state (g, "guestfs_stat") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_STAT, (xdrproc_t) xdr_guestfs_stat_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -3990,17 +4401,22 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_stat"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STAT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STAT, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf)); } @@ -4052,14 +4468,17 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g, int serial; if (check_state (g, "guestfs_lstat") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_LSTAT, (xdrproc_t) xdr_guestfs_lstat_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4068,17 +4487,22 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_lstat"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LSTAT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LSTAT, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf)); } @@ -4130,14 +4554,17 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g, int serial; if (check_state (g, "guestfs_statvfs") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.path = (char *) path; serial = guestfs__send_sync (g, GUESTFS_PROC_STATVFS, (xdrproc_t) xdr_guestfs_statvfs_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4146,17 +4573,22 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_statvfs"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STATVFS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STATVFS, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this */ return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf)); } @@ -4208,14 +4640,17 @@ char **guestfs_tune2fs_l (guestfs_h *g, int serial; if (check_state (g, "guestfs_tune2fs_l") == -1) return NULL; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_TUNE2FS_L, (xdrproc_t) xdr_guestfs_tune2fs_l_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return NULL; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4224,17 +4659,22 @@ char **guestfs_tune2fs_l (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_tune2fs_l"); + guestfs_set_ready (g); return NULL; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TUNE2FS_L, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TUNE2FS_L, serial) == -1) { + guestfs_set_ready (g); return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return NULL; } + guestfs_set_ready (g); /* caller will free this, but we need to add a NULL entry */ ctx.ret.superblock.superblock_val = safe_realloc (g, ctx.ret.superblock.superblock_val, @@ -4285,14 +4725,17 @@ int guestfs_blockdev_setro (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_setro") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRO, (xdrproc_t) xdr_guestfs_blockdev_setro_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4301,17 +4744,22 @@ int guestfs_blockdev_setro (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setro"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRO, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRO, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -4357,14 +4805,17 @@ int guestfs_blockdev_setrw (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_setrw") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRW, (xdrproc_t) xdr_guestfs_blockdev_setrw_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4373,17 +4824,22 @@ int guestfs_blockdev_setrw (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setrw"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRW, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRW, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -4434,14 +4890,17 @@ int guestfs_blockdev_getro (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_getro") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETRO, (xdrproc_t) xdr_guestfs_blockdev_getro_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4450,17 +4909,22 @@ int guestfs_blockdev_getro (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getro"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETRO, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETRO, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.ro; } @@ -4511,14 +4975,17 @@ int guestfs_blockdev_getss (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_getss") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSS, (xdrproc_t) xdr_guestfs_blockdev_getss_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4527,17 +4994,22 @@ int guestfs_blockdev_getss (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getss"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSS, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.sectorsize; } @@ -4588,14 +5060,17 @@ int guestfs_blockdev_getbsz (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_getbsz") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETBSZ, (xdrproc_t) xdr_guestfs_blockdev_getbsz_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4604,17 +5079,22 @@ int guestfs_blockdev_getbsz (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getbsz"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETBSZ, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETBSZ, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.blocksize; } @@ -4661,6 +5141,7 @@ int guestfs_blockdev_setbsz (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_setbsz") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); @@ -4668,8 +5149,10 @@ int guestfs_blockdev_setbsz (guestfs_h *g, args.blocksize = blocksize; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETBSZ, (xdrproc_t) xdr_guestfs_blockdev_setbsz_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4678,17 +5161,22 @@ int guestfs_blockdev_setbsz (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setbsz"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETBSZ, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETBSZ, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -4739,14 +5227,17 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_getsz") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSZ, (xdrproc_t) xdr_guestfs_blockdev_getsz_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4755,17 +5246,22 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsz"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSZ, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSZ, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.sizeinsectors; } @@ -4816,14 +5312,17 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_getsize64") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64, (xdrproc_t) xdr_guestfs_blockdev_getsize64_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4832,17 +5331,22 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsize64"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSIZE64, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSIZE64, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return ctx.ret.sizeinbytes; } @@ -4888,14 +5392,17 @@ int guestfs_blockdev_flushbufs (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_flushbufs") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, (xdrproc_t) xdr_guestfs_blockdev_flushbufs_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4904,17 +5411,22 @@ int guestfs_blockdev_flushbufs (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_flushbufs"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -4960,14 +5472,17 @@ int guestfs_blockdev_rereadpt (guestfs_h *g, int serial; if (check_state (g, "guestfs_blockdev_rereadpt") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.device = (char *) device; serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_REREADPT, (xdrproc_t) xdr_guestfs_blockdev_rereadpt_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -4976,17 +5491,22 @@ int guestfs_blockdev_rereadpt (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_rereadpt"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_REREADPT, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_REREADPT, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -5033,18 +5553,31 @@ int guestfs_upload (guestfs_h *g, int serial; if (check_state (g, "guestfs_upload") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.remotefilename = (char *) remotefilename; serial = guestfs__send_sync (g, GUESTFS_PROC_UPLOAD, (xdrproc_t) xdr_guestfs_upload_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } - if (guestfs__send_file_sync (g, filename) == -1) - return -1; + { + int r; + r = guestfs__send_file_sync (g, filename); + if (r == -1) { + guestfs_set_ready (g); + return -1; + } + if (r == -2) /* daemon cancelled */ + goto read_reply; + } + + read_reply: guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; guestfs_set_reply_callback (g, upload_reply_cb, &ctx); @@ -5052,17 +5585,22 @@ int guestfs_upload (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_upload"); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UPLOAD, serial) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UPLOAD, serial) == -1) { + guestfs_set_ready (g); return -1; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } + guestfs_set_ready (g); return 0; } @@ -5109,14 +5647,17 @@ int guestfs_download (guestfs_h *g, int serial; if (check_state (g, "guestfs_download") == -1) return -1; + guestfs_set_busy (g); memset (&ctx, 0, sizeof ctx); args.remotefilename = (char *) remotefilename; serial = guestfs__send_sync (g, GUESTFS_PROC_DOWNLOAD, (xdrproc_t) xdr_guestfs_download_args, (char *) &args); - if (serial == -1) + if (serial == -1) { + guestfs_set_ready (g); return -1; + } guestfs__switch_to_receiving (g); ctx.cb_sequence = 0; @@ -5125,20 +5666,1054 @@ int guestfs_download (guestfs_h *g, guestfs_set_reply_callback (g, NULL, NULL); if (ctx.cb_sequence != 1001) { error (g, "%s reply failed, see earlier error messages", "guestfs_download"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DOWNLOAD, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); return -1; } - if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DOWNLOAD, serial) == -1) + if (guestfs__receive_file_sync (g, filename) == -1) { + guestfs_set_ready (g); return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct checksum_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; + struct guestfs_checksum_ret ret; +}; + +static void checksum_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct checksum_ctx *ctx = (struct checksum_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_checksum"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_checksum"); + return; + } + goto done; + } + if (!xdr_guestfs_checksum_ret (xdr, &ctx->ret)) { + error (g, "%s: failed to parse reply", "guestfs_checksum"); + return; + } + done: + ctx->cb_sequence = 1001; +} + +char *guestfs_checksum (guestfs_h *g, + const char *csumtype, + const char *path) +{ + struct guestfs_checksum_args args; + struct checksum_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_checksum") == -1) return NULL; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.csumtype = (char *) csumtype; + args.path = (char *) path; + serial = guestfs__send_sync (g, GUESTFS_PROC_CHECKSUM, + (xdrproc_t) xdr_guestfs_checksum_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return NULL; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, checksum_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_checksum"); + guestfs_set_ready (g); + return NULL; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHECKSUM, serial) == -1) { + guestfs_set_ready (g); + return NULL; + } if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return NULL; + } + + guestfs_set_ready (g); + return ctx.ret.checksum; /* caller will free */ +} + +struct tar_in_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void tar_in_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct tar_in_ctx *ctx = (struct tar_in_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_tar_in"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_tar_in"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_tar_in (guestfs_h *g, + const char *tarfile, + const char *directory) +{ + struct guestfs_tar_in_args args; + struct tar_in_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_tar_in") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.directory = (char *) directory; + serial = guestfs__send_sync (g, GUESTFS_PROC_TAR_IN, + (xdrproc_t) xdr_guestfs_tar_in_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + { + int r; + + r = guestfs__send_file_sync (g, tarfile); + if (r == -1) { + guestfs_set_ready (g); + return -1; + } + if (r == -2) /* daemon cancelled */ + goto read_reply; + } + + read_reply: + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, tar_in_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_tar_in"); + guestfs_set_ready (g); return -1; } - if (guestfs__receive_file_sync (g, filename) == -1) + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_IN, serial) == -1) { + guestfs_set_ready (g); return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct tar_out_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void tar_out_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct tar_out_ctx *ctx = (struct tar_out_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_tar_out"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_tar_out"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_tar_out (guestfs_h *g, + const char *directory, + const char *tarfile) +{ + struct guestfs_tar_out_args args; + struct tar_out_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_tar_out") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.directory = (char *) directory; + serial = guestfs__send_sync (g, GUESTFS_PROC_TAR_OUT, + (xdrproc_t) xdr_guestfs_tar_out_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, tar_out_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_tar_out"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_OUT, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + if (guestfs__receive_file_sync (g, tarfile) == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct tgz_in_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void tgz_in_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct tgz_in_ctx *ctx = (struct tgz_in_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_tgz_in"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_tgz_in"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_tgz_in (guestfs_h *g, + const char *tarball, + const char *directory) +{ + struct guestfs_tgz_in_args args; + struct tgz_in_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_tgz_in") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.directory = (char *) directory; + serial = guestfs__send_sync (g, GUESTFS_PROC_TGZ_IN, + (xdrproc_t) xdr_guestfs_tgz_in_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + { + int r; + + r = guestfs__send_file_sync (g, tarball); + if (r == -1) { + guestfs_set_ready (g); + return -1; + } + if (r == -2) /* daemon cancelled */ + goto read_reply; + } + + read_reply: + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, tgz_in_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_in"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_IN, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct tgz_out_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void tgz_out_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct tgz_out_ctx *ctx = (struct tgz_out_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_tgz_out"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_tgz_out"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_tgz_out (guestfs_h *g, + const char *directory, + const char *tarball) +{ + struct guestfs_tgz_out_args args; + struct tgz_out_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_tgz_out") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.directory = (char *) directory; + serial = guestfs__send_sync (g, GUESTFS_PROC_TGZ_OUT, + (xdrproc_t) xdr_guestfs_tgz_out_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, tgz_out_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_out"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_OUT, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + if (guestfs__receive_file_sync (g, tarball) == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct mount_ro_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void mount_ro_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct mount_ro_ctx *ctx = (struct mount_ro_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_mount_ro"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_mount_ro"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_mount_ro (guestfs_h *g, + const char *device, + const char *mountpoint) +{ + struct guestfs_mount_ro_args args; + struct mount_ro_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_mount_ro") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.device = (char *) device; + args.mountpoint = (char *) mountpoint; + serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_RO, + (xdrproc_t) xdr_guestfs_mount_ro_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, mount_ro_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_mount_ro"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_RO, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct mount_options_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void mount_options_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct mount_options_ctx *ctx = (struct mount_options_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_mount_options"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_mount_options"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_mount_options (guestfs_h *g, + const char *options, + const char *device, + const char *mountpoint) +{ + struct guestfs_mount_options_args args; + struct mount_options_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_mount_options") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.options = (char *) options; + args.device = (char *) device; + args.mountpoint = (char *) mountpoint; + serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_OPTIONS, + (xdrproc_t) xdr_guestfs_mount_options_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, mount_options_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_mount_options"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_OPTIONS, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct mount_vfs_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void mount_vfs_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct mount_vfs_ctx *ctx = (struct mount_vfs_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_mount_vfs"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_mount_vfs"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_mount_vfs (guestfs_h *g, + const char *options, + const char *vfstype, + const char *device, + const char *mountpoint) +{ + struct guestfs_mount_vfs_args args; + struct mount_vfs_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_mount_vfs") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.options = (char *) options; + args.vfstype = (char *) vfstype; + args.device = (char *) device; + args.mountpoint = (char *) mountpoint; + serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_VFS, + (xdrproc_t) xdr_guestfs_mount_vfs_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, mount_vfs_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_mount_vfs"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_VFS, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct debug_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; + struct guestfs_debug_ret ret; +}; + +static void debug_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct debug_ctx *ctx = (struct debug_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_debug"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_debug"); + return; + } + goto done; + } + if (!xdr_guestfs_debug_ret (xdr, &ctx->ret)) { + error (g, "%s: failed to parse reply", "guestfs_debug"); + return; + } + done: + ctx->cb_sequence = 1001; +} + +char *guestfs_debug (guestfs_h *g, + const char *subcmd, + char * const* const extraargs) +{ + struct guestfs_debug_args args; + struct debug_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_debug") == -1) return NULL; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.subcmd = (char *) subcmd; + args.extraargs.extraargs_val = (char **) extraargs; + for (args.extraargs.extraargs_len = 0; extraargs[args.extraargs.extraargs_len]; args.extraargs.extraargs_len++) ; + serial = guestfs__send_sync (g, GUESTFS_PROC_DEBUG, + (xdrproc_t) xdr_guestfs_debug_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return NULL; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, debug_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_debug"); + guestfs_set_ready (g); + return NULL; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DEBUG, serial) == -1) { + guestfs_set_ready (g); + return NULL; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return NULL; + } + + guestfs_set_ready (g); + return ctx.ret.result; /* caller will free */ +} + +struct lvremove_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void lvremove_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct lvremove_ctx *ctx = (struct lvremove_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_lvremove"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_lvremove"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_lvremove (guestfs_h *g, + const char *device) +{ + struct guestfs_lvremove_args args; + struct lvremove_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_lvremove") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.device = (char *) device; + serial = guestfs__send_sync (g, GUESTFS_PROC_LVREMOVE, + (xdrproc_t) xdr_guestfs_lvremove_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, lvremove_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_lvremove"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVREMOVE, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct vgremove_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void vgremove_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct vgremove_ctx *ctx = (struct vgremove_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_vgremove"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_vgremove"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_vgremove (guestfs_h *g, + const char *vgname) +{ + struct guestfs_vgremove_args args; + struct vgremove_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_vgremove") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.vgname = (char *) vgname; + serial = guestfs__send_sync (g, GUESTFS_PROC_VGREMOVE, + (xdrproc_t) xdr_guestfs_vgremove_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, vgremove_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_vgremove"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGREMOVE, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + + guestfs_set_ready (g); + return 0; +} + +struct pvremove_ctx { + /* This flag is set by the callbacks, so we know we've done + * the callbacks as expected, and in the right sequence. + * 0 = not called, 1 = send called, + * 1001 = reply called. + */ + int cb_sequence; + struct guestfs_message_header hdr; + struct guestfs_message_error err; +}; + +static void pvremove_reply_cb (guestfs_h *g, void *data, XDR *xdr) +{ + guestfs_main_loop *ml = guestfs_get_main_loop (g); + struct pvremove_ctx *ctx = (struct pvremove_ctx *) data; + + ml->main_loop_quit (ml, g); + + if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) { + error (g, "%s: failed to parse reply header", "guestfs_pvremove"); + return; + } + if (ctx->hdr.status == GUESTFS_STATUS_ERROR) { + if (!xdr_guestfs_message_error (xdr, &ctx->err)) { + error (g, "%s: failed to parse reply error", "guestfs_pvremove"); + return; + } + goto done; + } + done: + ctx->cb_sequence = 1001; +} + +int guestfs_pvremove (guestfs_h *g, + const char *device) +{ + struct guestfs_pvremove_args args; + struct pvremove_ctx ctx; + guestfs_main_loop *ml = guestfs_get_main_loop (g); + int serial; + + if (check_state (g, "guestfs_pvremove") == -1) return -1; + guestfs_set_busy (g); + + memset (&ctx, 0, sizeof ctx); + + args.device = (char *) device; + serial = guestfs__send_sync (g, GUESTFS_PROC_PVREMOVE, + (xdrproc_t) xdr_guestfs_pvremove_args, (char *) &args); + if (serial == -1) { + guestfs_set_ready (g); + return -1; + } + + guestfs__switch_to_receiving (g); + ctx.cb_sequence = 0; + guestfs_set_reply_callback (g, pvremove_reply_cb, &ctx); + (void) ml->main_loop_run (ml, g); + guestfs_set_reply_callback (g, NULL, NULL); + if (ctx.cb_sequence != 1001) { + error (g, "%s reply failed, see earlier error messages", "guestfs_pvremove"); + guestfs_set_ready (g); + return -1; + } + + if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVREMOVE, serial) == -1) { + guestfs_set_ready (g); + return -1; + } + + if (ctx.hdr.status == GUESTFS_STATUS_ERROR) { + error (g, "%s", ctx.err.error_message); + guestfs_set_ready (g); + return -1; + } + guestfs_set_ready (g); return 0; }