diff options
| author | Peter Maydell | 2022-03-19 11:10:27 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-03-19 11:10:27 +0100 |
| commit | c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b (patch) | |
| tree | ccccd6561efebf18f6537852149fae23af6a06a0 /hw/pci | |
| parent | Merge tag 'pull-target-arm-20220318' of https://git.linaro.org/people/pmaydel... (diff) | |
| parent | virtio/virtio-balloon: Prefer Object* over void* parameter (diff) | |
| download | qemu-c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b.tar.gz qemu-c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b.tar.xz qemu-c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b.zip | |
Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging
Trivial branch pull request 20220318
# gpg: Signature made Fri 18 Mar 2022 13:42:58 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu:
virtio/virtio-balloon: Prefer Object* over void* parameter
hw/pci/pci.c: Fix typos of "Firewire", and of "controller" on same line
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci')
| -rw-r--r-- | hw/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 5cb1232e27..dae9119bfe 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1697,7 +1697,7 @@ static const pci_class_desc pci_class_descriptions[] = { 0x0902, "Mouse", "mouse"}, { 0x0A00, "Dock station", "dock", 0x00ff}, { 0x0B00, "i386 cpu", "cpu", 0x00ff}, - { 0x0c00, "Fireware contorller", "fireware"}, + { 0x0c00, "Firewire controller", "firewire"}, { 0x0c01, "Access bus controller", "access-bus"}, { 0x0c02, "SSA controller", "ssa"}, { 0x0c03, "USB controller", "usb"}, |