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

trivial patches for 2024-01-31 

-----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmW6NScPHG1qdEB0bHMu
 bXNrLnJ1AAoJEHAbT2saaT5ZdQYH/2fhfhZotH0V2qAcMxlOoHbAE9UhZNRsSYtf
 QFP0GXFYFAMm7LHkPUbvKgO7LylKWAOMn/zKZqgj1Vf1EpoKQ2FwLtR/buDz86Ec
 pi2OrDPRA7Ay5c3ow3YZZkUOhQTTcR5rNjYctPtt/J4j8ol/z5vre7weJIg2bCJe
 zI7vIVg7iFFzbkXY20KHngJ5nDC+aEm7WaGlxAP8kfkvy324Wy9O2k8qu2J5zbLT
 HGvh3rwEDvRTYe4CaKFFHWNV0m4092HAr/dJBobugI5VZ6QQpK6Tgy8N+4ZrCHD2
 SjUKeym85VTOYGuY8b18fk5MQK2SzsfBUJ4x8VGC75W4mJ8agdc=
 =HImO
 -----END PGP SIGNATURE-----

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-01-31

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmW6NScPHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5ZdQYH/2fhfhZotH0V2qAcMxlOoHbAE9UhZNRsSYtf
# QFP0GXFYFAMm7LHkPUbvKgO7LylKWAOMn/zKZqgj1Vf1EpoKQ2FwLtR/buDz86Ec
# pi2OrDPRA7Ay5c3ow3YZZkUOhQTTcR5rNjYctPtt/J4j8ol/z5vre7weJIg2bCJe
# zI7vIVg7iFFzbkXY20KHngJ5nDC+aEm7WaGlxAP8kfkvy324Wy9O2k8qu2J5zbLT
# HGvh3rwEDvRTYe4CaKFFHWNV0m4092HAr/dJBobugI5VZ6QQpK6Tgy8N+4ZrCHD2
# SjUKeym85VTOYGuY8b18fk5MQK2SzsfBUJ4x8VGC75W4mJ8agdc=
# =HImO
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 31 Jan 2024 11:55:19 GMT
# gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg:                issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: (21 commits)
  hw/hyperv: Include missing headers
  hw/intc/xics: Include missing 'cpu.h' header
  hw/arm: Add `\n` to hint message
  hw/loongarch: Add `\n` to hint message
  hw/i386: Add `\n` to hint message
  backends/hostmem: Fix block comments style (checkpatch.pl warnings)
  misc: Clean up includes
  riscv: Clean up includes
  cxl: Clean up includes
  include: Clean up includes
  m68k: Clean up includes
  acpi: Clean up includes
  aspeed: Clean up includes
  disas/riscv: Clean up includes
  hyperv: Clean up includes
  scripts/clean-includes: Update exclude list
  mailmap: Fix Stefan Weil email
  qemu-docs: Update options for graphical frontends
  qapi/migration.json: Fix the member name for MigrationCapability
  colo: examples: remove mentions of script= and (wrong) downscript=
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-01-31 19:53:45 +00:00
parent 24f920ad5a 54f0058fa7
commit 14639717bf
45 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mailmap
View File

@ -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> Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com> 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> 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: # There is also a:
# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> # (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> 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> 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-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> 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> 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> Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com>
Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com> Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com>
Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.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> Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>

1
audio/pwaudio.c
View File

@ -11,7 +11,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "audio.h" #include "audio.h"
#include <errno.h>
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>

12
backends/hostmem.c
View File

@ -344,9 +344,11 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES); unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES);
/* lastbit == MAX_NODES means maxnode = 0 */ /* lastbit == MAX_NODES means maxnode = 0 */
unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1); 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 * 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; unsigned flags = MPOL_MF_STRICT | MPOL_MF_MOVE;
int mode = backend->policy; int mode = backend->policy;
@ -363,7 +365,8 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
return; 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 * as argument to mbind() due to an old Linux bug (feature?) which
* cuts off the last specified node. This means backend->host_nodes * cuts off the last specified node. This means backend->host_nodes
* must have MAX_NODES+1 bits available. * must have MAX_NODES+1 bits available.
@ -391,7 +394,8 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
} }
} }
#endif #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 * This is necessary to guarantee memory is allocated with
* specified NUMA policy in place. * specified NUMA policy in place.
*/ */

1
disas/riscv-xthead.c
View File

@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#include "qemu/osdep.h"
#include "disas/riscv.h" #include "disas/riscv.h"
#include "disas/riscv-xthead.h" #include "disas/riscv-xthead.h"

1
disas/riscv-xventana.c
View File

@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#include "qemu/osdep.h"
#include "disas/riscv.h" #include "disas/riscv.h"
#include "disas/riscv-xventana.h" #include "disas/riscv-xventana.h"

1
disas/riscv.h
View File

@ -7,7 +7,6 @@
#ifndef DISAS_RISCV_H #ifndef DISAS_RISCV_H
#define DISAS_RISCV_H #define DISAS_RISCV_H
#include "qemu/osdep.h"
#include "target/riscv/cpu_cfg.h" #include "target/riscv/cpu_cfg.h"
/* types */ /* types */

6
docs/colo-proxy.txt
View File

@ -162,7 +162,7 @@ Here is an example using demonstration IP and port addresses to more
clearly describe the usage. clearly describe the usage.
Primary(ip:3.3.3.3): 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 -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=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 -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 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
Secondary(ip:3.3.3.8): 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 -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=red0,host=3.3.3.3,port=9003
-chardev socket,id=red1,host=3.3.3.3,port=9004 -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 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
Secondary(ip:3.3.3.8): 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 -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=red0,host=3.3.3.3,port=9003
-chardev socket,id=red1,host=3.3.3.3,port=9004 -chardev socket,id=red1,host=3.3.3.3,port=9004

11
docs/system/keys.rst.inc
View File

@ -1,8 +1,9 @@
During the graphical emulation, you can use special key combinations to During the graphical emulation, you can use special key combinations from
change modes. The default key mappings are shown below, but if you use the following table to change modes. By default the modifier is Ctrl-Alt
``-alt-grab`` then the modifier is Ctrl-Alt-Shift (instead of Ctrl-Alt) (used in the table below) which can be changed with ``-display`` suboption
and if you use ``-ctrl-grab`` then the modifier is the right Ctrl key ``mod=`` where appropriate. For example, ``-display sdl,
(instead of Ctrl-Alt): 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 Ctrl-Alt-f
Toggle full screen Toggle full screen

2
dump/dump-hmp-cmds.c
View File

@ -41,7 +41,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)
dump_format = DUMP_GUEST_MEMORY_FORMAT_WIN_DMP; dump_format = DUMP_GUEST_MEMORY_FORMAT_WIN_DMP;
} }
if (zlib && raw) { if (zlib) {
if (raw) { if (raw) {
dump_format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB; dump_format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB;
} else { } else {

1
hw/arm/aspeed_eeprom.c
View File

@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-only * SPDX-License-Identifier: GPL-2.0-only
*/ */
#include "qemu/osdep.h"
#include "aspeed_eeprom.h" #include "aspeed_eeprom.h"
/* Tiogapass BMC FRU */ /* Tiogapass BMC FRU */

1
hw/arm/aspeed_eeprom.h
View File

@ -7,7 +7,6 @@
#ifndef ASPEED_EEPROM_H #ifndef ASPEED_EEPROM_H
#define ASPEED_EEPROM_H #define ASPEED_EEPROM_H
#include "qemu/osdep.h"
extern const uint8_t tiogapass_bmc_fruid[]; extern const uint8_t tiogapass_bmc_fruid[];
extern const size_t tiogapass_bmc_fruid_len; extern const size_t tiogapass_bmc_fruid_len;

2
hw/arm/virt-acpi-build.c
View File

@ -1008,7 +1008,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
" migration may not work", " migration may not work",
tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2);
error_printf("Try removing CPUs, NUMA nodes, memory slots" 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); acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE);

4
hw/cxl/cxl-events.c
View File

@ -7,11 +7,9 @@
* COPYING file in the top-level directory. * COPYING file in the top-level directory.
*/ */
#include <stdint.h>
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "qemu/typedefs.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/pci/msix.h" #include "hw/pci/msix.h"

1
hw/hyperv/hv-balloon-internal.h
View File

@ -10,7 +10,6 @@
#ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H #ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H
#define 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_PFN_SHIFT 12
#define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT) #define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT)

1
hw/hyperv/hv-balloon-our_range_memslots.c
View File

@ -7,6 +7,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hv-balloon-internal.h" #include "hv-balloon-internal.h"
#include "hv-balloon-our_range_memslots.h" #include "hv-balloon-our_range_memslots.h"
#include "trace.h" #include "trace.h"

1
hw/hyperv/hv-balloon-our_range_memslots.h
View File

@ -10,7 +10,6 @@
#ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H #ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H
#define 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 "exec/memory.h"
#include "qom/object.h" #include "qom/object.h"

1
hw/hyperv/hv-balloon-page_range_tree.c
View File

@ -7,6 +7,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hv-balloon-internal.h" #include "hv-balloon-internal.h"
#include "hv-balloon-page_range_tree.h" #include "hv-balloon-page_range_tree.h"

1
hw/hyperv/hv-balloon-page_range_tree.h
View File

@ -10,7 +10,6 @@
#ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H
#define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H
#include "qemu/osdep.h"
/* PageRange */ /* PageRange */
typedef struct PageRange { typedef struct PageRange {

1
hw/hyperv/hv-balloon.c
View File

@ -7,6 +7,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hv-balloon-internal.h" #include "hv-balloon-internal.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"

4
hw/hyperv/hyperv.c
View File

@ -12,6 +12,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "exec/memory.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -21,6 +22,9 @@
#include "qemu/rcu_queue.h" #include "qemu/rcu_queue.h"
#include "hw/hyperv/hyperv.h" #include "hw/hyperv/hyperv.h"
#include "qom/object.h" #include "qom/object.h"
#include "target/i386/kvm/hyperv-proto.h"
#include "target/i386/cpu.h"
#include "exec/cpu-all.h"
struct SynICState { struct SynICState {
DeviceState parent_obj; DeviceState parent_obj;

4
hw/i386/acpi-build.c
View File

@ -2697,7 +2697,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
" migration may not work", " migration may not work",
tables_blob->len, legacy_table_size); tables_blob->len, legacy_table_size);
error_printf("Try removing CPUs, NUMA nodes, memory slots" 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); g_array_set_size(tables_blob, legacy_table_size);
} else { } else {
@ -2709,7 +2709,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
" migration may not work", " migration may not work",
tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2);
error_printf("Try removing CPUs, NUMA nodes, memory slots" 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); acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE);
} }

1
hw/intc/xics.c
View File

@ -40,6 +40,7 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "target/ppc/cpu.h"
void icp_pic_print_info(ICPState *icp, Monitor *mon) void icp_pic_print_info(ICPState *icp, Monitor *mon)
{ {

2
hw/loongarch/acpi-build.c
View File

@ -509,7 +509,7 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
" migration may not work", " migration may not work",
tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2);
error_printf("Try removing CPUs, NUMA nodes, memory slots" 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); acpi_align_size(tables->linker->cmd_blob, ACPI_BUILD_ALIGN_SIZE);

1
hw/nvram/fw_cfg-acpi.c
View File

@ -4,6 +4,7 @@
* *
*/ */
#include "qemu/osdep.h"
#include "hw/nvram/fw_cfg_acpi.h" #include "hw/nvram/fw_cfg_acpi.h"
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"

1
hw/virtio/virtio-acpi.c
View File

@ -4,6 +4,7 @@
* *
*/ */
#include "qemu/osdep.h"
#include "hw/virtio/virtio-acpi.h" #include "hw/virtio/virtio-acpi.h"
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"

1
include/hw/arm/raspberrypi-fw-defs.h
View File

@ -10,7 +10,6 @@
#ifndef INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ #ifndef INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_
#define INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ #define INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_
#include "qemu/osdep.h"
enum rpi_firmware_property_tag { enum rpi_firmware_property_tag {
RPI_FWREQ_PROPERTY_END = 0, RPI_FWREQ_PROPERTY_END = 0,

1
include/hw/audio/asc.h
View File

@ -13,7 +13,6 @@
#ifndef HW_AUDIO_ASC_H #ifndef HW_AUDIO_ASC_H
#define HW_AUDIO_ASC_H #define HW_AUDIO_ASC_H
#include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "audio/audio.h" #include "audio/audio.h"

1
include/hw/m68k/q800-glue.h
View File

@ -23,7 +23,6 @@
#ifndef HW_Q800_GLUE_H #ifndef HW_Q800_GLUE_H
#define HW_Q800_GLUE_H #define HW_Q800_GLUE_H
#include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#define TYPE_GLUE "q800-glue" #define TYPE_GLUE "q800-glue"

1
include/hw/mem/memory-device.h
View File

@ -14,7 +14,6 @@
#define MEMORY_DEVICE_H #define MEMORY_DEVICE_H
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
#include "qemu/typedefs.h"
#include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-machine.h"
#include "qom/object.h" #include "qom/object.h"

1
include/hw/nvram/fw_cfg_acpi.h
View File

@ -7,7 +7,6 @@
#ifndef FW_CFG_ACPI_H #ifndef FW_CFG_ACPI_H
#define FW_CFG_ACPI_H #define FW_CFG_ACPI_H
#include "qemu/osdep.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap);

1
include/hw/ppc/spapr_nested.h
View File

@ -1,7 +1,6 @@
#ifndef HW_SPAPR_NESTED_H #ifndef HW_SPAPR_NESTED_H
#define HW_SPAPR_NESTED_H #define HW_SPAPR_NESTED_H
#include "qemu/osdep.h"
#include "target/ppc/cpu.h" #include "target/ppc/cpu.h"
/* /*

1
include/hw/virtio/virtio-acpi.h
View File

@ -6,7 +6,6 @@
#ifndef VIRTIO_ACPI_H #ifndef VIRTIO_ACPI_H
#define VIRTIO_ACPI_H #define VIRTIO_ACPI_H
#include "qemu/osdep.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base, void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base,

1
include/hw/xen/xen-hvm-common.h
View File

@ -1,7 +1,6 @@
#ifndef HW_XEN_HVM_COMMON_H #ifndef HW_XEN_HVM_COMMON_H
#define HW_XEN_HVM_COMMON_H #define HW_XEN_HVM_COMMON_H
#include "qemu/osdep.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "cpu.h" #include "cpu.h"

1
include/qemu/qtree.h
View File

@ -42,7 +42,6 @@
#ifndef QEMU_QTREE_H #ifndef QEMU_QTREE_H
#define QEMU_QTREE_H #define QEMU_QTREE_H
#include "qemu/osdep.h"
#ifdef HAVE_GLIB_WITH_SLICE_ALLOCATOR #ifdef HAVE_GLIB_WITH_SLICE_ALLOCATOR

2
include/ui/rect.h
View File

@ -4,8 +4,6 @@
#ifndef QEMU_RECT_H #ifndef QEMU_RECT_H
#define QEMU_RECT_H #define QEMU_RECT_H
#include <stdint.h>
#include <stdbool.h>
typedef struct QemuRect { typedef struct QemuRect {
int16_t x; int16_t x;

1
net/af-xdp.c
View File

@ -13,7 +13,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include <inttypes.h>
#include <linux/if_link.h> #include <linux/if_link.h>
#include <linux/if_xdp.h> #include <linux/if_xdp.h>
#include <net/if.h> #include <net/if.h>

1
plugins/core.c
View File

@ -27,7 +27,6 @@
#include "tcg/tcg.h" #include "tcg/tcg.h"
#include "tcg/tcg-op.h" #include "tcg/tcg-op.h"
#include "plugin.h" #include "plugin.h"
#include "qemu/compiler.h"
struct qemu_plugin_cb { struct qemu_plugin_cb {
struct qemu_plugin_ctx *ctx; struct qemu_plugin_ctx *ctx;

1
plugins/loader.c
View File

@ -33,7 +33,6 @@
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#include "hw/boards.h" #include "hw/boards.h"
#endif #endif
#include "qemu/compiler.h"
#include "plugin.h" #include "plugin.h"

2
qapi/migration.json
View File

@ -534,7 +534,7 @@
# Features: # Features:
# #
# @deprecated: Member @block is deprecated. Use blockdev-mirror with # @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 # unreliable and untested. It is recommended to use multifd
# migration, which offers an alternative compression # migration, which offers an alternative compression
# implementation that is reliable and tested. # implementation that is reliable and tested.

8
qemu-options.hx
View File

@ -5462,7 +5462,7 @@ SRST
KVM COLO KVM COLO
primary: 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 -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=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 -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 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
secondary: 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 -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=red0,host=3.3.3.3,port=9003
-chardev socket,id=red1,host=3.3.3.3,port=9004 -chardev socket,id=red1,host=3.3.3.3,port=9004
@ -5488,7 +5488,7 @@ SRST
Xen COLO Xen COLO
primary: 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 -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=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 -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 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,notify_dev=nofity_way,iothread=iothread1
secondary: 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 -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=red0,host=3.3.3.3,port=9003
-chardev socket,id=red1,host=3.3.3.3,port=9004 -chardev socket,id=red1,host=3.3.3.3,port=9004

2
scripts/clean-includes
View File

@ -51,7 +51,7 @@ GIT=no
DUPHEAD=no DUPHEAD=no
# Extended regular expression defining files to ignore when using --all # 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 while true
do do

1
target/riscv/vector_internals.c
View File

@ -16,6 +16,7 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h"
#include "vector_internals.h" #include "vector_internals.h"
/* set agnostic elements to 1s */ /* set agnostic elements to 1s */

1
target/riscv/vector_internals.h
View File

@ -19,7 +19,6 @@
#ifndef TARGET_RISCV_VECTOR_INTERNALS_H #ifndef TARGET_RISCV_VECTOR_INTERNALS_H
#define TARGET_RISCV_VECTOR_INTERNALS_H #define TARGET_RISCV_VECTOR_INTERNALS_H
#include "qemu/osdep.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "cpu.h" #include "cpu.h"
#include "tcg/tcg-gvec-desc.h" #include "tcg/tcg-gvec-desc.h"

2
tests/qtest/qtest_aspeed.h
View File

@ -12,8 +12,6 @@
#ifndef QTEST_ASPEED_H #ifndef QTEST_ASPEED_H
#define QTEST_ASPEED_H #define QTEST_ASPEED_H
#include <stdint.h>
#include "libqtest.h" #include "libqtest.h"
#define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000 #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000

1
util/userfaultfd.c
View File

@ -18,7 +18,6 @@
#include <poll.h> #include <poll.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <fcntl.h>
typedef enum { typedef enum {
UFFD_UNINITIALIZED = 0, UFFD_UNINITIALIZED = 0,