diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-25 09:54:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-25 09:54:47 +0000 |
| commit | 7d8df3272dfb2021380c5f1392c7508a111318d3 (patch) | |
| tree | c22c84976174ca37c1a5ac4140362661084429e1 /include | |
| parent | feff02089113839d233e40a9bd7134241de12d1d (diff) | |
| parent | 285816d76f37c412f391fa14a2b28a35b7cb134e (diff) | |
| download | qemu-7d8df3272dfb2021380c5f1392c7508a111318d3.zip qemu-7d8df3272dfb2021380c5f1392c7508a111318d3.tar.gz qemu-7d8df3272dfb2021380c5f1392c7508a111318d3.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
- Some typo and UTF-8 fixes
- a ppc e6500 fix to remove duplicate SPR registering
# gpg: Signature made Thu 24 Jan 2019 12:48:05 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-patches-pull-request:
hw/i386/pc.c: fix one typo in function name
virtio-net: Fix a typo
ppc: e6500 registers SPR 604 twice
contrib/gitdm: Fix a typo
MAINTAINERS: Fix utf-8 mangling
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index bd66275..a1a0be3 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -94,7 +94,7 @@ typedef struct VirtioNetRscUnit { uint16_t payload; /* pure payload without virtio/eth/ip/tcp */ } VirtioNetRscUnit; -/* Coalesced segmant */ +/* Coalesced segment */ typedef struct VirtioNetRscSeg { QTAILQ_ENTRY(VirtioNetRscSeg) next; void *buf; |