diff options
| author | Peter Maydell | 2016-05-19 10:27:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-19 10:27:28 +0200 |
| commit | 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch) | |
| tree | 93a1691d7a5d90ddbb77a3210299089fcede4947 /hw/scsi | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160517' into staging (diff) | |
| parent | Fix some typos found by codespell (diff) | |
| download | qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.xz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18
# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
Fix some typos found by codespell
9p: drop unused declaration from coth.h
smbios: fix typo
accel: make configure_accelerator return void
configure: Use uniform description for devel packages
ipack: Update e-mail address
util: fix comment typos
qdict: fix unbounded stack warning for qdict_array_entries
Fix typo in variable name (found and fixed by codespell)
vl: fix comment about when parsing cpu definitions
loader: fix potential memory leak
remove comment for nonexistent structure member
s390: remove misleading comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi')
| -rw-r--r-- | hw/scsi/spapr_vscsi.c | 2 | ||||
| -rw-r--r-- | hw/scsi/vmw_pvscsi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index b00edf7fd4..8fbd50f660 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -698,7 +698,7 @@ static void vscsi_inquiry_no_target(VSCSIState *s, vscsi_req *req) uint8_t resp_data[36]; int rc, len, alen; - /* We dont do EVPD. Also check that page_code is 0 */ + /* We don't do EVPD. Also check that page_code is 0 */ if ((cdb[1] & 0x01) || cdb[2] != 0) { /* Send INVALID FIELD IN CDB */ vscsi_makeup_sense(s, req, ILLEGAL_REQUEST, 0x24, 0); diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e690b4ec08..f67b5bf7d3 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -63,7 +63,7 @@ typedef struct PVSCSIClass { #define PVSCSI_DEVICE_GET_CLASS(obj) \ OBJECT_GET_CLASS(PVSCSIClass, (obj), TYPE_PVSCSI) -/* Compatability flags for migration */ +/* Compatibility flags for migration */ #define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 #define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) |