qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4bd802: Clean up includes


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 4bd802: Clean up includes
Date: Thu, 10 Dec 2020 09:13:17 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 4bd802b209cff612d1a99674a91895b735be8630
      
https://github.com/qemu/qemu/commit/4bd802b209cff612d1a99674a91895b735be8630
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M contrib/vhost-user-gpu/virgl.c
    M contrib/vhost-user-gpu/vugbm.c
    M contrib/vhost-user-gpu/vugbm.h
    M contrib/vhost-user-gpu/vugpu.h
    M contrib/vhost-user-input/main.c
    M hw/display/artist.c
    M hw/s390x/s390-pci-vfio.c
    M include/hw/block/swim.h
    M include/hw/display/macfb.h
    M include/qemu/nvdimm-utils.h
    M tests/qtest/fuzz/fuzz.h
    M tests/qtest/fuzz/generic_fuzz_configs.h
    M tools/virtiofsd/buffer.c
    M tools/virtiofsd/fuse_common.h
    M tools/virtiofsd/fuse_log.c
    M tools/virtiofsd/fuse_log.h
    M tools/virtiofsd/fuse_lowlevel.c
    M tools/virtiofsd/fuse_lowlevel.h
    M tools/virtiofsd/fuse_misc.h
    M tools/virtiofsd/fuse_opt.c
    M tools/virtiofsd/fuse_signals.c
    M tools/virtiofsd/fuse_virtio.c
    M tools/virtiofsd/helper.c
    M tools/virtiofsd/passthrough_ll.c
    M tools/virtiofsd/passthrough_seccomp.c
    M tools/virtiofsd/passthrough_seccomp.h
    M util/nvdimm-utils.c

  Log Message:
  -----------
  Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes, with the changes
to the following files manually reverted:

    contrib/libvhost-user/libvhost-user-glib.h
    contrib/libvhost-user/libvhost-user.c
    contrib/libvhost-user/libvhost-user.h
    contrib/plugins/hotblocks.c
    contrib/plugins/hotpages.c
    contrib/plugins/howvec.c
    contrib/plugins/lockstep.c
    linux-user/mips64/cpu_loop.c
    linux-user/mips64/signal.c
    linux-user/sparc64/cpu_loop.c
    linux-user/sparc64/signal.c
    linux-user/x86_64/cpu_loop.c
    linux-user/x86_64/signal.c
    target/s390x/gen-features.c
    tests/fp/platform.h
    tests/migration/s390x/a-b-bios.c
    tests/plugin/bb.c
    tests/plugin/empty.c
    tests/plugin/insn.c
    tests/plugin/mem.c
    tests/test-rcu-simpleq.c
    tests/test-rcu-slist.c
    tests/test-rcu-tailq.c
    tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c

contrib/plugins/, tests/plugin/, and tests/test-rcu-slist.c appear not
to include osdep.h intentionally.  The remaining reverts are the same
as in commit bbfff19688d.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113061216.2483385-1-armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Alexander Bulekov <alxndr@bu.edu>


  Commit: ac114d5cd593b428074b5978e9a80efd812210e5
      
https://github.com/qemu/qemu/commit/ac114d5cd593b428074b5978e9a80efd812210e5
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M include/qapi/qmp/qerror.h

  Log Message:
  -----------
  qerror: Drop unused QERR_ macros

QERR_INVALID_BLOCK_FORMAT is dead since commit e6641719fe "block:
Always pass NULL as drv for bdrv_open()", 2015-09-14.

QERR_INVALID_PASSWORD is dead since commit c01c214b69 "block: remove
all encryption handling APIs", 2017-07-11.

Bury them.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: f820af87433af84c13cd260807b59bbce47e2f0a
      
https://github.com/qemu/qemu/commit/f820af87433af84c13cd260807b59bbce47e2f0a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M include/qapi/qmp/qerror.h
    M monitor/misc.c
    M net/net.c

  Log Message:
  -----------
  qerror: Eliminate QERR_ macros used in just one place

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-3-armbru@redhat.com>


  Commit: b0d7be2a62eecade217fa45521be18149346eaa1
      
https://github.com/qemu/qemu/commit/b0d7be2a62eecade217fa45521be18149346eaa1
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M blockdev.c
    M include/qapi/qmp/qerror.h
    M tests/qemu-iotests/040

  Log Message:
  -----------
  block: Improve some block-commit, block-stream error messages

block-commit defaults @base-node to the deepest backing image.  When
there is none, it fails with "Base 'NULL' not found".  Improve to
"There is no backing image".

block-commit and block-stream reject a @base argument that doesn't
resolve with "Base 'BASE' not found".  Commit 6b33f3ae8b "qemu-img:
Improve commit invalid base message" improved this message in
qemu-img.  Improve it here, too: "Can't find '%s' in the backing
chain".

QERR_BASE_NOT_FOUND is now unused.  Drop.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-4-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>


  Commit: 9272186d3dbfc770993195f480422fdf058896c5
      
https://github.com/qemu/qemu/commit/9272186d3dbfc770993195f480422fdf058896c5
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M include/qapi/qmp/qerror.h
    M monitor/qmp-cmds.c

  Log Message:
  -----------
  ui: Improve some set_passwd, expire_password error messages

set_passwd and expire_password reject invalid "protocol" with "Invalid
parameter 'protocol'".  Misleading; the parameter is valid, its value
isn't.  Improve to "Parameter 'protocol' expects 'vnc' or 'spice'".

expire_password fails with "Could not set password".  Misleading;
improve to "Could not set password expire time".

QERR_SET_PASSWD_FAILED is now unused.  Drop.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-5-armbru@redhat.com>


  Commit: 9e1b9c6c2d909d399ced0379e7095716c611b0f9
      
https://github.com/qemu/qemu/commit/9e1b9c6c2d909d399ced0379e7095716c611b0f9
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M include/qapi/qmp/qerror.h
    M monitor/misc.c

  Log Message:
  -----------
  ui: Improve a client_migrate_info error message

client_migrate_info reports spice_server_migrate_connect() failure as
"An undefined error has occurred".  Improve to "Could not set up
display for migration".

QERR_UNDEFINED_ERROR is now unused.  Drop.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-6-armbru@redhat.com>


  Commit: 99750d82e43e3825ded46b41828552d357f346bc
      
https://github.com/qemu/qemu/commit/99750d82e43e3825ded46b41828552d357f346bc
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M monitor/misc.c

  Log Message:
  -----------
  ui: Tweak a client_migrate_info error message

Change

    Parameter 'protocol' expects spice

to

    Parameter 'protocol' expects 'spice'

for consistency with similar error messages elsewhere.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-7-armbru@redhat.com>


  Commit: ac84b0fa2857383ca25e86970fb12a067e56f66c
      
https://github.com/qemu/qemu/commit/ac84b0fa2857383ca25e86970fb12a067e56f66c
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: Replace an unreachable error by abort()

check_suspend_mode()'s error message

    Parameter 'mode' expects GuestSuspendMode

makes no sense to users: GuestSuspendMode is a C enum.  Fortunately,
it is unreachable.  Replace it by abort().

Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-8-armbru@redhat.com>


  Commit: 9fc0ab5c9ca6bd3d3179a85a5cff18d709550bf5
      
https://github.com/qemu/qemu/commit/9fc0ab5c9ca6bd3d3179a85a5cff18d709550bf5
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: Tweak a guest-shutdown error message

Change

    Parameter 'mode' expects halt|powerdown|reboot

to

    Parameter 'mode' expects 'halt', 'powerdown', or 'reboot'

for consistency with similar error messages elsewhere.

Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-9-armbru@redhat.com>


  Commit: 74b97760dcb20aa03189dc63f0ff79eb3516b5ee
      
https://github.com/qemu/qemu/commit/74b97760dcb20aa03189dc63f0ff79eb3516b5ee
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M qom/qom-qmp-cmds.c

  Log Message:
  -----------
  qom: Improve {qom,device}-list-properties error messages

device-list-properties reports

    Parameter 'typename' expects device

when @typename exists, but isn't a TYPE_DEVICE.  Improve this to

    Parameter 'typename' expects a non-abstract device type

qom-list-properties reports

    Parameter 'typename' expects object

when @typename exists, but isn't a TYPE_OBJECT.  Improve this to

    Parameter 'typename' expects a QOM type

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-10-armbru@redhat.com>


  Commit: 6cc0667d9b2b17fb4058cc30c49db5aa53eb7605
      
https://github.com/qemu/qemu/commit/6cc0667d9b2b17fb4058cc30c49db5aa53eb7605
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M block/quorum.c
    M blockdev.c
    M chardev/char.c
    M hw/core/qdev-properties-system.c
    M softmmu/qdev-monitor.c

  Log Message:
  -----------
  Tweak a few "Parameter 'NAME' expects THING" error message

Change to "expects a THING" where that's an obvious improvement

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-11-armbru@redhat.com>


  Commit: 9bc6e893b728cc2991d2aaec093ba8313b6128c8
      
https://github.com/qemu/qemu/commit/9bc6e893b728cc2991d2aaec093ba8313b6128c8
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M qapi/block-core.json
    M qapi/block-export.json
    M qapi/block.json
    M qapi/char.json
    M qapi/control.json
    M qapi/machine-target.json
    M qapi/machine.json
    M qapi/migration.json
    M qapi/misc-target.json
    M qapi/misc.json
    M qapi/net.json
    M qapi/pci.json
    M qapi/qdev.json
    M qapi/run-state.json
    M qapi/ui.json

  Log Message:
  -----------
  qapi: Normalize version references x.y.0 to just x.y

We use x.y most of the time, and x.y.0 sometimes.  Normalize for
consistency.

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201118064158.3359056-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>


  Commit: 4eb79bdf87206a223a7ad7a698af519d2ec75c14
      
https://github.com/qemu/qemu/commit/4eb79bdf87206a223a7ad7a698af519d2ec75c14
  Author: Zihao Chang <changzihao1@huawei.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M docs/devel/writing-qmp-commands.txt

  Log Message:
  -----------
  docs/devel/writing-qmp-commands.txt: Fix docs

Fix the example of add qmp hello-world example.
Without ":", make will report error:
../qapi/misc.json:573:2: line should end with ':'

Signed-off-by: Zihao Chang <changzihao1@huawei.com>
Message-Id: <20201201143308.1626-1-changzihao1@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 2ecfc0657afa5d29a373271b342f704a1a3c6737
      
https://github.com/qemu/qemu/commit/2ecfc0657afa5d29a373271b342f704a1a3c6737
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M block/quorum.c
    M blockdev.c
    M chardev/char.c
    M contrib/vhost-user-gpu/virgl.c
    M contrib/vhost-user-gpu/vugbm.c
    M contrib/vhost-user-gpu/vugbm.h
    M contrib/vhost-user-gpu/vugpu.h
    M contrib/vhost-user-input/main.c
    M docs/devel/writing-qmp-commands.txt
    M hw/core/qdev-properties-system.c
    M hw/display/artist.c
    M hw/s390x/s390-pci-vfio.c
    M include/hw/block/swim.h
    M include/hw/display/macfb.h
    M include/qapi/qmp/qerror.h
    M include/qemu/nvdimm-utils.h
    M monitor/misc.c
    M monitor/qmp-cmds.c
    M net/net.c
    M qapi/block-core.json
    M qapi/block-export.json
    M qapi/block.json
    M qapi/char.json
    M qapi/control.json
    M qapi/machine-target.json
    M qapi/machine.json
    M qapi/migration.json
    M qapi/misc-target.json
    M qapi/misc.json
    M qapi/net.json
    M qapi/pci.json
    M qapi/qdev.json
    M qapi/run-state.json
    M qapi/ui.json
    M qga/commands-win32.c
    M qom/qom-qmp-cmds.c
    M softmmu/qdev-monitor.c
    M tests/qemu-iotests/040
    M tests/qtest/fuzz/fuzz.h
    M tests/qtest/fuzz/generic_fuzz_configs.h
    M tools/virtiofsd/buffer.c
    M tools/virtiofsd/fuse_common.h
    M tools/virtiofsd/fuse_log.c
    M tools/virtiofsd/fuse_log.h
    M tools/virtiofsd/fuse_lowlevel.c
    M tools/virtiofsd/fuse_lowlevel.h
    M tools/virtiofsd/fuse_misc.h
    M tools/virtiofsd/fuse_opt.c
    M tools/virtiofsd/fuse_signals.c
    M tools/virtiofsd/fuse_virtio.c
    M tools/virtiofsd/helper.c
    M tools/virtiofsd/passthrough_ll.c
    M tools/virtiofsd/passthrough_seccomp.c
    M tools/virtiofsd/passthrough_seccomp.h
    M util/nvdimm-utils.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-12-10' into 
staging

Miscellaneous patches for 2020-12-10

# gpg: Signature made Thu 10 Dec 2020 16:17:43 GMT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2020-12-10:
  docs/devel/writing-qmp-commands.txt: Fix docs
  qapi: Normalize version references x.y.0 to just x.y
  Tweak a few "Parameter 'NAME' expects THING" error message
  qom: Improve {qom,device}-list-properties error messages
  qga: Tweak a guest-shutdown error message
  qga: Replace an unreachable error by abort()
  ui: Tweak a client_migrate_info error message
  ui: Improve a client_migrate_info error message
  ui: Improve some set_passwd, expire_password error messages
  block: Improve some block-commit, block-stream error messages
  qerror: Eliminate QERR_ macros used in just one place
  qerror: Drop unused QERR_ macros
  Clean up includes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/d13843ba8a5c...2ecfc0657afa



reply via email to

[Prev in Thread] Current Thread [Next in Thread]