diff options
54 files changed, 94 insertions, 69 deletions
diff --git a/.mailmap b/.mailmap index d94572af05..88fb68143e 100644 --- a/.mailmap +++ b/.mailmap @@ -36,6 +36,8 @@ Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com> Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org> Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com> Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com> +Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de> +Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@kiwi.(none)> # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> @@ -60,6 +62,7 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org> Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org> +Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-trivial@nongnu.org> Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org> BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org> @@ -98,6 +101,7 @@ Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@redhat.com> Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com> Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com> Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com> +Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@weilnetz.de> Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com> Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> diff --git a/audio/pwaudio.c b/audio/pwaudio.c index 3ce5f6507b..3b14e04fbb 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "audio.h" -#include <errno.h> #include "qemu/error-report.h" #include "qapi/error.h" #include <spa/param/audio/format-utils.h> diff --git a/backends/hostmem.c b/backends/hostmem.c index 30f69b2cb5..987f6f591e 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -344,9 +344,11 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES); /* lastbit == MAX_NODES means maxnode = 0 */ unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1); - /* ensure policy won't be ignored in case memory is preallocated + /* + * Ensure policy won't be ignored in case memory is preallocated * before mbind(). note: MPOL_MF_STRICT is ignored on hugepages so - * this doesn't catch hugepage case. */ + * this doesn't catch hugepage case. + */ unsigned flags = MPOL_MF_STRICT | MPOL_MF_MOVE; int mode = backend->policy; @@ -363,7 +365,8 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) return; } - /* We can have up to MAX_NODES nodes, but we need to pass maxnode+1 + /* + * We can have up to MAX_NODES nodes, but we need to pass maxnode+1 * as argument to mbind() due to an old Linux bug (feature?) which * cuts off the last specified node. This means backend->host_nodes * must have MAX_NODES+1 bits available. @@ -391,7 +394,8 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) } } #endif - /* Preallocate memory after the NUMA policy has been instantiated. + /* + * Preallocate memory after the NUMA policy has been instantiated. * This is necessary to guarantee memory is allocated with * specified NUMA policy in place. */ diff --git a/block/blkio.c b/block/blkio.c index 0a0a6c0f5f..bc2f21784c 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -68,7 +68,7 @@ typedef struct { CoQueue bounce_available; /* The value of the "mem-region-alignment" property */ - size_t mem_region_alignment; + uint64_t mem_region_alignment; /* Can we skip adding/deleting blkio_mem_regions? */ bool needs_mem_regions; diff --git a/block/io_uring.c b/block/io_uring.c index d77ae55745..d11b2051ab 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -432,7 +432,7 @@ LuringState *luring_init(Error **errp) rc = io_uring_queue_init(MAX_ENTRIES, ring, 0); if (rc < 0) { - error_setg_errno(errp, errno, "failed to init linux io_uring ring"); + error_setg_errno(errp, -rc, "failed to init linux io_uring ring"); g_free(s); return NULL; } diff --git a/disas/riscv-xthead.c b/disas/riscv-xthead.c index 99da679d16..fcca326d1c 100644 --- a/disas/riscv-xthead.c +++ b/disas/riscv-xthead.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include "disas/riscv.h" #include "disas/riscv-xthead.h" diff --git a/disas/riscv-xventana.c b/disas/riscv-xventana.c index a0224d1fb3..cd694f15f3 100644 --- a/disas/riscv-xventana.c +++ b/disas/riscv-xventana.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include "disas/riscv.h" #include "disas/riscv-xventana.h" diff --git a/disas/riscv.h b/disas/riscv.h index 19e5ed2ce6..16a08e4895 100644 --- a/disas/riscv.h +++ b/disas/riscv.h @@ -7,7 +7,6 @@ #ifndef DISAS_RISCV_H #define DISAS_RISCV_H -#include "qemu/osdep.h" #include "target/riscv/cpu_cfg.h" /* types */ diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 1fc38aed1b..e712c883db 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -162,7 +162,7 @@ Here is an example using demonstration IP and port addresses to more clearly describe the usage. Primary(ip:3.3.3.3): --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown +-netdev tap,id=hn0,vhost=off -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off @@ -177,7 +177,7 @@ Primary(ip:3.3.3.3): -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1 Secondary(ip:3.3.3.8): --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown +-netdev tap,id=hn0,vhost=off -device e1000,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=red0,host=3.3.3.3,port=9003 -chardev socket,id=red1,host=3.3.3.3,port=9004 @@ -202,7 +202,7 @@ Primary(ip:3.3.3.3): -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support Secondary(ip:3.3.3.8): --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown +-netdev tap,id=hn0,vhost=off -device e1000,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=red0,host=3.3.3.3,port=9003 -chardev socket,id=red1,host=3.3.3.3,port=9004 diff --git a/docs/system/keys.rst.inc b/docs/system/keys.rst.inc index bd9b8e5f6f..2e2c97aa23 100644 --- a/docs/system/keys.rst.inc +++ b/docs/system/keys.rst.inc @@ -1,8 +1,9 @@ -During the graphical emulation, you can use special key combinations to -change modes. The default key mappings are shown below, but if you use -``-alt-grab`` then the modifier is Ctrl-Alt-Shift (instead of Ctrl-Alt) -and if you use ``-ctrl-grab`` then the modifier is the right Ctrl key -(instead of Ctrl-Alt): +During the graphical emulation, you can use special key combinations from +the following table to change modes. By default the modifier is Ctrl-Alt +(used in the table below) which can be changed with ``-display`` suboption +``mod=`` where appropriate. For example, ``-display sdl, +grab-mod=lshift-lctrl-lalt`` changes the modifier key to Ctrl-Alt-Shift, +while ``-display sdl,grab-mod=rctrl`` changes it to the right Ctrl key. Ctrl-Alt-f Toggle full screen diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c index b428ec33df..d9340427c3 100644 --- a/dump/dump-hmp-cmds.c +++ b/dump/dump-hmp-cmds.c @@ -41,7 +41,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) dump_format = DUMP_GUEST_MEMORY_FORMAT_WIN_DMP; } - if (zlib && raw) { + if (zlib) { if (raw) { dump_format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB; } else { diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c index ace5266cec..daa3d329d1 100644 --- a/hw/arm/aspeed_eeprom.c +++ b/hw/arm/aspeed_eeprom.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-only */ +#include "qemu/osdep.h" #include "aspeed_eeprom.h" /* Tiogapass BMC FRU */ diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h index bbf9e54365..f08c16ef50 100644 --- a/hw/arm/aspeed_eeprom.h +++ b/hw/arm/aspeed_eeprom.h @@ -7,7 +7,6 @@ #ifndef ASPEED_EEPROM_H #define ASPEED_EEPROM_H -#include "qemu/osdep.h" extern const uint8_t tiogapass_bmc_fruid[]; extern const size_t tiogapass_bmc_fruid_len; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 17aeec7a6f..48febde1cc 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -1008,7 +1008,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) " migration may not work", tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges."); + " or PCI bridges.\n"); } acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE); diff --git a/hw/block/block.c b/hw/block/block.c index 9f52ee6e72..3ceca7dce6 100644 --- a/hw/block/block.c +++ b/hw/block/block.c @@ -30,7 +30,7 @@ static int blk_pread_nonzeroes(BlockBackend *blk, hwaddr size, void *buf) BlockDriverState *bs = blk_bs(blk); for (;;) { - bytes = MIN(size - offset, BDRV_REQUEST_MAX_SECTORS); + bytes = MIN(size - offset, BDRV_REQUEST_MAX_BYTES); if (bytes <= 0) { return 0; } @@ -54,29 +54,30 @@ static int blk_pread_nonzeroes(BlockBackend *blk, hwaddr size, void *buf) * BDRV_REQUEST_MAX_BYTES. * On success, return true. * On failure, store an error through @errp and return false. - * Note that the error messages do not identify the block backend. - * TODO Since callers don't either, this can result in confusing - * errors. + * * This function not intended for actual block devices, which read on * demand. It's for things like memory devices that (ab)use a block * backend to provide persistence. */ -bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size, - Error **errp) +bool blk_check_size_and_read_all(BlockBackend *blk, DeviceState *dev, + void *buf, hwaddr size, Error **errp) { int64_t blk_len; int ret; + g_autofree char *dev_id = NULL; blk_len = blk_getlength(blk); if (blk_len < 0) { error_setg_errno(errp, -blk_len, - "can't get size of block backend"); + "can't get size of %s block backend", blk_name(blk)); return false; } if (blk_len != size) { - error_setg(errp, "device requires %" HWADDR_PRIu " bytes, " - "block backend provides %" PRIu64 " bytes", - size, blk_len); + dev_id = qdev_get_human_name(dev); + error_setg(errp, "%s device '%s' requires %" HWADDR_PRIu + " bytes, %s block backend provides %" PRIu64 " bytes", + object_get_typename(OBJECT(dev)), dev_id, size, + blk_name(blk), blk_len); return false; } @@ -89,7 +90,11 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size, assert(size <= BDRV_REQUEST_MAX_BYTES); ret = blk_pread_nonzeroes(blk, size, buf); if (ret < 0) { - error_setg_errno(errp, -ret, "can't read block backend"); + dev_id = qdev_get_human_name(dev); + error_setg_errno(errp, -ret, "can't read %s block backend" + " for %s device '%s'", + blk_name(blk), object_get_typename(OBJECT(dev)), + dev_id); return false; } return true; diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 26ce895628..0a12030a3a 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -1617,7 +1617,8 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp) trace_m25p80_binding(s); s->storage = blk_blockalign(s->blk, s->size); - if (!blk_check_size_and_read_all(s->blk, s->storage, s->size, errp)) { + if (!blk_check_size_and_read_all(s->blk, DEVICE(s), + s->storage, s->size, errp)) { return; } } else { diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index f956f8bcf7..1bda8424b9 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -848,8 +848,8 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) } if (pfl->blk) { - if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, total_len, - errp)) { + if (!blk_check_size_and_read_all(pfl->blk, dev, pfl->storage, + total_len, errp)) { vmstate_unregister_ram(&pfl->mem, DEVICE(pfl)); return; } diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 6fa56f14c0..2314142373 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -902,7 +902,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) } if (pfl->blk) { - if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, + if (!blk_check_size_and_read_all(pfl->blk, dev, pfl->storage, pfl->chip_len, errp)) { vmstate_unregister_ram(&pfl->orig_mem, DEVICE(pfl)); return; diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 43d863b0c5..c68d0f7c51 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -879,6 +879,14 @@ Object *qdev_get_machine(void) return dev; } +char *qdev_get_human_name(DeviceState *dev) +{ + g_assert(dev != NULL); + + return dev->id ? + g_strdup(dev->id) : object_get_canonical_path(OBJECT(dev)); +} + static MachineInitPhase machine_phase; bool phase_check(MachineInitPhase phase) diff --git a/hw/cxl/cxl-events.c b/hw/cxl/cxl-events.c index bee6dfaf14..affcf8a34d 100644 --- a/hw/cxl/cxl-events.c +++ b/hw/cxl/cxl-events.c @@ -7,11 +7,9 @@ * COPYING file in the top-level directory. */ -#include <stdint.h> - #include "qemu/osdep.h" + #include "qemu/bswap.h" -#include "qemu/typedefs.h" #include "qemu/error-report.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/hyperv/hv-balloon-internal.h b/hw/hyperv/hv-balloon-internal.h index 164c2e5825..ee53a28a26 100644 --- a/hw/hyperv/hv-balloon-internal.h +++ b/hw/hyperv/hv-balloon-internal.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H #define HW_HYPERV_HV_BALLOON_INTERNAL_H -#include "qemu/osdep.h" #define HV_BALLOON_PFN_SHIFT 12 #define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT) diff --git a/hw/hyperv/hv-balloon-our_range_memslots.c b/hw/hyperv/hv-balloon-our_range_memslots.c index 99bae870f3..1505a395cf 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.c +++ b/hw/hyperv/hv-balloon-our_range_memslots.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-our_range_memslots.h" #include "trace.h" diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h index b6f592d34b..df3b686bc7 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.h +++ b/hw/hyperv/hv-balloon-our_range_memslots.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H #define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "qom/object.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.c b/hw/hyperv/hv-balloon-page_range_tree.c index e178d8b413..dfb14852f4 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.c +++ b/hw/hyperv/hv-balloon-page_range_tree.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-page_range_tree.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.h b/hw/hyperv/hv-balloon-page_range_tree.h index 07a9ae0da6..333772b86d 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.h +++ b/hw/hyperv/hv-balloon-page_range_tree.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H -#include "qemu/osdep.h" /* PageRange */ typedef struct PageRange { diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 66f297c1d7..0238365712 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "exec/address-spaces.h" diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 57b402b956..6c4a18dd0e 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -12,6 +12,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "exec/address-spaces.h" +#include "exec/memory.h" #include "sysemu/kvm.h" #include "qemu/bitops.h" #include "qemu/error-report.h" @@ -21,6 +22,9 @@ #include "qemu/rcu_queue.h" #include "hw/hyperv/hyperv.h" #include "qom/object.h" +#include "target/i386/kvm/hyperv-proto.h" +#include "target/i386/cpu.h" +#include "exec/cpu-all.h" struct SynICState { DeviceState parent_obj; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index edc979379c..e990b0ae92 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2697,7 +2697,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) " migration may not work", tables_blob->len, legacy_table_size); error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges."); + " or PCI bridges.\n"); } g_array_set_size(tables_blob, legacy_table_size); } else { @@ -2709,7 +2709,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) " migration may not work", tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges."); + " or PCI bridges.\n"); } acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE); } diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 8b25787227..700abfa7a6 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -40,6 +40,7 @@ #include "hw/irq.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" +#include "target/ppc/cpu.h" void icp_pic_print_info(ICPState *icp, Monitor *mon) { diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index 730bc4a748..a1c4198741 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -509,7 +509,7 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine) " migration may not work", tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges."); + " or PCI bridges.\n"); } acpi_align_size(tables->linker->cmd_blob, ACPI_BUILD_ALIGN_SIZE); diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 4e48baeaa0..58cdcd3121 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index e18cb38bdb..230a669500 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio-acpi.h" #include "hw/acpi/aml-build.h" diff --git a/include/hw/arm/raspberrypi-fw-defs.h b/include/hw/arm/raspberrypi-fw-defs.h index 4551fe7450..579cf0d554 100644 --- a/include/hw/arm/raspberrypi-fw-defs.h +++ b/include/hw/arm/raspberrypi-fw-defs.h @@ -10,7 +10,6 @@ #ifndef INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ #define INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ -#include "qemu/osdep.h" enum rpi_firmware_property_tag { RPI_FWREQ_PROPERTY_END = 0, diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h index 4741f92c46..04fac270b6 100644 --- a/include/hw/audio/asc.h +++ b/include/hw/audio/asc.h @@ -13,7 +13,6 @@ #ifndef HW_AUDIO_ASC_H #define HW_AUDIO_ASC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "audio/audio.h" diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 15fff66435..de3946a5f1 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -88,8 +88,8 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) /* Backend access helpers */ -bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size, - Error **errp); +bool blk_check_size_and_read_all(BlockBackend *blk, DeviceState *dev, + void *buf, hwaddr size, Error **errp); /* Configuration helpers */ diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h index ceb916d16c..04fac25f6c 100644 --- a/include/hw/m68k/q800-glue.h +++ b/include/hw/m68k/q800-glue.h @@ -23,7 +23,6 @@ #ifndef HW_Q800_GLUE_H #define HW_Q800_GLUE_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #define TYPE_GLUE "q800-glue" diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index a1d62cc551..e0571c8a31 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -14,7 +14,6 @@ #define MEMORY_DEVICE_H #include "hw/qdev-core.h" -#include "qemu/typedefs.h" #include "qapi/qapi-types-machine.h" #include "qom/object.h" diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b6553d86fc..b39eb0490f 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -7,7 +7,6 @@ #ifndef FW_CFG_ACPI_H #define FW_CFG_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); diff --git a/include/hw/ppc/spapr_nested.h b/include/hw/ppc/spapr_nested.h index d383486476..d312a5d61d 100644 --- a/include/hw/ppc/spapr_nested.h +++ b/include/hw/ppc/spapr_nested.h @@ -1,7 +1,6 @@ #ifndef HW_SPAPR_NESTED_H #define HW_SPAPR_NESTED_H -#include "qemu/osdep.h" #include "target/ppc/cpu.h" /* diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 151d968238..66338f479f 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -993,6 +993,20 @@ const char *qdev_fw_name(DeviceState *dev); void qdev_assert_realized_properly(void); Object *qdev_get_machine(void); +/** + * qdev_get_human_name() - Return a human-readable name for a device + * @dev: The device. Must be a valid and non-NULL pointer. + * + * .. note:: + * This function is intended for user friendly error messages. + * + * Returns: A newly allocated string containing the device id if not null, + * else the object canonical path. + * + * Use g_free() to free it. + */ +char *qdev_get_human_name(DeviceState *dev); + /* FIXME: make this a link<> */ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp); diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index 844e102569..cace2a315f 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -6,7 +6,6 @@ #ifndef VIRTIO_ACPI_H #define VIRTIO_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base, diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h index 4e9904f1a6..4b1d728f35 100644 --- a/include/hw/xen/xen-hvm-common.h +++ b/include/hw/xen/xen-hvm-common.h @@ -1,7 +1,6 @@ #ifndef HW_XEN_HVM_COMMON_H #define HW_XEN_HVM_COMMON_H -#include "qemu/osdep.h" #include "qemu/units.h" #include "cpu.h" diff --git a/include/qemu/qtree.h b/include/qemu/qtree.h index 69fe74b50d..dc2b14d258 100644 --- a/include/qemu/qtree.h +++ b/include/qemu/qtree.h @@ -42,7 +42,6 @@ #ifndef QEMU_QTREE_H #define QEMU_QTREE_H -#include "qemu/osdep.h" #ifdef HAVE_GLIB_WITH_SLICE_ALLOCATOR diff --git a/include/ui/rect.h b/include/ui/rect.h index 68f05d78a8..7ebf47ebcd 100644 --- a/include/ui/rect.h +++ b/include/ui/rect.h @@ -4,8 +4,6 @@ #ifndef QEMU_RECT_H #define QEMU_RECT_H -#include <stdint.h> -#include <stdbool.h> typedef struct QemuRect { int16_t x; diff --git a/net/af-xdp.c b/net/af-xdp.c index 6c65028fb0..38e600703a 100644 --- a/net/af-xdp.c +++ b/net/af-xdp.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include <bpf/bpf.h> -#include <inttypes.h> #include <linux/if_link.h> #include <linux/if_xdp.h> #include <net/if.h> diff --git a/plugins/core.c b/plugins/core.c index 49588285dd..ee2fa41af9 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -27,7 +27,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "plugin.h" -#include "qemu/compiler.h" struct qemu_plugin_cb { struct qemu_plugin_ctx *ctx; diff --git a/plugins/loader.c b/plugins/loader.c index 734c11cae0..9768b78eb6 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -33,7 +33,6 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #endif -#include "qemu/compiler.h" #include "plugin.h" diff --git a/qapi/migration.json b/qapi/migration.json index d3e2b864c5..819708321d 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -534,7 +534,7 @@ # Features: # # @deprecated: Member @block is deprecated. Use blockdev-mirror with -# NBD instead. Member @compression is deprecated because it is +# NBD instead. Member @compress is deprecated because it is # unreliable and untested. It is recommended to use multifd # migration, which offers an alternative compression # implementation that is reliable and tested. diff --git a/qemu-options.hx b/qemu-options.hx index ced8284863..484cc21c1f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5462,7 +5462,7 @@ SRST KVM COLO primary: - -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown + -netdev tap,id=hn0,vhost=off -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off @@ -5477,7 +5477,7 @@ SRST -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1 secondary: - -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown + -netdev tap,id=hn0,vhost=off -device e1000,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=red0,host=3.3.3.3,port=9003 -chardev socket,id=red1,host=3.3.3.3,port=9004 @@ -5488,7 +5488,7 @@ SRST Xen COLO primary: - -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown + -netdev tap,id=hn0,vhost=off -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off @@ -5504,7 +5504,7 @@ SRST -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,notify_dev=nofity_way,iothread=iothread1 secondary: - -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown + -netdev tap,id=hn0,vhost=off -device e1000,netdev=hn0,mac=52:a4:00:12:78:66 -chardev socket,id=red0,host=3.3.3.3,port=9003 -chardev socket,id=red1,host=3.3.3.3,port=9004 diff --git a/scripts/clean-includes b/scripts/clean-includes index 58e1607a82..bdbf404024 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -51,7 +51,7 @@ GIT=no DUPHEAD=no # Extended regular expression defining files to ignore when using --all -XDIRREGEX='^(tests/tcg|tests/multiboot|pc-bios)' +XDIRREGEX='^(tests/tcg|tests/multiboot|tests/fp|tests/plugin|tests/uefi-test-tools|pc-bios|subprojects|contrib/plugins|tools/ebpf|ebpf/rss.bpf.skeleton.h|linux-user/(mips64|x86_64)/(cpu_loop|signal).c)' while true do diff --git a/target/riscv/vector_internals.c b/target/riscv/vector_internals.c index 9cf5c17cde..12f5964fbb 100644 --- a/target/riscv/vector_internals.c +++ b/target/riscv/vector_internals.c @@ -16,6 +16,7 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "vector_internals.h" /* set agnostic elements to 1s */ diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internals.h index 8133111e5f..842765f6c1 100644 --- a/target/riscv/vector_internals.h +++ b/target/riscv/vector_internals.h @@ -19,7 +19,6 @@ #ifndef TARGET_RISCV_VECTOR_INTERNALS_H #define TARGET_RISCV_VECTOR_INTERNALS_H -#include "qemu/osdep.h" #include "qemu/bitops.h" #include "cpu.h" #include "tcg/tcg-gvec-desc.h" diff --git a/tests/qtest/qtest_aspeed.h b/tests/qtest/qtest_aspeed.h index 235dfaa186..d35b0c7cba 100644 --- a/tests/qtest/qtest_aspeed.h +++ b/tests/qtest/qtest_aspeed.h @@ -12,8 +12,6 @@ #ifndef QTEST_ASPEED_H #define QTEST_ASPEED_H -#include <stdint.h> - #include "libqtest.h" #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000 diff --git a/util/userfaultfd.c b/util/userfaultfd.c index fdff4867e8..1b2fa949d4 100644 --- a/util/userfaultfd.c +++ b/util/userfaultfd.c @@ -18,7 +18,6 @@ #include <poll.h> #include <sys/syscall.h> #include <sys/ioctl.h> -#include <fcntl.h> typedef enum { UFFD_UNINITIALIZED = 0, |