X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FGuestfs.xs;h=14a9225847c31b0a0000fa15e7b830f20050ca8c;hp=d5f1da6b30a8095aaca6d445ba8ae8e08bd40c00;hb=adefe14e308a0f8cf73f9c60693a3dbbded157b9;hpb=286841877f4223d67ec00b83e5a2aabfbb9e19ed diff --git a/perl/Guestfs.xs b/perl/Guestfs.xs index d5f1da6..14a9225 100644 --- a/perl/Guestfs.xs +++ b/perl/Guestfs.xs @@ -57,20 +57,32 @@ my_newSVull(unsigned long long val) { #endif } -/* XXX Not thread-safe, and in general not safe if the caller is - * issuing multiple requests in parallel (on different guestfs - * handles). We should use the guestfs_h handle passed to the - * error handle to distinguish these cases. - */ -static char *last_error = NULL; - -static void -error_handler (guestfs_h *g, - void *data, - const char *msg) -{ - if (last_error != NULL) free (last_error); - last_error = strdup (msg); +/* http://www.perlmonks.org/?node_id=680842 */ +static char ** +XS_unpack_charPtrPtr (SV *arg) { + char **ret; + AV *av; + I32 i; + + if (!arg || !SvOK (arg) || !SvROK (arg) || SvTYPE (SvRV (arg)) != SVt_PVAV) { + croak ("array reference expected"); + } + + av = (AV *)SvRV (arg); + ret = (char **)malloc (av_len (av) + 1 + 1); + + for (i = 0; i <= av_len (av); i++) { + SV **elem = av_fetch (av, i, 0); + + if (!elem || !*elem) + croak ("missing element in list"); + + ret[i] = SvPV_nolen (*elem); + } + + ret[i] = NULL; + + return ret; } MODULE = Sys::Guestfs PACKAGE = Sys::Guestfs @@ -81,7 +93,7 @@ _create () RETVAL = guestfs_create (); if (!RETVAL) croak ("could not create guestfs handle"); - guestfs_set_error_handler (RETVAL, error_handler, NULL); + guestfs_set_error_handler (RETVAL, NULL, NULL); OUTPUT: RETVAL @@ -95,38 +107,43 @@ void launch (g) guestfs_h *g; PPCODE: - if (guestfs_launch (g) == -1) - croak ("launch: %s", last_error); + if (guestfs_launch (g) == -1) { + croak ("launch: %s", guestfs_last_error (g)); + } void wait_ready (g) guestfs_h *g; PPCODE: - if (guestfs_wait_ready (g) == -1) - croak ("wait_ready: %s", last_error); + if (guestfs_wait_ready (g) == -1) { + croak ("wait_ready: %s", guestfs_last_error (g)); + } void kill_subprocess (g) guestfs_h *g; PPCODE: - if (guestfs_kill_subprocess (g) == -1) - croak ("kill_subprocess: %s", last_error); + if (guestfs_kill_subprocess (g) == -1) { + croak ("kill_subprocess: %s", guestfs_last_error (g)); + } void add_drive (g, filename) guestfs_h *g; char *filename; PPCODE: - if (guestfs_add_drive (g, filename) == -1) - croak ("add_drive: %s", last_error); + if (guestfs_add_drive (g, filename) == -1) { + croak ("add_drive: %s", guestfs_last_error (g)); + } void add_cdrom (g, filename) guestfs_h *g; char *filename; PPCODE: - if (guestfs_add_cdrom (g, filename) == -1) - croak ("add_cdrom: %s", last_error); + if (guestfs_add_cdrom (g, filename) == -1) { + croak ("add_cdrom: %s", guestfs_last_error (g)); + } void config (g, qemuparam, qemuvalue) @@ -134,16 +151,18 @@ config (g, qemuparam, qemuvalue) char *qemuparam; char *qemuvalue; PPCODE: - if (guestfs_config (g, qemuparam, qemuvalue) == -1) - croak ("config: %s", last_error); + if (guestfs_config (g, qemuparam, qemuvalue) == -1) { + croak ("config: %s", guestfs_last_error (g)); + } void set_path (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_set_path (g, path) == -1) - croak ("set_path: %s", last_error); + if (guestfs_set_path (g, path) == -1) { + croak ("set_path: %s", guestfs_last_error (g)); + } SV * get_path (g) @@ -152,8 +171,9 @@ PREINIT: const char *path; CODE: path = guestfs_get_path (g); - if (path == NULL) - croak ("get_path: %s", last_error); + if (path == NULL) { + croak ("get_path: %s", guestfs_last_error (g)); + } RETVAL = newSVpv (path, 0); OUTPUT: RETVAL @@ -163,8 +183,9 @@ set_autosync (g, autosync) guestfs_h *g; int autosync; PPCODE: - if (guestfs_set_autosync (g, autosync) == -1) - croak ("set_autosync: %s", last_error); + if (guestfs_set_autosync (g, autosync) == -1) { + croak ("set_autosync: %s", guestfs_last_error (g)); + } SV * get_autosync (g) @@ -173,8 +194,9 @@ PREINIT: int autosync; CODE: autosync = guestfs_get_autosync (g); - if (autosync == -1) - croak ("get_autosync: %s", last_error); + if (autosync == -1) { + croak ("get_autosync: %s", guestfs_last_error (g)); + } RETVAL = newSViv (autosync); OUTPUT: RETVAL @@ -184,8 +206,9 @@ set_verbose (g, verbose) guestfs_h *g; int verbose; PPCODE: - if (guestfs_set_verbose (g, verbose) == -1) - croak ("set_verbose: %s", last_error); + if (guestfs_set_verbose (g, verbose) == -1) { + croak ("set_verbose: %s", guestfs_last_error (g)); + } SV * get_verbose (g) @@ -194,8 +217,9 @@ PREINIT: int verbose; CODE: verbose = guestfs_get_verbose (g); - if (verbose == -1) - croak ("get_verbose: %s", last_error); + if (verbose == -1) { + croak ("get_verbose: %s", guestfs_last_error (g)); + } RETVAL = newSViv (verbose); OUTPUT: RETVAL @@ -206,23 +230,26 @@ mount (g, device, mountpoint) char *device; char *mountpoint; PPCODE: - if (guestfs_mount (g, device, mountpoint) == -1) - croak ("mount: %s", last_error); + if (guestfs_mount (g, device, mountpoint) == -1) { + croak ("mount: %s", guestfs_last_error (g)); + } void sync (g) guestfs_h *g; PPCODE: - if (guestfs_sync (g) == -1) - croak ("sync: %s", last_error); + if (guestfs_sync (g) == -1) { + croak ("sync: %s", guestfs_last_error (g)); + } void touch (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_touch (g, path) == -1) - croak ("touch: %s", last_error); + if (guestfs_touch (g, path) == -1) { + croak ("touch: %s", guestfs_last_error (g)); + } SV * cat (g, path) @@ -232,8 +259,9 @@ PREINIT: char *content; CODE: content = guestfs_cat (g, path); - if (content == NULL) - croak ("cat: %s", last_error); + if (content == NULL) { + croak ("cat: %s", guestfs_last_error (g)); + } RETVAL = newSVpv (content, 0); free (content); OUTPUT: @@ -247,8 +275,9 @@ PREINIT: char *listing; CODE: listing = guestfs_ll (g, directory); - if (listing == NULL) - croak ("ll: %s", last_error); + if (listing == NULL) { + croak ("ll: %s", guestfs_last_error (g)); + } RETVAL = newSVpv (listing, 0); free (listing); OUTPUT: @@ -263,8 +292,9 @@ PREINIT: int i, n; PPCODE: listing = guestfs_ls (g, directory); - if (listing == NULL) - croak ("ls: %s", last_error); + if (listing == NULL) { + croak ("ls: %s", guestfs_last_error (g)); + } for (n = 0; listing[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -281,8 +311,9 @@ PREINIT: int i, n; PPCODE: devices = guestfs_list_devices (g); - if (devices == NULL) - croak ("list_devices: %s", last_error); + if (devices == NULL) { + croak ("list_devices: %s", guestfs_last_error (g)); + } for (n = 0; devices[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -299,8 +330,9 @@ PREINIT: int i, n; PPCODE: partitions = guestfs_list_partitions (g); - if (partitions == NULL) - croak ("list_partitions: %s", last_error); + if (partitions == NULL) { + croak ("list_partitions: %s", guestfs_last_error (g)); + } for (n = 0; partitions[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -317,8 +349,9 @@ PREINIT: int i, n; PPCODE: physvols = guestfs_pvs (g); - if (physvols == NULL) - croak ("pvs: %s", last_error); + if (physvols == NULL) { + croak ("pvs: %s", guestfs_last_error (g)); + } for (n = 0; physvols[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -335,8 +368,9 @@ PREINIT: int i, n; PPCODE: volgroups = guestfs_vgs (g); - if (volgroups == NULL) - croak ("vgs: %s", last_error); + if (volgroups == NULL) { + croak ("vgs: %s", guestfs_last_error (g)); + } for (n = 0; volgroups[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -353,8 +387,9 @@ PREINIT: int i, n; PPCODE: logvols = guestfs_lvs (g); - if (logvols == NULL) - croak ("lvs: %s", last_error); + if (logvols == NULL) { + croak ("lvs: %s", guestfs_last_error (g)); + } for (n = 0; logvols[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -373,7 +408,7 @@ PREINIT: PPCODE: physvols = guestfs_pvs_full (g); if (physvols == NULL) - croak ("pvs_full: %s", last_error); + croak ("pvs_full: %s", guestfs_last_error (g)); EXTEND (SP, physvols->len); for (i = 0; i < physvols->len; ++i) { hv = newHV (); @@ -405,7 +440,7 @@ PREINIT: PPCODE: volgroups = guestfs_vgs_full (g); if (volgroups == NULL) - croak ("vgs_full: %s", last_error); + croak ("vgs_full: %s", guestfs_last_error (g)); EXTEND (SP, volgroups->len); for (i = 0; i < volgroups->len; ++i) { hv = newHV (); @@ -442,7 +477,7 @@ PREINIT: PPCODE: logvols = guestfs_lvs_full (g); if (logvols == NULL) - croak ("lvs_full: %s", last_error); + croak ("lvs_full: %s", guestfs_last_error (g)); EXTEND (SP, logvols->len); for (i = 0; i < logvols->len; ++i) { hv = newHV (); @@ -475,8 +510,9 @@ PREINIT: int i, n; PPCODE: lines = guestfs_read_lines (g, path); - if (lines == NULL) - croak ("read_lines: %s", last_error); + if (lines == NULL) { + croak ("read_lines: %s", guestfs_last_error (g)); + } for (n = 0; lines[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -491,15 +527,17 @@ aug_init (g, root, flags) char *root; int flags; PPCODE: - if (guestfs_aug_init (g, root, flags) == -1) - croak ("aug_init: %s", last_error); + if (guestfs_aug_init (g, root, flags) == -1) { + croak ("aug_init: %s", guestfs_last_error (g)); + } void aug_close (g) guestfs_h *g; PPCODE: - if (guestfs_aug_close (g) == -1) - croak ("aug_close: %s", last_error); + if (guestfs_aug_close (g) == -1) { + croak ("aug_close: %s", guestfs_last_error (g)); + } SV * aug_defvar (g, name, expr) @@ -510,8 +548,9 @@ PREINIT: int nrnodes; CODE: nrnodes = guestfs_aug_defvar (g, name, expr); - if (nrnodes == -1) - croak ("aug_defvar: %s", last_error); + if (nrnodes == -1) { + croak ("aug_defvar: %s", guestfs_last_error (g)); + } RETVAL = newSViv (nrnodes); OUTPUT: RETVAL @@ -526,8 +565,9 @@ PREINIT: struct guestfs_int_bool *r; PPCODE: r = guestfs_aug_defnode (g, name, expr, val); - if (r == NULL) - croak ("aug_defnode: %s", last_error); + if (r == NULL) { + croak ("aug_defnode: %s", guestfs_last_error (g)); + } EXTEND (SP, 2); PUSHs (sv_2mortal (newSViv (r->i))); PUSHs (sv_2mortal (newSViv (r->b))); @@ -541,8 +581,9 @@ PREINIT: char *val; CODE: val = guestfs_aug_get (g, path); - if (val == NULL) - croak ("aug_get: %s", last_error); + if (val == NULL) { + croak ("aug_get: %s", guestfs_last_error (g)); + } RETVAL = newSVpv (val, 0); free (val); OUTPUT: @@ -554,8 +595,9 @@ aug_set (g, path, val) char *path; char *val; PPCODE: - if (guestfs_aug_set (g, path, val) == -1) - croak ("aug_set: %s", last_error); + if (guestfs_aug_set (g, path, val) == -1) { + croak ("aug_set: %s", guestfs_last_error (g)); + } void aug_insert (g, path, label, before) @@ -564,8 +606,9 @@ aug_insert (g, path, label, before) char *label; int before; PPCODE: - if (guestfs_aug_insert (g, path, label, before) == -1) - croak ("aug_insert: %s", last_error); + if (guestfs_aug_insert (g, path, label, before) == -1) { + croak ("aug_insert: %s", guestfs_last_error (g)); + } SV * aug_rm (g, path) @@ -575,8 +618,9 @@ PREINIT: int nrnodes; CODE: nrnodes = guestfs_aug_rm (g, path); - if (nrnodes == -1) - croak ("aug_rm: %s", last_error); + if (nrnodes == -1) { + croak ("aug_rm: %s", guestfs_last_error (g)); + } RETVAL = newSViv (nrnodes); OUTPUT: RETVAL @@ -587,8 +631,9 @@ aug_mv (g, src, dest) char *src; char *dest; PPCODE: - if (guestfs_aug_mv (g, src, dest) == -1) - croak ("aug_mv: %s", last_error); + if (guestfs_aug_mv (g, src, dest) == -1) { + croak ("aug_mv: %s", guestfs_last_error (g)); + } void aug_match (g, path) @@ -599,8 +644,9 @@ PREINIT: int i, n; PPCODE: matches = guestfs_aug_match (g, path); - if (matches == NULL) - croak ("aug_match: %s", last_error); + if (matches == NULL) { + croak ("aug_match: %s", guestfs_last_error (g)); + } for (n = 0; matches[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -613,15 +659,17 @@ void aug_save (g) guestfs_h *g; PPCODE: - if (guestfs_aug_save (g) == -1) - croak ("aug_save: %s", last_error); + if (guestfs_aug_save (g) == -1) { + croak ("aug_save: %s", guestfs_last_error (g)); + } void aug_load (g) guestfs_h *g; PPCODE: - if (guestfs_aug_load (g) == -1) - croak ("aug_load: %s", last_error); + if (guestfs_aug_load (g) == -1) { + croak ("aug_load: %s", guestfs_last_error (g)); + } void aug_ls (g, path) @@ -632,8 +680,9 @@ PREINIT: int i, n; PPCODE: matches = guestfs_aug_ls (g, path); - if (matches == NULL) - croak ("aug_ls: %s", last_error); + if (matches == NULL) { + croak ("aug_ls: %s", guestfs_last_error (g)); + } for (n = 0; matches[n] != NULL; ++n) /**/; EXTEND (SP, n); for (i = 0; i < n; ++i) { @@ -647,40 +696,45 @@ rm (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_rm (g, path) == -1) - croak ("rm: %s", last_error); + if (guestfs_rm (g, path) == -1) { + croak ("rm: %s", guestfs_last_error (g)); + } void rmdir (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_rmdir (g, path) == -1) - croak ("rmdir: %s", last_error); + if (guestfs_rmdir (g, path) == -1) { + croak ("rmdir: %s", guestfs_last_error (g)); + } void rm_rf (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_rm_rf (g, path) == -1) - croak ("rm_rf: %s", last_error); + if (guestfs_rm_rf (g, path) == -1) { + croak ("rm_rf: %s", guestfs_last_error (g)); + } void mkdir (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_mkdir (g, path) == -1) - croak ("mkdir: %s", last_error); + if (guestfs_mkdir (g, path) == -1) { + croak ("mkdir: %s", guestfs_last_error (g)); + } void mkdir_p (g, path) guestfs_h *g; char *path; PPCODE: - if (guestfs_mkdir_p (g, path) == -1) - croak ("mkdir_p: %s", last_error); + if (guestfs_mkdir_p (g, path) == -1) { + croak ("mkdir_p: %s", guestfs_last_error (g)); + } void chmod (g, mode, path) @@ -688,8 +742,9 @@ chmod (g, mode, path) int mode; char *path; PPCODE: - if (guestfs_chmod (g, mode, path) == -1) - croak ("chmod: %s", last_error); + if (guestfs_chmod (g, mode, path) == -1) { + croak ("chmod: %s", guestfs_last_error (g)); + } void chown (g, owner, group, path) @@ -698,6 +753,180 @@ chown (g, owner, group, path) int group; char *path; PPCODE: - if (guestfs_chown (g, owner, group, path) == -1) - croak ("chown: %s", last_error); + if (guestfs_chown (g, owner, group, path) == -1) { + croak ("chown: %s", guestfs_last_error (g)); + } + +SV * +exists (g, path) + guestfs_h *g; + char *path; +PREINIT: + int existsflag; + CODE: + existsflag = guestfs_exists (g, path); + if (existsflag == -1) { + croak ("exists: %s", guestfs_last_error (g)); + } + RETVAL = newSViv (existsflag); + OUTPUT: + RETVAL + +SV * +is_file (g, path) + guestfs_h *g; + char *path; +PREINIT: + int fileflag; + CODE: + fileflag = guestfs_is_file (g, path); + if (fileflag == -1) { + croak ("is_file: %s", guestfs_last_error (g)); + } + RETVAL = newSViv (fileflag); + OUTPUT: + RETVAL + +SV * +is_dir (g, path) + guestfs_h *g; + char *path; +PREINIT: + int dirflag; + CODE: + dirflag = guestfs_is_dir (g, path); + if (dirflag == -1) { + croak ("is_dir: %s", guestfs_last_error (g)); + } + RETVAL = newSViv (dirflag); + OUTPUT: + RETVAL + +void +pvcreate (g, device) + guestfs_h *g; + char *device; + PPCODE: + if (guestfs_pvcreate (g, device) == -1) { + croak ("pvcreate: %s", guestfs_last_error (g)); + } + +void +vgcreate (g, volgroup, physvols) + guestfs_h *g; + char *volgroup; + char **physvols; + PPCODE: + if (guestfs_vgcreate (g, volgroup, physvols) == -1) { + free (physvols); + croak ("vgcreate: %s", guestfs_last_error (g)); + } + free (physvols); + +void +lvcreate (g, logvol, volgroup, mbytes) + guestfs_h *g; + char *logvol; + char *volgroup; + int mbytes; + PPCODE: + if (guestfs_lvcreate (g, logvol, volgroup, mbytes) == -1) { + croak ("lvcreate: %s", guestfs_last_error (g)); + } + +void +mkfs (g, fstype, device) + guestfs_h *g; + char *fstype; + char *device; + PPCODE: + if (guestfs_mkfs (g, fstype, device) == -1) { + croak ("mkfs: %s", guestfs_last_error (g)); + } + +void +sfdisk (g, device, cyls, heads, sectors, lines) + guestfs_h *g; + char *device; + int cyls; + int heads; + int sectors; + char **lines; + PPCODE: + if (guestfs_sfdisk (g, device, cyls, heads, sectors, lines) == -1) { + free (lines); + croak ("sfdisk: %s", guestfs_last_error (g)); + } + free (lines); + +void +write_file (g, path, content, size) + guestfs_h *g; + char *path; + char *content; + int size; + PPCODE: + if (guestfs_write_file (g, path, content, size) == -1) { + croak ("write_file: %s", guestfs_last_error (g)); + } + +void +umount (g, pathordevice) + guestfs_h *g; + char *pathordevice; + PPCODE: + if (guestfs_umount (g, pathordevice) == -1) { + croak ("umount: %s", guestfs_last_error (g)); + } + +void +mounts (g) + guestfs_h *g; +PREINIT: + char **devices; + int i, n; + PPCODE: + devices = guestfs_mounts (g); + if (devices == NULL) { + croak ("mounts: %s", guestfs_last_error (g)); + } + for (n = 0; devices[n] != NULL; ++n) /**/; + EXTEND (SP, n); + for (i = 0; i < n; ++i) { + PUSHs (sv_2mortal (newSVpv (devices[i], 0))); + free (devices[i]); + } + free (devices); + +void +umount_all (g) + guestfs_h *g; + PPCODE: + if (guestfs_umount_all (g) == -1) { + croak ("umount_all: %s", guestfs_last_error (g)); + } + +void +lvm_remove_all (g) + guestfs_h *g; + PPCODE: + if (guestfs_lvm_remove_all (g) == -1) { + croak ("lvm_remove_all: %s", guestfs_last_error (g)); + } + +SV * +file (g, path) + guestfs_h *g; + char *path; +PREINIT: + char *description; + CODE: + description = guestfs_file (g, path); + if (description == NULL) { + croak ("file: %s", guestfs_last_error (g)); + } + RETVAL = newSVpv (description, 0); + free (description); + OUTPUT: + RETVAL