Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On 12 June 2018 at 07:51, Ville Skyttä wrote: > Signed-off-by: Ville Skyttä > Reviewed-by: Peter Maydell > Reviewed-by: Eric Blake > --- > docs/colo-proxy.txt | 2 +- > docs/config/mach-virt-graphical.cfg | 2 +- > docs/config/mach-virt-serial.cfg | 2 +- > docs/config/q35-emulated.cfg | 2 +- > docs/config/q35-virtio-graphical.cfg | 2 +- > docs/config/q35-virtio-serial.cfg| 2 +- > docs/devel/migration.rst | 2 +- > docs/devel/multi-thread-tcg.txt | 2 +- > docs/interop/qcow2.txt | 6 +++--- > docs/interop/vhost-user.txt | 4 ++-- > docs/memory-hotplug.txt | 2 +- > docs/multiseat.txt | 2 +- > docs/qemu-block-drivers.texi | 2 +- > docs/qemupciserial.inf | 2 +- > docs/specs/acpi_nvdimm.txt | 3 ++- > docs/specs/ppc-spapr-hcalls.txt | 2 +- > docs/specs/tpm.txt | 2 +- > docs/usb2.txt| 2 +- > 18 files changed, 22 insertions(+), 21 deletions(-) > Applied to master; sorry this patch slipped through the cracks in our process. -- PMM
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On 06/14/2018 11:49 AM, Ville Skyttä wrote: On Tue, Jun 12, 2018 at 3:11 PM, Eric Blake wrote: On 06/12/2018 01:51 AM, Ville Skyttä wrote: Signed-off-by: Ville Skyttä Reviewed-by: Peter Maydell Reviewed-by: Eric Blake --- It's helpful to use 'git send-email -v3' (or 'git format-patch -v3', depending on your workflow) so that the subject line tags this as a third spin of the same patch previously posted, and to include, after the --- separator, how it differs from v2 (in this case, incorporating my review comment to reflow a long line). Otherwise, automated tools might not pick up on the fact that this email replaces your earlier submission as the one to test. Other submission tips can be found at: https://wiki.qemu.org/Contribute/SubmitAPatch Ok, will keep that in mind for the future. In the meantime, am I still expected to do something to this latest patch, or just wait :)? At this point, waiting is probably fine. If no one else responds after a week (such as a maintainer confirming they have queued it), then replying with a ping would be reasonable. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
Looks like a candidate for merging via qemu-trivial. Ville Skyttä writes: > Signed-off-by: Ville Skyttä > Reviewed-by: Peter Maydell > Reviewed-by: Eric Blake > --- > docs/colo-proxy.txt | 2 +- > docs/config/mach-virt-graphical.cfg | 2 +- > docs/config/mach-virt-serial.cfg | 2 +- > docs/config/q35-emulated.cfg | 2 +- > docs/config/q35-virtio-graphical.cfg | 2 +- > docs/config/q35-virtio-serial.cfg| 2 +- > docs/devel/migration.rst | 2 +- > docs/devel/multi-thread-tcg.txt | 2 +- > docs/interop/qcow2.txt | 6 +++--- > docs/interop/vhost-user.txt | 4 ++-- > docs/memory-hotplug.txt | 2 +- > docs/multiseat.txt | 2 +- > docs/qemu-block-drivers.texi | 2 +- > docs/qemupciserial.inf | 2 +- > docs/specs/acpi_nvdimm.txt | 3 ++- > docs/specs/ppc-spapr-hcalls.txt | 2 +- > docs/specs/tpm.txt | 2 +- > docs/usb2.txt| 2 +- > 18 files changed, 22 insertions(+), 21 deletions(-) > > diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt > index 8b726ea094..1f8e4b4e77 100644 > --- a/docs/colo-proxy.txt > +++ b/docs/colo-proxy.txt > @@ -145,7 +145,7 @@ and redirect indev's packet to filter. > COLO-compare, we do packet comparing job. > Packets coming from the primary char indev will be sent to outdev. > Packets coming from the secondary char dev will be dropped after comparing. > -COLO-comapre need two input chardev and one output chardev: > +COLO-compare needs two input chardevs and one output chardev: > primary_in=chardev1-id (source: primary send packet) > secondary_in=chardev2-id (source: secondary send packet) > outdev=chardev3-id > diff --git a/docs/config/mach-virt-graphical.cfg > b/docs/config/mach-virt-graphical.cfg > index 0fdf6846dd..d6d31b17f5 100644 > --- a/docs/config/mach-virt-graphical.cfg > +++ b/docs/config/mach-virt-graphical.cfg > @@ -185,7 +185,7 @@ > # attached to it. > # > # We also create an optical disk, mostly for installation > -# purposes: once the guest OS has been succesfully > +# purposes: once the guest OS has been successfully > # installed, the guest will no longer boot from optical > # media. If you don't want, or no longer want, to have an > # optical disk in the guest you can safely comment out > diff --git a/docs/config/mach-virt-serial.cfg > b/docs/config/mach-virt-serial.cfg > index aee9f1c5a1..18a7c83731 100644 > --- a/docs/config/mach-virt-serial.cfg > +++ b/docs/config/mach-virt-serial.cfg > @@ -191,7 +191,7 @@ > # attached to it. > # > # We also create an optical disk, mostly for installation > -# purposes: once the guest OS has been succesfully > +# purposes: once the guest OS has been successfully > # installed, the guest will no longer boot from optical > # media. If you don't want, or no longer want, to have an > # optical disk in the guest you can safely comment out > diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg > index c6416d6545..99ac918e78 100644 > --- a/docs/config/q35-emulated.cfg > +++ b/docs/config/q35-emulated.cfg > @@ -130,7 +130,7 @@ > # it to that controller so that the guest can use it. > # > # We also create an optical disk, mostly for installation > -# purposes: once the guest OS has been succesfully > +# purposes: once the guest OS has been successfully > # installed, the guest will no longer boot from optical > # media. If you don't want, or no longer want, to have an > # optical disk in the guest you can safely comment out > diff --git a/docs/config/q35-virtio-graphical.cfg > b/docs/config/q35-virtio-graphical.cfg > index 28bde2fc57..4207f11e4f 100644 > --- a/docs/config/q35-virtio-graphical.cfg > +++ b/docs/config/q35-virtio-graphical.cfg > @@ -136,7 +136,7 @@ > # attached to it. > # > # We also create an optical disk, mostly for installation > -# purposes: once the guest OS has been succesfully > +# purposes: once the guest OS has been successfully > # installed, the guest will no longer boot from optical > # media. If you don't want, or no longer want, to have an > # optical disk in the guest you can safely comment out > diff --git a/docs/config/q35-virtio-serial.cfg > b/docs/config/q35-virtio-serial.cfg > index c33c9cc07a..d2830aec5e 100644 > --- a/docs/config/q35-virtio-serial.cfg > +++ b/docs/config/q35-virtio-serial.cfg > @@ -141,7 +141,7 @@ > # attached to it. > # > # We also create an optical disk, mostly for installation > -# purposes: once the guest OS has been succesfully > +# purposes: once the guest OS has been successfully > # installed, the guest will no longer boot from optical > # media. If you don't want, or no longer want, to have an > # optical disk in the guest you can safely comment out > diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst > index 40f136f6be..6ed3fce061 100644 > --- a/docs/devel/migration.rst > +++ b/docs/devel/migration.rst > @@ -37,7
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On Tue, Jun 12, 2018 at 3:11 PM, Eric Blake wrote: > On 06/12/2018 01:51 AM, Ville Skyttä wrote: >> >> Signed-off-by: Ville Skyttä >> Reviewed-by: Peter Maydell >> Reviewed-by: Eric Blake >> --- > > > It's helpful to use 'git send-email -v3' (or 'git format-patch -v3', > depending on your workflow) so that the subject line tags this as a third > spin of the same patch previously posted, and to include, after the --- > separator, how it differs from v2 (in this case, incorporating my review > comment to reflow a long line). Otherwise, automated tools might not pick > up on the fact that this email replaces your earlier submission as the one > to test. Other submission tips can be found at: > > https://wiki.qemu.org/Contribute/SubmitAPatch Ok, will keep that in mind for the future. In the meantime, am I still expected to do something to this latest patch, or just wait :)?
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On 06/12/2018 01:51 AM, Ville Skyttä wrote: Signed-off-by: Ville Skyttä Reviewed-by: Peter Maydell Reviewed-by: Eric Blake --- It's helpful to use 'git send-email -v3' (or 'git format-patch -v3', depending on your workflow) so that the subject line tags this as a third spin of the same patch previously posted, and to include, after the --- separator, how it differs from v2 (in this case, incorporating my review comment to reflow a long line). Otherwise, automated tools might not pick up on the fact that this email replaces your earlier submission as the one to test. Other submission tips can be found at: https://wiki.qemu.org/Contribute/SubmitAPatch -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On Tue, Jun 12, 2018 at 1:00 AM, Eric Blake wrote: > On 06/11/2018 03:25 PM, Ville Skyttä wrote: >> >> Signed-off-by: Ville Skyttä >> --- > [...] > >> +++ b/docs/interop/qcow2.txt >> @@ -326,7 +326,7 @@ in the image file. >> It contains pointers to the second level structures which are called >> refcount >> blocks and are exactly one cluster in size. >> -Given a offset into the image file, the refcount of its cluster can be >> obtained >> +Given an offset into the image file, the refcount of its cluster can be >> obtained >> as follows: > > > This line is now long; it might be better if you reflow 'obtained', more > like... > >> refcount_block_entries = (cluster_size * 8 / refcount_bits) >> @@ -365,7 +365,7 @@ The L1 table has a variable size (stored in the >> header) and may use multiple >> clusters, however it must be contiguous in the image file. L2 tables are >> exactly one cluster in size. >> -Given a offset into the virtual disk, the offset into the image file >> can be >> +Given an offset into the virtual disk, the offset into the image file can >> be >> obtained as follows: > > > ...this line. > > With or without the reflow, > Reviewed-by: Eric Blake Reflowing, new patch follows in a separate mail.
[Qemu-devel] [PATCH] docs: Grammar and spelling fixes
Signed-off-by: Ville Skyttä Reviewed-by: Peter Maydell Reviewed-by: Eric Blake --- docs/colo-proxy.txt | 2 +- docs/config/mach-virt-graphical.cfg | 2 +- docs/config/mach-virt-serial.cfg | 2 +- docs/config/q35-emulated.cfg | 2 +- docs/config/q35-virtio-graphical.cfg | 2 +- docs/config/q35-virtio-serial.cfg| 2 +- docs/devel/migration.rst | 2 +- docs/devel/multi-thread-tcg.txt | 2 +- docs/interop/qcow2.txt | 6 +++--- docs/interop/vhost-user.txt | 4 ++-- docs/memory-hotplug.txt | 2 +- docs/multiseat.txt | 2 +- docs/qemu-block-drivers.texi | 2 +- docs/qemupciserial.inf | 2 +- docs/specs/acpi_nvdimm.txt | 3 ++- docs/specs/ppc-spapr-hcalls.txt | 2 +- docs/specs/tpm.txt | 2 +- docs/usb2.txt| 2 +- 18 files changed, 22 insertions(+), 21 deletions(-) diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 8b726ea094..1f8e4b4e77 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -145,7 +145,7 @@ and redirect indev's packet to filter. COLO-compare, we do packet comparing job. Packets coming from the primary char indev will be sent to outdev. Packets coming from the secondary char dev will be dropped after comparing. -COLO-comapre need two input chardev and one output chardev: +COLO-compare needs two input chardevs and one output chardev: primary_in=chardev1-id (source: primary send packet) secondary_in=chardev2-id (source: secondary send packet) outdev=chardev3-id diff --git a/docs/config/mach-virt-graphical.cfg b/docs/config/mach-virt-graphical.cfg index 0fdf6846dd..d6d31b17f5 100644 --- a/docs/config/mach-virt-graphical.cfg +++ b/docs/config/mach-virt-graphical.cfg @@ -185,7 +185,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/mach-virt-serial.cfg b/docs/config/mach-virt-serial.cfg index aee9f1c5a1..18a7c83731 100644 --- a/docs/config/mach-virt-serial.cfg +++ b/docs/config/mach-virt-serial.cfg @@ -191,7 +191,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg index c6416d6545..99ac918e78 100644 --- a/docs/config/q35-emulated.cfg +++ b/docs/config/q35-emulated.cfg @@ -130,7 +130,7 @@ # it to that controller so that the guest can use it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-graphical.cfg b/docs/config/q35-virtio-graphical.cfg index 28bde2fc57..4207f11e4f 100644 --- a/docs/config/q35-virtio-graphical.cfg +++ b/docs/config/q35-virtio-graphical.cfg @@ -136,7 +136,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-serial.cfg b/docs/config/q35-virtio-serial.cfg index c33c9cc07a..d2830aec5e 100644 --- a/docs/config/q35-virtio-serial.cfg +++ b/docs/config/q35-virtio-serial.cfg @@ -141,7 +141,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 40f136f6be..6ed3fce061 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -37,7 +37,7 @@ over any transport. - tcp migration: do the migration using tcp sockets - unix migration: do the migration using unix sockets - exec migration: do the migration using the stdin/stdout through a process. -- fd migration: do the migration using an file descriptor that is +- fd migration: do
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On 06/11/2018 03:25 PM, Ville Skyttä wrote: Signed-off-by: Ville Skyttä --- +++ b/docs/config/mach-virt-graphical.cfg @@ -185,7 +185,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully Looks like this line was copy-and-pasted a few times :) +++ b/docs/interop/qcow2.txt @@ -326,7 +326,7 @@ in the image file. It contains pointers to the second level structures which are called refcount blocks and are exactly one cluster in size. -Given a offset into the image file, the refcount of its cluster can be obtained +Given an offset into the image file, the refcount of its cluster can be obtained as follows: This line is now long; it might be better if you reflow 'obtained', more like... refcount_block_entries = (cluster_size * 8 / refcount_bits) @@ -365,7 +365,7 @@ The L1 table has a variable size (stored in the header) and may use multiple clusters, however it must be contiguous in the image file. L2 tables are exactly one cluster in size. -Given a offset into the virtual disk, the offset into the image file can be +Given an offset into the virtual disk, the offset into the image file can be obtained as follows: ...this line. With or without the reflow, Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
[Qemu-devel] [PATCH] docs: Grammar and spelling fixes
Signed-off-by: Ville Skyttä --- docs/colo-proxy.txt | 2 +- docs/config/mach-virt-graphical.cfg | 2 +- docs/config/mach-virt-serial.cfg | 2 +- docs/config/q35-emulated.cfg | 2 +- docs/config/q35-virtio-graphical.cfg | 2 +- docs/config/q35-virtio-serial.cfg| 2 +- docs/devel/migration.rst | 2 +- docs/devel/multi-thread-tcg.txt | 2 +- docs/interop/qcow2.txt | 4 ++-- docs/interop/vhost-user.txt | 4 ++-- docs/memory-hotplug.txt | 2 +- docs/multiseat.txt | 2 +- docs/qemu-block-drivers.texi | 2 +- docs/qemupciserial.inf | 2 +- docs/specs/acpi_nvdimm.txt | 3 ++- docs/specs/ppc-spapr-hcalls.txt | 2 +- docs/specs/tpm.txt | 2 +- docs/usb2.txt| 2 +- 18 files changed, 21 insertions(+), 20 deletions(-) diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 8b726ea094..1f8e4b4e77 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -145,7 +145,7 @@ and redirect indev's packet to filter. COLO-compare, we do packet comparing job. Packets coming from the primary char indev will be sent to outdev. Packets coming from the secondary char dev will be dropped after comparing. -COLO-comapre need two input chardev and one output chardev: +COLO-compare needs two input chardevs and one output chardev: primary_in=chardev1-id (source: primary send packet) secondary_in=chardev2-id (source: secondary send packet) outdev=chardev3-id diff --git a/docs/config/mach-virt-graphical.cfg b/docs/config/mach-virt-graphical.cfg index 0fdf6846dd..d6d31b17f5 100644 --- a/docs/config/mach-virt-graphical.cfg +++ b/docs/config/mach-virt-graphical.cfg @@ -185,7 +185,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/mach-virt-serial.cfg b/docs/config/mach-virt-serial.cfg index aee9f1c5a1..18a7c83731 100644 --- a/docs/config/mach-virt-serial.cfg +++ b/docs/config/mach-virt-serial.cfg @@ -191,7 +191,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg index c6416d6545..99ac918e78 100644 --- a/docs/config/q35-emulated.cfg +++ b/docs/config/q35-emulated.cfg @@ -130,7 +130,7 @@ # it to that controller so that the guest can use it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-graphical.cfg b/docs/config/q35-virtio-graphical.cfg index 28bde2fc57..4207f11e4f 100644 --- a/docs/config/q35-virtio-graphical.cfg +++ b/docs/config/q35-virtio-graphical.cfg @@ -136,7 +136,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-serial.cfg b/docs/config/q35-virtio-serial.cfg index c33c9cc07a..d2830aec5e 100644 --- a/docs/config/q35-virtio-serial.cfg +++ b/docs/config/q35-virtio-serial.cfg @@ -141,7 +141,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 40f136f6be..6ed3fce061 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -37,7 +37,7 @@ over any transport. - tcp migration: do the migration using tcp sockets - unix migration: do the migration using unix sockets - exec migration: do the migration using the stdin/stdout through a process. -- fd migration: do the migration using an file descriptor that is +- fd migration: do the migration using a file descriptor that is passed
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On Mon, Jun 11, 2018 at 6:23 PM, Peter Maydell wrote: > On 11 June 2018 at 15:25, Ville Skyttä wrote: >> Signed-off-by: Ville Skyttä > >> diff --git a/docs/specs/acpi_nvdimm.txt b/docs/specs/acpi_nvdimm.txt >> index 3f322e6f55..4da2d44534 100644 >> --- a/docs/specs/acpi_nvdimm.txt >> +++ b/docs/specs/acpi_nvdimm.txt >> @@ -72,7 +72,7 @@ for NVDIMM ACPI. >> >> Memory: >> QEMU uses BIOS Linker/loader feature to ask BIOS to allocate a memory >> - page and dynamically patch its into a int32 object named "MEMA" in ACPI. >> + page and dynamically patch its into an int32 object named "MEMA" in ACPI. > > Should this read "its address" ? Maybe. Or just "it"? Took your suggestion, will send a new patch with it included.
Re: [Qemu-devel] [PATCH] docs: Grammar and spelling fixes
On 11 June 2018 at 15:25, Ville Skyttä wrote: > Signed-off-by: Ville Skyttä > diff --git a/docs/specs/acpi_nvdimm.txt b/docs/specs/acpi_nvdimm.txt > index 3f322e6f55..4da2d44534 100644 > --- a/docs/specs/acpi_nvdimm.txt > +++ b/docs/specs/acpi_nvdimm.txt > @@ -72,7 +72,7 @@ for NVDIMM ACPI. > > Memory: > QEMU uses BIOS Linker/loader feature to ask BIOS to allocate a memory > - page and dynamically patch its into a int32 object named "MEMA" in ACPI. > + page and dynamically patch its into an int32 object named "MEMA" in ACPI. Should this read "its address" ? Otherwise Reviewed-by: Peter Maydell thanks -- PMM
[Qemu-devel] [PATCH] docs: Grammar and spelling fixes
Signed-off-by: Ville Skyttä --- docs/colo-proxy.txt | 2 +- docs/config/mach-virt-graphical.cfg | 2 +- docs/config/mach-virt-serial.cfg | 2 +- docs/config/q35-emulated.cfg | 2 +- docs/config/q35-virtio-graphical.cfg | 2 +- docs/config/q35-virtio-serial.cfg| 2 +- docs/devel/migration.rst | 2 +- docs/devel/multi-thread-tcg.txt | 2 +- docs/interop/qcow2.txt | 4 ++-- docs/interop/vhost-user.txt | 4 ++-- docs/memory-hotplug.txt | 2 +- docs/multiseat.txt | 2 +- docs/qemu-block-drivers.texi | 2 +- docs/qemupciserial.inf | 2 +- docs/specs/acpi_nvdimm.txt | 2 +- docs/specs/ppc-spapr-hcalls.txt | 2 +- docs/specs/tpm.txt | 2 +- docs/usb2.txt| 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 8b726ea094..1f8e4b4e77 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -145,7 +145,7 @@ and redirect indev's packet to filter. COLO-compare, we do packet comparing job. Packets coming from the primary char indev will be sent to outdev. Packets coming from the secondary char dev will be dropped after comparing. -COLO-comapre need two input chardev and one output chardev: +COLO-compare needs two input chardevs and one output chardev: primary_in=chardev1-id (source: primary send packet) secondary_in=chardev2-id (source: secondary send packet) outdev=chardev3-id diff --git a/docs/config/mach-virt-graphical.cfg b/docs/config/mach-virt-graphical.cfg index 0fdf6846dd..d6d31b17f5 100644 --- a/docs/config/mach-virt-graphical.cfg +++ b/docs/config/mach-virt-graphical.cfg @@ -185,7 +185,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/mach-virt-serial.cfg b/docs/config/mach-virt-serial.cfg index aee9f1c5a1..18a7c83731 100644 --- a/docs/config/mach-virt-serial.cfg +++ b/docs/config/mach-virt-serial.cfg @@ -191,7 +191,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg index c6416d6545..99ac918e78 100644 --- a/docs/config/q35-emulated.cfg +++ b/docs/config/q35-emulated.cfg @@ -130,7 +130,7 @@ # it to that controller so that the guest can use it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-graphical.cfg b/docs/config/q35-virtio-graphical.cfg index 28bde2fc57..4207f11e4f 100644 --- a/docs/config/q35-virtio-graphical.cfg +++ b/docs/config/q35-virtio-graphical.cfg @@ -136,7 +136,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/config/q35-virtio-serial.cfg b/docs/config/q35-virtio-serial.cfg index c33c9cc07a..d2830aec5e 100644 --- a/docs/config/q35-virtio-serial.cfg +++ b/docs/config/q35-virtio-serial.cfg @@ -141,7 +141,7 @@ # attached to it. # # We also create an optical disk, mostly for installation -# purposes: once the guest OS has been succesfully +# purposes: once the guest OS has been successfully # installed, the guest will no longer boot from optical # media. If you don't want, or no longer want, to have an # optical disk in the guest you can safely comment out diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 40f136f6be..6ed3fce061 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -37,7 +37,7 @@ over any transport. - tcp migration: do the migration using tcp sockets - unix migration: do the migration using unix sockets - exec migration: do the migration using the stdin/stdout through a process. -- fd migration: do the migration using an file descriptor that is +- fd migration: do the migration using a file descriptor that is passed
