From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 19 Mar 2022 10:10:27 +0000 (+0000)
Subject: Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b;p=qemu.git

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>
---

c9020c8e6c0d8eedb7f66b75bfb8c3c03a16b14b