diff --git a/align/virt-alignment-scan.pod b/align/virt-alignment-scan.pod index 690b8009f..2a740a4a2 100644 --- a/align/virt-alignment-scan.pod +++ b/align/virt-alignment-scan.pod @@ -250,13 +250,13 @@ Partitions which are not aligned correctly to the underlying storage cause extra I/O. For example: sect#63 - +--------------------------+------ - | guest | - | filesystem block | - ---+------------------+------+-------------------+-----+--- - | host block | host block | - | | | - ---+-------------------------+-------------------------+--- + ┌──────────────────────────┬ ─ ─ ─ ─ + │ guest │ + │ filesystem block │ + ─ ┬──────────────────┴──────┬───────────────────┴─────┬ ─ ─ + │ host block │ host block │ + │ │ │ + ─ ┴─────────────────────────┴─────────────────────────┴ ─ ─ In this example, each time a 4K guest block is read, two blocks on the host must be accessed (so twice as much I/O is done). When a 4K guest diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index 1e64eed80..4afb71a69 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -509,21 +509,19 @@ In Fedora E 18 and RHEL E 7, libguestfs uses libvirt to manage the appliance. Previously (and upstream) libguestfs runs qemu directly: - +----------------------------------+ - | libguestfs | - +----------------+-----------------+ - | direct backend | libvirt backend | - +----------------+-----------------+ - | | - v v - +-------+ +----------+ - | qemu | | libvirtd | - +-------+ +----------+ - | - v - +-------+ - | qemu | - +-------+ + ┌──────────────────────────────────┐ + │ libguestfs │ + ├────────────────┬─────────────────┤ + │ direct backend │ libvirt backend │ + └────────────────┴─────────────────┘ + ↓ ↓ + ┌───────┐ ┌──────────┐ + │ qemu │ │ libvirtd │ + └───────┘ └──────────┘ + ↓ + ┌───────┐ + │ qemu │ + └───────┘ upstream Fedora 18+ non-Fedora RHEL 7+ @@ -1144,14 +1142,14 @@ In contrast, when the virtual machine boots, it mounts those filesystems into a consistent hierarchy such as: / (/dev/sda2) - | - +-- /boot (/dev/sda1) - | - +-- /home (/dev/vg_external/Homes) - | - +-- /usr (/dev/vg_os/lv_usr) - | - +-- /var (/dev/vg_os/lv_var) + │ + ├── /boot (/dev/sda1) + │ + ├── /home (/dev/vg_external/Homes) + │ + ├── /usr (/dev/vg_os/lv_usr) + │ + └── /var (/dev/vg_os/lv_var) (or drive letters on Windows). diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod index 52f4b18ac..0ac68c3cf 100644 --- a/p2v/virt-p2v.pod +++ b/p2v/virt-p2v.pod @@ -27,11 +27,11 @@ has to talk to another server called the "conversion server" which must have L installed on it. It always talks to the conversion server over SSH: - +-----------+ +-------------+ - | virt-p2v | | virt-v2v | - | (physical | ssh connection | (conversion | - | server) -----------------> server) | - +-----------+ +-------------+ + ┌──────────────┐ ┌─────────────────┐ + │ virt-p2v │ │ virt-v2v │ + │ (physical │ ssh connection │ (conversion │ + │ server) ╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍▶ server) │ + └──────────────┘ └─────────────────┘ The virt-v2v program on the conversion server does the actual conversion (physical to virtual, and virtual to virtual conversions diff --git a/src/guestfs.pod b/src/guestfs.pod index a8350b1b3..642730632 100644 --- a/src/guestfs.pod +++ b/src/guestfs.pod @@ -3392,25 +3392,24 @@ Internally, libguestfs is implemented by running an appliance (a special type of small virtual machine) using L. Qemu runs as a child process of the main program. - ___________________ - / \ - | main program | - | | - | | child process / appliance - | | __________________________ - | | / qemu \ - +-------------------+ RPC | +-----------------+ | - | libguestfs <--------------------> guestfsd | | - | | | +-----------------+ | - \___________________/ | | Linux kernel | | - | +--^--------------+ | - \_________|________________/ - | - _______v______ - / \ - | Device or | - | disk image | - \______________/ + ┌───────────────────┐ + │ main program │ + │ │ + │ │ child process / appliance + │ │ ┌──────────────────────────┐ + │ │ │ qemu │ + ├───────────────────┤ RPC │ ┌─────────────────┐ │ + │ libguestfs ◀╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍▶ guestfsd │ │ + │ │ │ ├─────────────────┤ │ + └───────────────────┘ │ │ Linux kernel │ │ + │ └────────┬────────┘ │ + └───────────────│──────────┘ + │ + │ virtio-scsi + ┌──────┴──────┐ + │ Device or │ + │ disk image │ + └─────────────┘ The library, linked to the main program, creates the child process and hence the appliance in the L function. diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index cd867fb3d..4182ccfb0 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -31,13 +31,13 @@ libguestfs E 1.28. =head1 INPUT AND OUTPUT MODES ┌────────────┐ - -i disk ───────────┐ │ │ ┌───────> -o local + -i disk ───────────┐ │ │ ┌───────▶ -o local │ │ virt-v2v │ │ - └──> │ conversion │ ──┘ - -i libvirt ───────────> │ server │ ────────> -o libvirt - (default) ┌──> │ │ ──┐ (default) - │ │ │ ─┐└──────> -o glance - -i libvirtxml ─────┘ │ │ └─────────> -o rhev + └──▶ │ conversion │ ──┘ + -i libvirt ───────────▶ │ server │ ────────▶ -o libvirt + (default) ┌──▶ │ │ ──┐ (default) + │ │ │ ─┐└──────▶ -o glance + -i libvirtxml ─────┘ │ │ └─────────▶ -o rhev └────────────┘ Virt-v2v has a number of possible input and output modes, selected