search for: drive_nam

Create a module ‘C_utils’ containing functions like ‘drive_name’ and ‘shell_unquote’ which come from the C utilities. The new directory ‘common/mlutils’ also contains the ‘Unix_utils’ wrappers around POSIX functions missing from the OCaml stdlib. --- .gitignore | 3 + Makefile.am | 24 ++---...

...c/launch-libvirt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index d678266..5914642 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -936,6 +936,10 @@ construct_libvirt_xml_appliance (guestfs_h *g, xmlTextWriterPtr xo, char drive_name[64] = "sd"; char scsi_target[64]; + /* appliance is optional */ + if (appliance == NULL) + return 0; + guestfs___drive_name (drv_index, &drive_name[2]); snprintf (scsi_target, sizeof scsi_target, "%zu", drv_index); -- 1.7.12.1

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.

...sary cifs programs. Everything seems to work fine with the exception of one network drive, which I cannot seem to get mounted. This drive differs from the other drives in the way our IT has set up the drive name. The drives that I can mount are all called (according to a Windows explorer window): drive_name on 'hmtsrv3' where hmtsrv3 is the actual name of the server. The drive that I cannot mount is called (again, according to the Windows explorer window): drive_name on 'hmtsrv3\home' When I try something like this: mount -t cifs //hmtsrv3/home/drive_name /mnt/windrive -o user=xxx...

...ad:true @@ -108,20 +75,6 @@ let rec main () = g#launch (); - (* Create the list of overlays structs. Query each disk for its - * virtual size, and fill in a few other fields. - *) - let overlays = - mapi ( - fun i (overlay_file, source) -> - let sd = "sd" ^ drive_name i in - let dev = "/dev/" ^ sd in - let vsize = g#blockdev_getsize64 dev in - - { ov_overlay_file = overlay_file; ov_sd = sd; - ov_virtual_size = vsize; ov_source = source } - ) overlays in - (* Work out where we will write the final output. Do this ea...

...re in a new directory of the same name on the flash drive. The total number of files in the base directory is 171, and the total size of the files copied was a little over 500MB, so I believe that everything should have fit just fine. The commands I used that failed were 'rsync -av /media/<drive_name>/ /media/<2GB_drive_name>/' (which worked for the two smaller drives but not the bigger one), and then (after using the same command to copy the files to my hard drive), 'rsync -av ./ /media/<2GB_drive_name>/' The command that worked was 'cp -R . /media/<2GB_driv...

On Thursday, 15 June 2017 19:06:00 CEST Richard W.M. Jones wrote: > Create a module ‘C_utils’ containing functions like ‘drive_name’ and > ‘shell_unquote’ which come from the C utilities. > > The new directory ‘common/mlutils’ also contains the ‘Unix_utils’ > wrappers around POSIX functions missing from the OCaml stdlib. > --- I fear we are spreading the code among too many helper libraries... Why not just add...

This preliminary patch series adds a libvirt backend to libguestfs. It's for review only because although it launches the guest OK, there are some missing features that need to be implemented. The meat of the patch is in part 4/4. To save you the trouble of interpreting libxml2 fragments, an example of the generated XML and the corresponding qemu command line are attached below. Note the

...failed, see earlier errors"); + + (* Sanity check created overlay (see below). *) + if not ((new G.guestfs ())#disk_has_backing_file overlay_file) then + error (f_"internal error: qemu-img did not create overlay with backing file"); + + let sd = "sd" ^ drive_name i in + + let vsize = (new G.guestfs ())#disk_virtual_size overlay_file in + + { ov_overlay_file = overlay_file; ov_sd = sd; + ov_virtual_size = vsize; ov_source = source } + ) src_disks + let rec main () = (* Handle the command line. *) let input, output, @@ -122,40 +161,7...

Doing this allows us to remove the Customize_utils module completely, since it becomes empty. Rich.

...FAILURE); + } + + /* If the --just-add option was given, we're done. */ + if (just_add) + return; + + /* Check each device has the expected drive name, eg. /dev/sda, + * /dev/sdb, ..., /dev/sdaa, ... + */ + for (i = 0; i < ndisks; ++i) { + char expected[64]; + + guestfs_int_drive_name (i, expected); + if (!STRSUFFIX (devices[i], expected)) { + fprintf (stderr, + "%s: incorrect device name at index %zu: " + "%s (expected suffix %s)\n", + getprogname (), i, devices[i], expected); + exit (EXIT_FAILURE); +...

In no particular order. Some of these need further investigation. ---------------------------------------------------------------------- I had to patch libguestfs not to use febootstrap-supermin-helper --copy-kernel option. See attachment #1. This could be avoided by providing a newer febootstrap in Wheezy. I had to patch libguestfs to make it not use the (not working) virtio-scsi in old

These assorted patches end up with adding virtio-scsi support to libguestfs. It passes libguestfs-test-tool, but I haven't yet tried to run the full set of tests. In theory > 26 devices can be added, but it's likely that certain parts of the daemon will break if you actually try this. This of course needs to be fixed. Thanks Paolo Bonzini for invaluable help. Rich.

...(drv->disk_label) { start_element ("serial") { - string (drv->disk_label); + string ("%s", drv->disk_label); } end_element (); } @@ -1597,7 +1534,7 @@ construct_libvirt_xml_disk_target (guestfs_h *g, xmlTextWriterPtr xo, guestfs_int_drive_name (drv_index, &drive_name[2]); start_element ("target") { - attribute ("dev", drive_name); + attribute ("dev", "%s", drive_name); attribute ("bus", "scsi"); } end_element (); @@ -1642,8 +1579,8 @@ construct_libvirt_...

...the corresponding target disk. *) + let t = find_target_disk targets d in + + let target_file = + match t.target_file with + | TargetFile s -> s + | TargetURI _ -> assert false in + + let disk = [ + "dev", JSON.String (drive_prefix ^ drive_name i); + "bus", JSON.String bus_name; + "format", JSON.String t.target_format; + "file", JSON.String (absolute_path target_file); + ] in + + List.push_back disks (JSON.Dict disk) + + | BusSlotRemovable { s_removable_type = CDROM } -...

...the corresponding target disk. *) + let t = find_target_disk targets d in + + let target_file = + match t.target_file with + | TargetFile s -> s + | TargetURI _ -> assert false in + + let disk = [ + "dev", JSON.String (drive_prefix ^ drive_name i); + "bus", JSON.String bus_name; + "format", JSON.String t.target_format; + "file", JSON.String (absolute_path target_file); + ] in + + List.push_back disks (JSON.Dict disk) + + | BusSlotRemovable { s_removable_type = CDROM } -...

QEMU upstream has broken snapshot=on ... again. These two patches stop using it entirely. Instead we run 'qemu-img create' to create overlay disks as required. Note that the libvirt and UML backends were already doing this: The libvirt backend because <transient/> has never worked, and the UML backend was running uml_mkcow because the UML-equivalent syntax of snapshot=on was

...fault. @@ -91,6 +102,10 @@ let xpath_int_default xpathctx expr default = match xpath_int xpathctx expr with | None -> default | Some i -> i +let xpath_int64_default xpathctx expr default = + match xpath_int64 xpathctx expr with + | None -> default + | Some i -> i external drive_name : int -> string = "v2v_utils_drive_name" external drive_index : string -> int = "v2v_utils_drive_index" -- 2.5.0

More comprehensive support for virtio-scsi. Passes all the tests. Rich.

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.