diff options
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/actions.h | 6 | ||||
| -rw-r--r-- | daemon/lvm.c | 6 | ||||
| -rw-r--r-- | daemon/stubs.c | 48 |
3 files changed, 30 insertions, 30 deletions
diff --git a/daemon/actions.h b/daemon/actions.h index 6527e0c2..194986fa 100644 --- a/daemon/actions.h +++ b/daemon/actions.h @@ -29,6 +29,6 @@ extern char *do_ll (const char *directory); extern char **do_ls (const char *directory); extern char **do_list_devices (); extern char **do_list_partitions (); -extern guestfs_lvm_int_pv_list *do_pvs (); -extern guestfs_lvm_int_vg_list *do_vgs (); -extern guestfs_lvm_int_lv_list *do_lvs (); +extern guestfs_lvm_int_pv_list *do_pvs_full (); +extern guestfs_lvm_int_vg_list *do_vgs_full (); +extern guestfs_lvm_int_lv_list *do_lvs_full (); diff --git a/daemon/lvm.c b/daemon/lvm.c index 1b888f24..43f5cd1c 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -32,19 +32,19 @@ */ guestfs_lvm_int_pv_list * -do_pvs (void) +do_pvs_full (void) { return parse_command_line_pvs (); } guestfs_lvm_int_vg_list * -do_vgs (void) +do_vgs_full (void) { return parse_command_line_vgs (); } guestfs_lvm_int_lv_list * -do_lvs (void) +do_lvs_full (void) { return parse_command_line_lvs (); } diff --git a/daemon/stubs.c b/daemon/stubs.c index 24f60427..63ca7704 100644 --- a/daemon/stubs.c +++ b/daemon/stubs.c @@ -199,49 +199,49 @@ static void list_partitions_stub (XDR *xdr_in) free_strings (r); } -static void pvs_stub (XDR *xdr_in) +static void pvs_full_stub (XDR *xdr_in) { guestfs_lvm_int_pv_list *r; - r = do_pvs (); + r = do_pvs_full (); if (r == NULL) - /* do_pvs has already called reply_with_error, so just return */ + /* do_pvs_full has already called reply_with_error, so just return */ return; - struct guestfs_pvs_ret ret; + struct guestfs_pvs_full_ret ret; ret.physvols = *r; - reply ((xdrproc_t) &xdr_guestfs_pvs_ret, (char *) &ret); - xdr_free ((xdrproc_t) xdr_guestfs_pvs_ret, (char *) &ret); + reply ((xdrproc_t) &xdr_guestfs_pvs_full_ret, (char *) &ret); + xdr_free ((xdrproc_t) xdr_guestfs_pvs_full_ret, (char *) &ret); } -static void vgs_stub (XDR *xdr_in) +static void vgs_full_stub (XDR *xdr_in) { guestfs_lvm_int_vg_list *r; - r = do_vgs (); + r = do_vgs_full (); if (r == NULL) - /* do_vgs has already called reply_with_error, so just return */ + /* do_vgs_full has already called reply_with_error, so just return */ return; - struct guestfs_vgs_ret ret; + struct guestfs_vgs_full_ret ret; ret.volgroups = *r; - reply ((xdrproc_t) &xdr_guestfs_vgs_ret, (char *) &ret); - xdr_free ((xdrproc_t) xdr_guestfs_vgs_ret, (char *) &ret); + reply ((xdrproc_t) &xdr_guestfs_vgs_full_ret, (char *) &ret); + xdr_free ((xdrproc_t) xdr_guestfs_vgs_full_ret, (char *) &ret); } -static void lvs_stub (XDR *xdr_in) +static void lvs_full_stub (XDR *xdr_in) { guestfs_lvm_int_lv_list *r; - r = do_lvs (); + r = do_lvs_full (); if (r == NULL) - /* do_lvs has already called reply_with_error, so just return */ + /* do_lvs_full has already called reply_with_error, so just return */ return; - struct guestfs_lvs_ret ret; + struct guestfs_lvs_full_ret ret; ret.logvols = *r; - reply ((xdrproc_t) &xdr_guestfs_lvs_ret, (char *) &ret); - xdr_free ((xdrproc_t) xdr_guestfs_lvs_ret, (char *) &ret); + reply ((xdrproc_t) &xdr_guestfs_lvs_full_ret, (char *) &ret); + xdr_free ((xdrproc_t) xdr_guestfs_lvs_full_ret, (char *) &ret); } void dispatch_incoming_message (XDR *xdr_in) @@ -271,14 +271,14 @@ void dispatch_incoming_message (XDR *xdr_in) case GUESTFS_PROC_LIST_PARTITIONS: list_partitions_stub (xdr_in); break; - case GUESTFS_PROC_PVS: - pvs_stub (xdr_in); + case GUESTFS_PROC_PVS_FULL: + pvs_full_stub (xdr_in); break; - case GUESTFS_PROC_VGS: - vgs_stub (xdr_in); + case GUESTFS_PROC_VGS_FULL: + vgs_full_stub (xdr_in); break; - case GUESTFS_PROC_LVS: - lvs_stub (xdr_in); + case GUESTFS_PROC_LVS_FULL: + lvs_full_stub (xdr_in); break; default: reply_with_error ("dispatch_incoming_message: unknown procedure number %d", proc_nr); |