From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWWo-0006ll-Sf for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:56:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSWWg-0007c3-15 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:56:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWWf-0007bm-Oq for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:56:41 -0400 From: Stefan Hajnoczi Date: Tue, 25 Mar 2014 15:51:33 +0100 Message-Id: <1395759095-11276-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1395759095-11276-1-git-send-email-stefanha@redhat.com> References: <1395759095-11276-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0 3/5] Fixed various typos List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Deepak Kathayat , Anthony Liguori From: Deepak Kathayat Signed-off-by: Deepak Kathayat Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Stefan Hajnoczi --- block/gluster.c | 2 +- block/qcow.c | 2 +- block/sheepdog.c | 8 ++++---- block/vdi.c | 2 +- block/vhdx-log.c | 2 +- slirp/tftp.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index a44d612..8836085 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -80,7 +80,7 @@ static int parse_volume_options(GlusterConf *gconf, cha= r *path) * 'server' specifies the server where the volume file specification for * the given volume resides. This can be either hostname, ipv4 address * or ipv6 address. ipv6 address needs to be within square brackets [ ]. - * If transport type is 'unix', then 'server' field should not be specif= ed. + * If transport type is 'unix', then 'server' field should not be specif= ied. * The 'socket' field needs to be populated with the path to unix domain * socket. * diff --git a/block/qcow.c b/block/qcow.c index 1e128be..d5a7d5f 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -723,7 +723,7 @@ static int qcow_create(const char *filename, QEMUOpti= onParameter *options, backing_file =3D NULL; } header.cluster_bits =3D 9; /* 512 byte cluster to avoid copying - unmodifyed sectors */ + unmodified sectors */ header.l2_bits =3D 12; /* 32 KB L2 tables */ } else { header.cluster_bits =3D 12; /* 4 KB clusters */ diff --git a/block/sheepdog.c b/block/sheepdog.c index f7bd024..0eb33ee 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -909,9 +909,9 @@ static void co_write_request(void *opaque) } =20 /* - * Return a socket discriptor to read/write objects. + * Return a socket descriptor to read/write objects. * - * We cannot use this discriptor for other operations because + * We cannot use this descriptor for other operations because * the block driver may be on waiting response from the server. */ static int get_sheep_fd(BDRVSheepdogState *s) @@ -1896,7 +1896,7 @@ static int sd_create_branch(BDRVSheepdogState *s) =20 /* * Even If deletion fails, we will just create extra snapshot based = on - * the workding VDI which was supposed to be deleted. So no need to + * the working VDI which was supposed to be deleted. So no need to * false bail out. */ deleted =3D sd_delete(s); @@ -2194,7 +2194,7 @@ cleanup: * We implement rollback(loadvm) operation to the specified snapshot by * 1) switch to the snapshot * 2) rely on sd_create_branch to delete working VDI and - * 3) create a new working VDI based on the speicified snapshot + * 3) create a new working VDI based on the specified snapshot */ static int sd_snapshot_goto(BlockDriverState *bs, const char *snapshot_i= d) { diff --git a/block/vdi.c b/block/vdi.c index ae49cd8..ac9a025 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -31,7 +31,7 @@ * Allocation of blocks could be optimized (less writes to block map and * header). * - * Read and write of adjacents blocks could be done in one operation + * Read and write of adjacent blocks could be done in one operation * (current code uses one operation per block (1 MiB). * * The code is not thread safe (missing locks for changes in header and diff --git a/block/vhdx-log.c b/block/vhdx-log.c index 02755b8..a77c040 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -578,7 +578,7 @@ static int vhdx_validate_log_entry(BlockDriverState *= bs, BDRVVHDXState *s, total_sectors =3D hdr.entry_length / VHDX_LOG_SECTOR_SIZE; =20 =20 - /* read_desc() will incrememnt the read idx */ + /* read_desc() will increment the read idx */ ret =3D vhdx_log_read_desc(bs, s, log, &desc_buffer); if (ret < 0) { goto free_and_exit; diff --git a/slirp/tftp.c b/slirp/tftp.c index 1a79c45..a329fb2 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -279,7 +279,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp= _t *tp, int pktlen) =20 spt =3D &slirp->tftp_sessions[s]; =20 - /* unspecifed prefix means service disabled */ + /* unspecified prefix means service disabled */ if (!slirp->tftp_prefix) { tftp_send_error(spt, 2, "Access violation", tp); return; --=20 1.8.5.3