[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 237924: coroutine: Clean up superfluous inclu
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 237924: coroutine: Clean up superfluous inclusion of qemu/... |
|
Date: |
Fri, 20 Jan 2023 08:17:54 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 23792478103f444e34621de0ac3b19ef648ae752
https://github.com/qemu/qemu/commit/23792478103f444e34621de0ac3b19ef648ae752
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-19 (Thu, 19 Jan 2023)
Changed paths:
M blockjob.c
M crypto/block-luks-priv.h
M crypto/block-luks.c
M hw/9pfs/codir.c
M hw/9pfs/cofile.c
M hw/9pfs/cofs.c
M hw/9pfs/coxattr.c
M include/block/raw-aio.h
M include/scsi/pr-manager.h
M nbd/nbd-internal.h
M tests/unit/test-coroutine.c
M tests/unit/test-vmstate.c
M util/qemu-coroutine-lock.c
M util/qemu-coroutine-sleep.c
M util/qemu-coroutine.c
Log Message:
-----------
coroutine: Clean up superfluous inclusion of qemu/coroutine.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221221131435.3851212-2-armbru@redhat.com>
Commit: af7f8eb591b45e9a950f2622b96640ff1f2a6794
https://github.com/qemu/qemu/commit/af7f8eb591b45e9a950f2622b96640ff1f2a6794
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-19 (Thu, 19 Jan 2023)
Changed paths:
M include/block/aio_task.h
M include/block/block-common.h
M include/block/graph-lock.h
M include/monitor/hmp.h
M include/qemu/coroutine.h
M include/qemu/osdep.h
Log Message:
-----------
coroutine: Move coroutine_fn to qemu/osdep.h, trim includes
block/block-hmp-cmds.h and qemu/co-shared-resource.h use coroutine_fn
without including qemu/coroutine.h. They compile only if it's already
included from elsewhere.
I could fix that, but pulling in qemu/coroutine.h and everything it
includes just for a macro that expands into nothing feels silly.
Instead, move the macro to qemu/osdep.h.
Inclusions of qemu/coroutine.h just for coroutine_fn become
superfluous. Drop them.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221221131435.3851212-3-armbru@redhat.com>
Commit: df4bbc9dcb09d9e3a385ca1a2a23daad0819f531
https://github.com/qemu/qemu/commit/df4bbc9dcb09d9e3a385ca1a2a23daad0819f531
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-19 (Thu, 19 Jan 2023)
Changed paths:
M block/progress_meter.c
M include/qemu/progress_meter.h
M tests/unit/test-coroutine.c
Log Message:
-----------
coroutine: Clean up superfluous inclusion of qemu/lockable.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221221131435.3851212-4-armbru@redhat.com>
Commit: 68ba85cecc7a46ceb66c2f4b5e2165546821d062
https://github.com/qemu/qemu/commit/68ba85cecc7a46ceb66c2f4b5e2165546821d062
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M accel/tcg/debuginfo.h
M hw/9pfs/coth.h
M include/block/aio.h
M include/io/channel.h
A include/qemu/coroutine-core.h
M include/qemu/coroutine.h
M include/qemu/lockable.h
M include/qemu/typedefs.h
M nbd/client-connection.c
M tests/unit/test-aio.c
M ui/console.c
Log Message:
-----------
coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h
qemu/coroutine.h and qemu/lockable.h include each other.
They need each other only in macro expansions, so we could simply drop
both inclusions to break the loop, and add suitable includes to files
that expand the macros.
Instead, move a part of qemu/coroutine.h to new qemu/coroutine-core.h
so that qemu/coroutine-core.h doesn't need qemu/lockable.h, and
qemu/lockable.h only needs qemu/coroutine-core.h. Result:
qemu/coroutine.h includes qemu/lockable.h includes
qemu/coroutine-core.h.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221221131435.3851212-5-armbru@redhat.com>
[Semantic rebase conflict with 7c10cb38cc "accel/tcg: Add debuginfo
support" resolved]
Commit: 436956013539c19cf781ae333bc1c125d728cf1f
https://github.com/qemu/qemu/commit/436956013539c19cf781ae333bc1c125d728cf1f
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M include/block/aio.h
M util/async.c
Log Message:
-----------
coroutine: Use Coroutine typedef name instead of structure tag
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221131435.3851212-6-armbru@redhat.com>
Commit: e2c1c34f139f49ef909bb4322607fb8b39002312
https://github.com/qemu/qemu/commit/e2c1c34f139f49ef909bb4322607fb8b39002312
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M block.c
M block/amend.c
M block/backup.c
M block/blkdebug.c
M block/blklogwrites.c
M block/blkreplay.c
M block/blkverify.c
M block/block-copy.c
M block/bochs.c
M block/cloop.c
M block/copy-before-write.c
M block/copy-on-read.c
M block/curl.c
M block/dirty-bitmap.c
M block/dmg.c
M block/export/fuse.c
M block/file-posix.c
M block/file-win32.c
M block/filter-compress.c
M block/gluster.c
M block/io.c
M block/iscsi.c
M block/mirror.c
M block/monitor/bitmap-qmp-cmds.c
M block/nfs.c
M block/null.c
M block/nvme.c
M block/parallels-ext.c
M block/preallocate.c
M block/qapi-sysemu.c
M block/qapi.c
M block/qcow2-bitmap.c
M block/qcow2-cache.c
M block/qcow2-cluster.c
M block/qcow2-refcount.c
M block/qcow2-threads.c
M block/qcow2.c
M block/qed-check.c
M block/qed-table.c
M block/raw-format.c
M block/rbd.c
M block/ssh.c
M block/throttle.c
M block/vhdx-log.c
M block/vvfat.c
M block/win32-aio.c
M block/write-threshold.c
M blockdev.c
M blockjob.c
M hw/block/block.c
M hw/sparc64/niagara.c
M hw/virtio/virtio-pmem.c
M include/block/block-common.h
M include/block/block-copy.h
M include/block/block-global-state.h
M include/block/block-hmp-cmds.h
M include/block/block-io.h
M include/block/block.h
M include/block/block_backup.h
M include/block/block_int-common.h
M include/block/block_int-global-state.h
M include/block/block_int-io.h
M include/block/block_int.h
M include/block/blockjob.h
M include/block/blockjob_int.h
M include/block/dirty-bitmap.h
M include/block/qapi.h
M include/block/thread-pool.h
M include/block/throttle-groups.h
M include/sysemu/block-backend-io.h
M migration/block-dirty-bitmap.c
M migration/block.c
M migration/savevm.c
M monitor/qmp-cmds.c
M nbd/server.c
M qemu-img.c
M scripts/block-coroutine-wrapper.py
M softmmu/cpus.c
M softmmu/physmem.c
M storage-daemon/qemu-storage-daemon.c
M target/i386/kvm/kvm.c
M tests/unit/test-bdrv-drain.c
M tests/unit/test-block-iothread.c
Log Message:
-----------
include/block: Untangle inclusion loops
We have two inclusion loops:
block/block.h
-> block/block-global-state.h
-> block/block-common.h
-> block/blockjob.h
-> block/block.h
block/block.h
-> block/block-io.h
-> block/block-common.h
-> block/blockjob.h
-> block/block.h
I believe these go back to Emanuele's reorganization of the block API,
merged a few months ago in commit d7e2fe4aac8.
Fortunately, breaking them is merely a matter of deleting unnecessary
includes from headers, and adding them back in places where they are
now missing.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221221133551.3967339-2-armbru@redhat.com>
Commit: 1881f336a33a8a99cb17ab1c57ed953682e8e107
https://github.com/qemu/qemu/commit/1881f336a33a8a99cb17ab1c57ed953682e8e107
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M hw/sparc64/niagara.c
Log Message:
-----------
hw/sparc64/niagara: Use blk_name() instead of open-coding it
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221133551.3967339-3-armbru@redhat.com>
Commit: 82651e8792344ccc526f505fdf1c8c56f0d18881
https://github.com/qemu/qemu/commit/82651e8792344ccc526f505fdf1c8c56f0d18881
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M include/hw/block/swim.h
Log Message:
-----------
include/hw/block: Include hw/block/block.h where needed
hw/block/swim.h needs BlockConf.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221133551.3967339-4-armbru@redhat.com>
Commit: 2c6fe2e2140965d93d0f950f80eee8e559b760f3
https://github.com/qemu/qemu/commit/2c6fe2e2140965d93d0f950f80eee8e559b760f3
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M hw/intc/pnv_xive.c
M hw/intc/pnv_xive2.c
M hw/pci-host/pnv_phb3.c
M hw/pci-host/pnv_phb4_pec.c
M hw/ppc/pnv.c
M hw/ppc/pnv_core.c
M hw/ppc/pnv_homer.c
M hw/ppc/pnv_lpc.c
M hw/ppc/pnv_xscom.c
M include/hw/ppc/pnv.h
A include/hw/ppc/pnv_chip.h
Log Message:
-----------
include/hw/ppc: Split pnv_chip.h off pnv.h
PnvChipClass, PnvChip, Pnv8Chip, Pnv9Chip, and Pnv10Chip are defined
in pnv.h. Many users of the header don't actually need them. One
instance is this inclusion loop: hw/ppc/pnv_homer.h includes
hw/ppc/pnv.h for typedef PnvChip, and vice versa for struct PnvHomer.
Similar structs live in their own headers: PnvHomerClass and PnvHomer
in pnv_homer.h, PnvLpcClass and PnvLpcController in pci_lpc.h,
PnvPsiClass, PnvPsi, Pnv8Psi, Pnv9Psi, Pnv10Psi in pnv_psi.h, ...
Move PnvChipClass, PnvChip, Pnv8Chip, Pnv9Chip, and Pnv10Chip to new
pnv_chip.h, and adjust include directives. This breaks the inclusion
loop mentioned above.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20221222104628.659681-2-armbru@redhat.com>
Commit: 14f11a204cdc2ccb44d82ebb6f9646becca0178a
https://github.com/qemu/qemu/commit/14f11a204cdc2ccb44d82ebb6f9646becca0178a
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M include/hw/ppc/pnv_lpc.h
M include/hw/ppc/pnv_occ.h
M include/hw/ppc/pnv_pnor.h
M include/hw/ppc/pnv_sbe.h
M include/hw/ppc/pnv_xscom.h
M include/hw/ppc/xive2.h
M include/hw/ppc/xive2_regs.h
Log Message:
-----------
include/hw/ppc: Supply a few missing includes
A few headers neglect to include headers they need. They compile only
if something else includes the required header(s) first. Fix that.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20221222104628.659681-3-armbru@redhat.com>
Commit: c0a5a477f148d8cb8e47dda36601032a3f5aa991
https://github.com/qemu/qemu/commit/c0a5a477f148d8cb8e47dda36601032a3f5aa991
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M hw/ppc/pnv_psi.c
M include/hw/pci-host/pnv_phb4.h
M include/hw/ppc/pnv.h
Log Message:
-----------
include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h
The next commit needs to include hw/ppc/pnv.h from
hw/pci-host/pnv_phb.h. Avoid an inclusion loop.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20221222104628.659681-4-armbru@redhat.com>
Commit: b6c80037ed3ba275eea2b33bc17e36af2b89813a
https://github.com/qemu/qemu/commit/b6c80037ed3ba275eea2b33bc17e36af2b89813a
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M hw/pci-host/pnv_phb.h
M include/hw/pci-host/pnv_phb3.h
M include/hw/pci-host/pnv_phb4.h
M include/hw/ppc/pnv_core.h
M include/hw/ppc/pnv_homer.h
M include/hw/ppc/pnv_lpc.h
M include/hw/ppc/pnv_xive.h
Log Message:
-----------
include/hw/ppc include/hw/pci-host: Drop extra typedefs
PnvChip is typedef'ed in five places, and PnvPhb4PecState in two.
Keep one, drop the others.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20221222104628.659681-5-armbru@redhat.com>
Commit: fcb7e040f5c69ca1f0678f991ab5354488a9e192
https://github.com/qemu/qemu/commit/fcb7e040f5c69ca1f0678f991ab5354488a9e192
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2023-01-20 (Fri, 20 Jan 2023)
Changed paths:
M accel/tcg/debuginfo.h
M block.c
M block/amend.c
M block/backup.c
M block/blkdebug.c
M block/blklogwrites.c
M block/blkreplay.c
M block/blkverify.c
M block/block-copy.c
M block/bochs.c
M block/cloop.c
M block/copy-before-write.c
M block/copy-on-read.c
M block/curl.c
M block/dirty-bitmap.c
M block/dmg.c
M block/export/fuse.c
M block/file-posix.c
M block/file-win32.c
M block/filter-compress.c
M block/gluster.c
M block/io.c
M block/iscsi.c
M block/mirror.c
M block/monitor/bitmap-qmp-cmds.c
M block/nfs.c
M block/null.c
M block/nvme.c
M block/parallels-ext.c
M block/preallocate.c
M block/progress_meter.c
M block/qapi-sysemu.c
M block/qapi.c
M block/qcow2-bitmap.c
M block/qcow2-cache.c
M block/qcow2-cluster.c
M block/qcow2-refcount.c
M block/qcow2-threads.c
M block/qcow2.c
M block/qed-check.c
M block/qed-table.c
M block/raw-format.c
M block/rbd.c
M block/ssh.c
M block/throttle.c
M block/vhdx-log.c
M block/vvfat.c
M block/win32-aio.c
M block/write-threshold.c
M blockdev.c
M blockjob.c
M crypto/block-luks-priv.h
M crypto/block-luks.c
M hw/9pfs/codir.c
M hw/9pfs/cofile.c
M hw/9pfs/cofs.c
M hw/9pfs/coth.h
M hw/9pfs/coxattr.c
M hw/block/block.c
M hw/intc/pnv_xive.c
M hw/intc/pnv_xive2.c
M hw/pci-host/pnv_phb.h
M hw/pci-host/pnv_phb3.c
M hw/pci-host/pnv_phb4_pec.c
M hw/ppc/pnv.c
M hw/ppc/pnv_core.c
M hw/ppc/pnv_homer.c
M hw/ppc/pnv_lpc.c
M hw/ppc/pnv_psi.c
M hw/ppc/pnv_xscom.c
M hw/sparc64/niagara.c
M hw/virtio/virtio-pmem.c
M include/block/aio.h
M include/block/aio_task.h
M include/block/block-common.h
M include/block/block-copy.h
M include/block/block-global-state.h
M include/block/block-hmp-cmds.h
M include/block/block-io.h
M include/block/block.h
M include/block/block_backup.h
M include/block/block_int-common.h
M include/block/block_int-global-state.h
M include/block/block_int-io.h
M include/block/block_int.h
M include/block/blockjob.h
M include/block/blockjob_int.h
M include/block/dirty-bitmap.h
M include/block/graph-lock.h
M include/block/qapi.h
M include/block/raw-aio.h
M include/block/thread-pool.h
M include/block/throttle-groups.h
M include/hw/block/swim.h
M include/hw/pci-host/pnv_phb3.h
M include/hw/pci-host/pnv_phb4.h
M include/hw/ppc/pnv.h
A include/hw/ppc/pnv_chip.h
M include/hw/ppc/pnv_core.h
M include/hw/ppc/pnv_homer.h
M include/hw/ppc/pnv_lpc.h
M include/hw/ppc/pnv_occ.h
M include/hw/ppc/pnv_pnor.h
M include/hw/ppc/pnv_sbe.h
M include/hw/ppc/pnv_xive.h
M include/hw/ppc/pnv_xscom.h
M include/hw/ppc/xive2.h
M include/hw/ppc/xive2_regs.h
M include/io/channel.h
M include/monitor/hmp.h
A include/qemu/coroutine-core.h
M include/qemu/coroutine.h
M include/qemu/lockable.h
M include/qemu/osdep.h
M include/qemu/progress_meter.h
M include/qemu/typedefs.h
M include/scsi/pr-manager.h
M include/sysemu/block-backend-io.h
M migration/block-dirty-bitmap.c
M migration/block.c
M migration/savevm.c
M monitor/qmp-cmds.c
M nbd/client-connection.c
M nbd/nbd-internal.h
M nbd/server.c
M qemu-img.c
M scripts/block-coroutine-wrapper.py
M softmmu/cpus.c
M softmmu/physmem.c
M storage-daemon/qemu-storage-daemon.c
M target/i386/kvm/kvm.c
M tests/unit/test-aio.c
M tests/unit/test-bdrv-drain.c
M tests/unit/test-block-iothread.c
M tests/unit/test-coroutine.c
M tests/unit/test-vmstate.c
M ui/console.c
M util/async.c
M util/qemu-coroutine-lock.c
M util/qemu-coroutine-sleep.c
M util/qemu-coroutine.c
Log Message:
-----------
Merge tag 'pull-include-2023-01-20' of https://repo.or.cz/qemu/armbru into
staging
Header cleanup patches for 2023-01-20
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmPKN6YSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTPeoQAIKl/BF6PFRNq0/k3vPqMe6nltjgkpa/
# p7E5qRlo31RCeUB+f0iW26mySnNTgYkE28yy57HxUML/9Lp1bbxyDgRNiJ406a4L
# kFVF04kOIFez1+mfvWN92DZqcl/EAAqNL6XqSFyO38kYwcsFsi+BZ7DLZbL9Ea8v
# wVywB96mN6KyrLWCJ2D0OqIVuPHSHol+5zt9e6+ShBgN0FfElLbv0F4KH3VJ1olA
# psKl6w6V9+c2zV1kT/H+S763m6mQdwtVo/UuOJoElI+Qib/UBxDOrhdYf4Zg7hKf
# ByUuhJUASm8y9yD/42mFs90B6eUNzLSBC8v1PgRqSqDHtllveP4RysklBlyIMlOs
# DKtqEuRuIJ/qDXliIFHY6tBnUkeITSd7BCxkQYfaGyaSOcviDSlE3AyaaBC0sY4F
# P/lTTiRg5ksvhDYtJnW3mSfmT2PY7aBtyE3D1Z84v9hek6D0reMQTE97yL/j4m7P
# wJP8aM3Z8GILCVxFIh02wmqWZhZUCGsIDS/vxVm+u060n66qtDIQFBoazsFJrCME
# eWI+qDNDr6xhLegeYajGDM9pdpQc3x0siiuHso4wMSI9NZxwP+tkCVhTpqmrRcs4
# GSH/4IlUXqEZdUQDL38DfA22C1TV8BzyMhGLTUERWWYki1sr99yv0pdFyk5r3nLB
# SURwr58rB2zo
# =dOfq
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Jan 2023 06:41:42 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
* tag 'pull-include-2023-01-20' of https://repo.or.cz/qemu/armbru:
include/hw/ppc include/hw/pci-host: Drop extra typedefs
include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h
include/hw/ppc: Supply a few missing includes
include/hw/ppc: Split pnv_chip.h off pnv.h
include/hw/block: Include hw/block/block.h where needed
hw/sparc64/niagara: Use blk_name() instead of open-coding it
include/block: Untangle inclusion loops
coroutine: Use Coroutine typedef name instead of structure tag
coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h
coroutine: Clean up superfluous inclusion of qemu/lockable.h
coroutine: Move coroutine_fn to qemu/osdep.h, trim includes
coroutine: Clean up superfluous inclusion of qemu/coroutine.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/70d17c3eedef...fcb7e040f5c6