ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trivial branch pull request 20220318 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmI0jGISHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748HD4QAI8SssJeZlP8ksg7iLrGT8f54/aK+jrC
 Z++bmw8+qbIKaeWL8WiFurnScrGT/fNojfABg4R98EQTmNjx4hBc5tEEq7XQ3rdF
 jAkf3R8vx7Ugfm0ZAVYvLTfvlf6Kt+MFJ0HX60dnWPUTdQgDrD1R2P43aUZ2rVae
 aF98R+KfevPI6ru0YDWwez2TdP4X8bo0QpmUnotIN3Khfsvc5YbaFZ9H1++Sp2/y
 a03t9luHyzarcDZwpyaPMc+dXr9nSQTQJ0gq2qyk6BemaztG7JZQC2JR1BIrIjXS
 uFkebwg3SV6VTfYjssmOe+YaTgjitNER+5i0/H39oq5LBb71IFytbnsCd0ueUxxh
 z11gtjeJNQjgze5m17CUV0qQcdx/iqS3nparjWOtpv+Kfi8YmIBClh6AiavfNcds
 GdOjkAVYcrAEF+FpBz5chL1aPuCVATpDkpUToRXQzyKVCqyRRp/7BaFIetcgBsr5
 Fwc60prole8yeGqA4428N0mjA4UPEaspt/xpULbo+6/eSTygWIPGQCHxpKO/kEnS
 N37TcX6fwICin6ABRM2A6WxQQ1mk3YMtv++dLv8z4BRT1fvStmlnZqqFIabNZaEw
 uTZXvJpPg+r8Sxt6iDrDNbpxI9Rkxzdz4CkY0aBu0eldG0alRSfRDKWQear42/j3
 i4EivwTIhV1R
 =wVIT
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2022-03-19 10:10:27 +00:00
parent a09863610a a2d860bb54
commit c9020c8e6c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pci/pci.c
View File

@ -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"},

10
hw/virtio/virtio-balloon.c
View File

@ -242,7 +242,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
Error *err = NULL;
VirtIOBalloon *s = opaque;
VirtIOBalloon *s = VIRTIO_BALLOON(obj);
int i;
if (!visit_start_struct(v, name, NULL, 0, &err)) {
@ -277,7 +277,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v,
const char *name, void *opaque,
Error **errp)
{
VirtIOBalloon *s = opaque;
VirtIOBalloon *s = VIRTIO_BALLOON(obj);
visit_type_int(v, name, &s->stats_poll_interval, errp);
}
@ -285,7 +285,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v,
const char *name, void *opaque,
Error **errp)
{
VirtIOBalloon *s = opaque;
VirtIOBalloon *s = VIRTIO_BALLOON(obj);
int64_t value;
if (!visit_type_int(v, name, &value, errp)) {
@ -1015,12 +1015,12 @@ static void virtio_balloon_instance_init(Object *obj)
s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;
object_property_add(obj, "guest-stats", "guest statistics",
balloon_stats_get_all, NULL, NULL, s);
balloon_stats_get_all, NULL, NULL, NULL);
object_property_add(obj, "guest-stats-polling-interval", "int",
balloon_stats_get_poll_interval,
balloon_stats_set_poll_interval,
NULL, s);
NULL, NULL);
}
static const VMStateDescription vmstate_virtio_balloon = {