misc/other: spelling fixes
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
01dc06511d
commit
0a19d87995
@ -238,7 +238,7 @@ struct ptm_lockstorage {
|
|||||||
} req; /* request */
|
} req; /* request */
|
||||||
struct {
|
struct {
|
||||||
ptm_res tpm_result;
|
ptm_res tpm_result;
|
||||||
} resp; /* reponse */
|
} resp; /* response */
|
||||||
} u;
|
} u;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -710,7 +710,7 @@ static void tcp_chr_telnet_init(Chardev *chr)
|
|||||||
|
|
||||||
if (!s->is_tn3270) {
|
if (!s->is_tn3270) {
|
||||||
init->buflen = 12;
|
init->buflen = 12;
|
||||||
/* Prep the telnet negotion to put telnet in binary,
|
/* Prep the telnet negotiation to put telnet in binary,
|
||||||
* no echo, single char mode */
|
* no echo, single char mode */
|
||||||
IACSET(init->buf, 0xff, 0xfb, 0x01); /* IAC WILL ECHO */
|
IACSET(init->buf, 0xff, 0xfb, 0x01); /* IAC WILL ECHO */
|
||||||
IACSET(init->buf, 0xff, 0xfb, 0x03); /* IAC WILL Suppress go ahead */
|
IACSET(init->buf, 0xff, 0xfb, 0x03); /* IAC WILL Suppress go ahead */
|
||||||
@ -718,7 +718,7 @@ static void tcp_chr_telnet_init(Chardev *chr)
|
|||||||
IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO Binary */
|
IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO Binary */
|
||||||
} else {
|
} else {
|
||||||
init->buflen = 21;
|
init->buflen = 21;
|
||||||
/* Prep the TN3270 negotion based on RFC1576 */
|
/* Prep the TN3270 negotiation based on RFC1576 */
|
||||||
IACSET(init->buf, 0xff, 0xfd, 0x19); /* IAC DO EOR */
|
IACSET(init->buf, 0xff, 0xfd, 0x19); /* IAC DO EOR */
|
||||||
IACSET(init->buf, 0xff, 0xfb, 0x19); /* IAC WILL EOR */
|
IACSET(init->buf, 0xff, 0xfb, 0x19); /* IAC WILL EOR */
|
||||||
IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO BINARY */
|
IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO BINARY */
|
||||||
@ -1298,7 +1298,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Validate any options which have a dependancy on client vs server */
|
/* Validate any options which have a dependency on client vs server */
|
||||||
if (!sock->has_server || sock->server) {
|
if (!sock->has_server || sock->server) {
|
||||||
if (sock->has_reconnect) {
|
if (sock->has_reconnect) {
|
||||||
error_setg(errp,
|
error_setg(errp,
|
||||||
|
@ -1115,7 +1115,7 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* change successfull, clean up */
|
/* change successful, clean up */
|
||||||
chr_new->handover_yank_instance = false;
|
chr_new->handover_yank_instance = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -73,7 +73,7 @@ qcrypto_afalg_comm_alloc(const char *type, const char *name,
|
|||||||
QCryptoAFAlg *afalg;
|
QCryptoAFAlg *afalg;
|
||||||
|
|
||||||
afalg = g_new0(QCryptoAFAlg, 1);
|
afalg = g_new0(QCryptoAFAlg, 1);
|
||||||
/* initilize crypto API socket */
|
/* initialize crypto API socket */
|
||||||
afalg->opfd = -1;
|
afalg->opfd = -1;
|
||||||
afalg->tfmfd = qcrypto_afalg_socket_bind(type, name, errp);
|
afalg->tfmfd = qcrypto_afalg_socket_bind(type, name, errp);
|
||||||
if (afalg->tfmfd == -1) {
|
if (afalg->tfmfd == -1) {
|
||||||
|
@ -244,7 +244,7 @@ qcrypto_block_luks_has_format(const uint8_t *buf,
|
|||||||
*
|
*
|
||||||
* When calculating ESSIV IVs, the cipher length used by ESSIV
|
* When calculating ESSIV IVs, the cipher length used by ESSIV
|
||||||
* may be different from the cipher length used for the block
|
* may be different from the cipher length used for the block
|
||||||
* encryption, becauses dm-crypt uses the hash digest length
|
* encryption, because dm-crypt uses the hash digest length
|
||||||
* as the key size. ie, if you have AES 128 as the block cipher
|
* as the key size. ie, if you have AES 128 as the block cipher
|
||||||
* and SHA 256 as ESSIV hash, then ESSIV will use AES 256 as
|
* and SHA 256 as ESSIV hash, then ESSIV will use AES 256 as
|
||||||
* the cipher since that gets a key length matching the digest
|
* the cipher since that gets a key length matching the digest
|
||||||
@ -393,7 +393,7 @@ qcrypto_block_luks_from_disk_endian(QCryptoBlockLUKSHeader *hdr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Stores the main LUKS header, taking care of endianess
|
* Stores the main LUKS header, taking care of endianness
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
qcrypto_block_luks_store_header(QCryptoBlock *block,
|
qcrypto_block_luks_store_header(QCryptoBlock *block,
|
||||||
@ -423,7 +423,7 @@ qcrypto_block_luks_store_header(QCryptoBlock *block,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Loads the main LUKS header,and byteswaps it to native endianess
|
* Loads the main LUKS header, and byteswaps it to native endianness
|
||||||
* And run basic sanity checks on it
|
* And run basic sanity checks on it
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
|
@ -76,7 +76,7 @@ enum QCryptoDERTagEnc {
|
|||||||
/**
|
/**
|
||||||
* qcrypto_der_encode_length:
|
* qcrypto_der_encode_length:
|
||||||
* @src_len: the length of source data
|
* @src_len: the length of source data
|
||||||
* @dst: distination to save the encoded 'length', if dst is NULL, only compute
|
* @dst: destination to save the encoded 'length', if dst is NULL, only compute
|
||||||
* the expected buffer size in bytes.
|
* the expected buffer size in bytes.
|
||||||
* @dst_len: output parameter, indicates how many bytes wrote.
|
* @dst_len: output parameter, indicates how many bytes wrote.
|
||||||
*
|
*
|
||||||
|
@ -249,7 +249,7 @@ void qcrypto_der_encode_octet_str(QCryptoEncodeContext *ctx,
|
|||||||
* Start encoding a octet string, All fields between
|
* Start encoding a octet string, All fields between
|
||||||
* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end
|
* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end
|
||||||
* are encoded as an octet string. This is useful when we need to encode a
|
* are encoded as an octet string. This is useful when we need to encode a
|
||||||
* encoded SEQUNCE as OCTET STRING.
|
* encoded SEQUENCE as OCTET STRING.
|
||||||
*/
|
*/
|
||||||
void qcrypto_der_encode_octet_str_begin(QCryptoEncodeContext *ctx);
|
void qcrypto_der_encode_octet_str_begin(QCryptoEncodeContext *ctx);
|
||||||
|
|
||||||
@ -260,7 +260,7 @@ void qcrypto_der_encode_octet_str_begin(QCryptoEncodeContext *ctx);
|
|||||||
* Finish encoding a octet string, All fields between
|
* Finish encoding a octet string, All fields between
|
||||||
* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end
|
* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end
|
||||||
* are encoded as an octet string. This is useful when we need to encode a
|
* are encoded as an octet string. This is useful when we need to encode a
|
||||||
* encoded SEQUNCE as OCTET STRING.
|
* encoded SEQUENCE as OCTET STRING.
|
||||||
*/
|
*/
|
||||||
void qcrypto_der_encode_octet_str_end(QCryptoEncodeContext *ctx);
|
void qcrypto_der_encode_octet_str_end(QCryptoEncodeContext *ctx);
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ size_t qcrypto_der_encode_ctx_buffer_len(QCryptoEncodeContext *ctx);
|
|||||||
/**
|
/**
|
||||||
* qcrypto_der_encode_ctx_flush_and_free:
|
* qcrypto_der_encode_ctx_flush_and_free:
|
||||||
* @ctx: the encode context.
|
* @ctx: the encode context.
|
||||||
* @dst: the distination to save the encoded data, the length of dst should
|
* @dst: the destination to save the encoded data, the length of dst should
|
||||||
* not less than qcrypto_der_encode_cxt_buffer_len
|
* not less than qcrypto_der_encode_cxt_buffer_len
|
||||||
*
|
*
|
||||||
* Flush all encoded data into dst, then free ctx.
|
* Flush all encoded data into dst, then free ctx.
|
||||||
|
@ -197,7 +197,7 @@ static void *connect_thread_func(void *opaque)
|
|||||||
* conn->updated_info will finally be returned to the user. Clear the
|
* conn->updated_info will finally be returned to the user. Clear the
|
||||||
* pointers to our internally allocated strings, which are IN parameters
|
* pointers to our internally allocated strings, which are IN parameters
|
||||||
* of nbd_receive_negotiate() and therefore nbd_connect(). Caller
|
* of nbd_receive_negotiate() and therefore nbd_connect(). Caller
|
||||||
* shoudn't be interested in these fields.
|
* shouldn't be interested in these fields.
|
||||||
*/
|
*/
|
||||||
conn->updated_info.x_dirty_bitmap = NULL;
|
conn->updated_info.x_dirty_bitmap = NULL;
|
||||||
conn->updated_info.name = NULL;
|
conn->updated_info.name = NULL;
|
||||||
|
@ -74,7 +74,7 @@ void net_checksum_calculate(uint8_t *data, int length, int csum_flag)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Handle the optionnal VLAN headers */
|
/* Handle the optional VLAN headers */
|
||||||
switch (lduw_be_p(&PKT_GET_ETH_HDR(data)->h_proto)) {
|
switch (lduw_be_p(&PKT_GET_ETH_HDR(data)->h_proto)) {
|
||||||
case ETH_P_VLAN:
|
case ETH_P_VLAN:
|
||||||
mac_hdr_len = sizeof(struct eth_header) +
|
mac_hdr_len = sizeof(struct eth_header) +
|
||||||
@ -96,7 +96,7 @@ void net_checksum_calculate(uint8_t *data, int length, int csum_flag)
|
|||||||
|
|
||||||
length -= mac_hdr_len;
|
length -= mac_hdr_len;
|
||||||
|
|
||||||
/* Now check we have an IP header (with an optionnal VLAN header) */
|
/* Now check we have an IP header (with an optional VLAN header) */
|
||||||
if (length < sizeof(struct ip_header)) {
|
if (length < sizeof(struct ip_header)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -91,8 +91,8 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
|
|||||||
next = netfilter_next(nf, direction);
|
next = netfilter_next(nf, direction);
|
||||||
while (next) {
|
while (next) {
|
||||||
/*
|
/*
|
||||||
* if qemu_netfilter_pass_to_next been called, means that
|
* if qemu_netfilter_pass_to_next has been called, it means that
|
||||||
* the packet has been hold by filter and has already retured size
|
* the packet was held by a filter and has already returned size
|
||||||
* to the sender, so sent_cb shouldn't be called later, just
|
* to the sender, so sent_cb shouldn't be called later, just
|
||||||
* pass NULL to next.
|
* pass NULL to next.
|
||||||
*/
|
*/
|
||||||
|
@ -821,7 +821,7 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
|
|||||||
* According to virtio_net_reset(), device turns promiscuous mode
|
* According to virtio_net_reset(), device turns promiscuous mode
|
||||||
* on by default.
|
* on by default.
|
||||||
*
|
*
|
||||||
* Addtionally, according to VirtIO standard, "Since there are
|
* Additionally, according to VirtIO standard, "Since there are
|
||||||
* no guarantees, it can use a hash filter or silently switch to
|
* no guarantees, it can use a hash filter or silently switch to
|
||||||
* allmulti or promiscuous mode if it is given too many addresses.".
|
* allmulti or promiscuous mode if it is given too many addresses.".
|
||||||
* QEMU marks `n->mac_table.uni_overflow` if guest sets too many
|
* QEMU marks `n->mac_table.uni_overflow` if guest sets too many
|
||||||
@ -1130,7 +1130,7 @@ static int vhost_vdpa_net_excessive_mac_filter_cvq_add(VhostVDPAState *s,
|
|||||||
* Pack the non-multicast MAC addresses part for fake CVQ command.
|
* Pack the non-multicast MAC addresses part for fake CVQ command.
|
||||||
*
|
*
|
||||||
* According to virtio_net_handle_mac(), QEMU doesn't verify the MAC
|
* According to virtio_net_handle_mac(), QEMU doesn't verify the MAC
|
||||||
* addresses provieded in CVQ command. Therefore, only the entries
|
* addresses provided in CVQ command. Therefore, only the entries
|
||||||
* field need to be prepared in the CVQ command.
|
* field need to be prepared in the CVQ command.
|
||||||
*/
|
*/
|
||||||
mac_ptr = out->iov_base + cursor;
|
mac_ptr = out->iov_base + cursor;
|
||||||
@ -1141,7 +1141,7 @@ static int vhost_vdpa_net_excessive_mac_filter_cvq_add(VhostVDPAState *s,
|
|||||||
* Pack the multicast MAC addresses part for fake CVQ command.
|
* Pack the multicast MAC addresses part for fake CVQ command.
|
||||||
*
|
*
|
||||||
* According to virtio_net_handle_mac(), QEMU doesn't verify the MAC
|
* According to virtio_net_handle_mac(), QEMU doesn't verify the MAC
|
||||||
* addresses provieded in CVQ command. Therefore, only the entries
|
* addresses provided in CVQ command. Therefore, only the entries
|
||||||
* field need to be prepared in the CVQ command.
|
* field need to be prepared in the CVQ command.
|
||||||
*/
|
*/
|
||||||
mac_ptr = out->iov_base + cursor;
|
mac_ptr = out->iov_base + cursor;
|
||||||
@ -1202,7 +1202,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq,
|
|||||||
* rejects the flawed CVQ command.
|
* rejects the flawed CVQ command.
|
||||||
*
|
*
|
||||||
* Therefore, QEMU must handle this situation instead of sending
|
* Therefore, QEMU must handle this situation instead of sending
|
||||||
* the CVQ command direclty.
|
* the CVQ command directly.
|
||||||
*/
|
*/
|
||||||
dev_written = vhost_vdpa_net_excessive_mac_filter_cvq_add(s, elem,
|
dev_written = vhost_vdpa_net_excessive_mac_filter_cvq_add(s, elem,
|
||||||
&out);
|
&out);
|
||||||
|
Loading…
Reference in New Issue
Block a user