Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: 40f27a785f6b9d238f4b87c17c3ec8329dcde803 https://github.com/qemu/qemu/commit/40f27a785f6b9d238f4b87c17c3ec8329dcde803 Author: Philippe Mathieu-Daudé <f4...@amsat.org> Date: 2024-02-22 (Thu, 22 Feb 2024)
Changed paths: M hw/i386/pc.c M hw/input/pckbd.c M include/hw/input/i8042.h Log Message: ----------- hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper Since the named GPIO lines are a "public" interface to the device, we can directly call qdev_connect_gpio_out_named(), making it consistent with how the other A20 input source (port92) is wired. Suggested-by: Peter Maydell <peter.mayd...@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> Reviewed-by: Yanan Wang <wangyana...@huawei.com> Message-Id: <20211218130437.1516929-6-f4...@amsat.org> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 0068b069c3ffb9ac8e5ad56bf0c9d853bbfc3997 https://github.com/qemu/qemu/commit/0068b069c3ffb9ac8e5ad56bf0c9d853bbfc3997 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/core/sysbus.c M hw/i386/kvmvapic.c M hw/mips/mipssim.c M hw/nvram/fw_cfg.c M include/hw/sysbus.h Log Message: ----------- hw/sysbus: Inline and remove sysbus_add_io() sysbus_add_io(...) is a simple wrapper to memory_region_add_subregion(get_system_io(), ...). It is used in 3 places; inline it directly. Rationale: we want to move to an explicit I/O bus, rather that an implicit one. Besides in heterogeneous setup we can have more than one I/O bus. Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> Message-Id: <20240216150441.45681-1-phi...@linaro.org> [PMD: Include missing "exec/address-spaces.h" header] Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: d0e870f4472b2f373a8d7e8cf88fd11b4da0e58c https://github.com/qemu/qemu/commit/d0e870f4472b2f373a8d7e8cf88fd11b4da0e58c Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/ppc/ppc440_pcix.c M hw/ppc/ppc4xx_pci.c Log Message: ----------- hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: BALATON Zoltan <bala...@eik.bme.hu> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20240215105017.57748-2-phi...@linaro.org> Commit: 4d641f36e7bd6e82177a35b6929d569bfd600d88 https://github.com/qemu/qemu/commit/4d641f36e7bd6e82177a35b6929d569bfd600d88 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M MAINTAINERS M hw/ppc/ppc440_bamboo.c M hw/ppc/ppc440_pcix.c M hw/ppc/ppc440_uc.c M hw/ppc/ppc4xx_pci.c M hw/ppc/sam460ex.c A include/hw/pci-host/ppc4xx.h M include/hw/ppc/ppc4xx.h Log Message: ----------- hw/ppc/ppc4xx_pci: Extract PCI host definitions to hw/pci-host/ppc4xx.h Reviewed-by: BALATON Zoltan <bala...@eik.bme.hu> Reviewed-by: Thomas Huth <th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-Id: <20240215105017.57748-3-phi...@linaro.org> Commit: 55abb29e6366f99ead5a2636d1f1a2fa85e2f844 https://github.com/qemu/qemu/commit/55abb29e6366f99ead5a2636d1f1a2fa85e2f844 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M MAINTAINERS M hw/pci-host/Kconfig M hw/pci-host/meson.build A hw/pci-host/ppc4xx_pci.c M hw/pci-host/ppce500.c M hw/pci-host/trace-events M hw/ppc/Kconfig M hw/ppc/meson.build R hw/ppc/ppc4xx_pci.c M hw/ppc/trace-events Log Message: ----------- hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/ ppc4xx_pci.c is moved from the target specific ppc_ss[] meson source set to pci_ss[] which is common to all targets: the object is built once. Declare PPC4XX_PCI selector in pci-host/Kconfig. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20240215105017.57748-4-phi...@linaro.org> Commit: 22dc8a47f9c68f98594449be713d4dde9389f960 https://github.com/qemu/qemu/commit/22dc8a47f9c68f98594449be713d4dde9389f960 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M MAINTAINERS M hw/pci-host/Kconfig M hw/pci-host/meson.build A hw/pci-host/ppc440_pcix.c M hw/pci-host/trace-events M hw/ppc/Kconfig M hw/ppc/meson.build R hw/ppc/ppc440_pcix.c M hw/ppc/trace-events Log Message: ----------- hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/ ppc440_pcix.c is moved from the target specific ppc_ss[] meson source set to pci_ss[] which is common to all targets: the object is built once. Reviewed-by: Thomas Huth <th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-Id: <20240215105017.57748-5-phi...@linaro.org> Commit: 1f88173ab9dfa34e96f5baa10b83ccb528de3030 https://github.com/qemu/qemu/commit/1f88173ab9dfa34e96f5baa10b83ccb528de3030 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/ppc/spapr_cpu_core.c Log Message: ----------- hw/ppc/spapr_cpu: Use qdev_is_realized() instead of QOM API Prefer QDev API for QDev objects, avoid the underlying QOM layer. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Zhao Liu <zhao1....@intel.com> Message-Id: <20240216110313.17039-4-phi...@linaro.org> Commit: d06c2f769559d2211fa1662318182a236293e920 https://github.com/qemu/qemu/commit/d06c2f769559d2211fa1662318182a236293e920 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/ppc/pnv_bmc.c Log Message: ----------- hw/ppc/pnv_bmc: Use qdev_new() instead of QOM API Prefer QDev API for QDev objects, avoid the underlying QOM layer. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> Message-Id: <20240216110313.17039-6-phi...@linaro.org> Commit: 61f406f37726833650d8c4441a4c1baf1f5b54db https://github.com/qemu/qemu/commit/61f406f37726833650d8c4441a4c1baf1f5b54db Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/tricore/tricore_testboard.c M include/hw/tricore/tricore_testdevice.h Log Message: ----------- hw/tricore/testboard: Use qdev_new() instead of QOM basic API Prefer QDev API for QDev objects, avoid the underlying QOM layer. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Bastian Koppelmann <kbast...@mail.uni-paderborn.de> Message-Id: <20240216110313.17039-5-phi...@linaro.org> Commit: fcc8299e29816c9b6f8d9766254fce6e8a50ee52 https://github.com/qemu/qemu/commit/fcc8299e29816c9b6f8d9766254fce6e8a50ee52 Author: Joe Komlodi <koml...@google.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i2c/smbus_slave.c Log Message: ----------- hw/i2c/smbus_slave: Add object path on error prints The current logging doesn't tell us which specific smbus device is an error state. Signed-off-by: Joe Komlodi <koml...@google.com> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240202204847.2062798-3-koml...@google.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 16bd024bb4af50e1aa8864a53807c0cc63092977 https://github.com/qemu/qemu/commit/16bd024bb4af50e1aa8864a53807c0cc63092977 Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc_piix.c Log Message: ----------- hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc machines Both invocations are the same and either one is always executed. Avoid this redundancy. Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-3-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 2df87da19091b3c4674a3d1504232a86dec7e529 https://github.com/qemu/qemu/commit/2df87da19091b3c4674a3d1504232a86dec7e529 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc.c M hw/i386/pc_piix.c M hw/i386/pc_q35.c M include/hw/i386/pc.h Log Message: ----------- hw/i386/pc: Store pointers to IDE buses in PCMachineState Add the two IDE bus BusState pointers to the set we keep in PCMachineState. This allows us to avoid passing them to pc_cmos_init(), and also will allow a refactoring of how we call pc_cmos_init_late(). Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Acked-by: Richard Henderson <richard.hender...@linaro.org> Reviewed-by: Michael S. Tsirkin <m...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> [PMD: Do not zero-init pcms->idebus[] again] Message-ID: <20240220160622.114437-2-peter.mayd...@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 859eb5eeb4ac1b451841ad8a193f1454311ff1a6 https://github.com/qemu/qemu/commit/859eb5eeb4ac1b451841ad8a193f1454311ff1a6 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc.c Log Message: ----------- hw/i386/pc: Do pc_cmos_init_late() from pc_machine_done() In the i386 PC machine, we want to run the pc_cmos_init_late() function only once the IDE and floppy drive devices have been set up. We currently do this using qemu_register_reset(), and then have the function call qemu_unregister_reset() on itself, so it runs exactly once. This was an expedient way to do it back in 2010 when we first added this (in commit c0897e0cb94e8), but now we have a more obvious point to do "machine initialization that has to happen after generic device init": the machine-init-done hook. Do the pc_cmos_init_late() work from our existing PC machine init done hook function, so we can drop the use of qemu_register_reset() and qemu_unregister_reset(). Because the pointers to the devices we need (the IDE buses and the RTC) are now all in the machine state, we don't need the pc_cmos_init_late_arg struct and can just pass the PCMachineState pointer. Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Reviewed-by: Richard Henderson <richard.hender...@linaro.org> Reviewed-by: Michael S. Tsirkin <m...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240220160622.114437-3-peter.mayd...@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 6e6d59a94d44845a6834fd4dcea7530e47365fed https://github.com/qemu/qemu/commit/6e6d59a94d44845a6834fd4dcea7530e47365fed Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/acpi-common.c M hw/i386/pc.c M include/hw/i386/x86.h Log Message: ----------- hw/i386/x86: Turn apic_xrupt_override into class attribute The attribute isn't user-changeable and only true for pc-based machines. Turn it into a class attribute which allows for inlining pc_guest_info_init() into pc_machine_initfn(). Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-4-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 4d3457fef9235202fa7d1511ddad852bb72b439a https://github.com/qemu/qemu/commit/4d3457fef9235202fa7d1511ddad852bb72b439a Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc.c M hw/i386/pc_piix.c M hw/i386/pc_q35.c M include/hw/i386/pc.h Log Message: ----------- hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn() Resolves redundant code in the piix and q35 machines. Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-5-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: a0204a5ed091dfe79aced7ec8f3ce1931fd25816 https://github.com/qemu/qemu/commit/a0204a5ed091dfe79aced7ec8f3ce1931fd25816 Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/fw_cfg.c M hw/i386/fw_cfg.h M hw/i386/pc.c M hw/i386/pc_piix.c M hw/i386/pc_q35.c M include/hw/i386/pc.h Log Message: ----------- hw/i386/pc: Defer smbios_set_defaults() to machine_done Handling most of smbios data generation in the machine_done notifier is similar to how the ARM virt machine handles it which also calls smbios_set_defaults() there. The result is that all pc machines are freed from explicitly worrying about smbios setup. Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-6-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 6f6ad2b24582593d8feb00434ce2396840666227 https://github.com/qemu/qemu/commit/6f6ad2b24582593d8feb00434ce2396840666227 Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc.c M hw/i386/pc_piix.c M hw/i386/pc_sysfw.c M include/hw/i386/pc.h Log Message: ----------- hw/i386/pc: Confine system flash handling to pc_sysfw Rather than distributing PC system flash handling across three files, let's confine it to one. Now, pc_system_firmware_init() creates, configures and cleans up the system flash which makes the code easier to understand. It also avoids the extra call to pc_system_flash_cleanup_unused() in the Xen case. Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-7-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: cb05cc16029bb0a61ac5279ab7b3b90dcf2aa69f https://github.com/qemu/qemu/commit/cb05cc16029bb0a61ac5279ab7b3b90dcf2aa69f Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc_sysfw.c Log Message: ----------- hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it pc_system_flash_create() checked for pcmc->pci_enabled which is redundant since its caller already checked it. The method can be turned into just two lines, so inline and remove it. Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240208220349.4948-8-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 58183abfe702e4fe7654af8dd42c1270084486a3 https://github.com/qemu/qemu/commit/58183abfe702e4fe7654af8dd42c1270084486a3 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc_sysfw.c Log Message: ----------- hw/i386/pc_sysfw: Use qdev_is_realized() instead of QOM API Prefer QDev API for QDev objects, avoid the underlying QOM layer. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Zhao Liu <zhao1....@intel.com> Message-Id: <20240216110313.17039-3-phi...@linaro.org> Commit: 143f3fd3d8b51d6526c8ea80e8a2a085f6f01cdf https://github.com/qemu/qemu/commit/143f3fd3d8b51d6526c8ea80e8a2a085f6f01cdf Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc_q35.c Log Message: ----------- hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI function The interrupt handlers need to be populated before the device is realized since internal devices such as the RTC are wired during realize(). If the interrupt handlers aren't populated, devices such as the RTC will be wired with a NULL interrupt handler, i.e. MC146818RtcState::irq is NULL. Fixes: fc11ca08bc29 "hw/i386/q35: Realize LPC PCI function before accessing it" Cc: Philippe Mathieu-Daudé <phi...@linaro.org> Signed-off-by: Bernhard Beschow <shen...@gmail.com> Message-ID: <20240217104644.19755-1-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 3e0a995680a3744c72bc6ef3792a15e57f832726 https://github.com/qemu/qemu/commit/3e0a995680a3744c72bc6ef3792a15e57f832726 Author: Bernhard Beschow <shen...@gmail.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/isa/meson.build Log Message: ----------- hw/isa/meson.build: Sort alphabetically Fixes: fbd758008f0f "hw/isa: extract FDC37M81X to a separate file" Signed-off-by: Bernhard Beschow <shen...@gmail.com> Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240218131701.91132-2-shen...@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 1017e88701e745b1f2c1d9d7b5f5751d31414088 https://github.com/qemu/qemu/commit/1017e88701e745b1f2c1d9d7b5f5751d31414088 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M include/hw/acpi/cpu.h M include/hw/acpi/memory_hotplug.h Log Message: ----------- hw/acpi: Include missing 'qapi/qapi-types-acpi.h' generated header ACPIOSTInfo is a QAPI generated structure: $ git grep -w ACPIOSTInfo qapi/acpi.json:81:# @ACPIOSTInfo: qapi/acpi.json:99:{ 'struct': 'ACPIOSTInfo', qapi/acpi.json:109:# Return a list of ACPIOSTInfo for devices that support status Include the "qapi/qapi-types-acpi.h" header to avoid the following errors when including "hw/acpi/cpu.h" or "hw/acpi/memory_hotplug.h" elsewhere: include/hw/acpi/cpu.h:67:52: error: unknown type name 'ACPIOSTInfoList' void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list); ^ include/hw/acpi/memory_hotplug.h:51:55: error: unknown type name 'ACPIOSTInfoList' void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list); ^ Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Zhao Liu <zhao1....@intel.com> Message-Id: <20240219141412.71418-2-phi...@linaro.org> Commit: b8492bd430ecc1ceb80cac19b46870d423f1e854 https://github.com/qemu/qemu/commit/b8492bd430ecc1ceb80cac19b46870d423f1e854 Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M include/hw/acpi/cpu.h Log Message: ----------- hw/acpi/cpu: Use CPUState typedef QEMU coding style recommend using structure typedefs: https://www.qemu.org/docs/master/devel/style.html#typedefs Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Richard Henderson <richard.hender...@linaro.org> Reviewed-by: Zhao Liu <zhao1....@intel.com> Message-Id: <20240126220407.95022-2-phi...@linaro.org> Commit: 066804029f089e43fe77ddbf1ba45b0dc0ba574c https://github.com/qemu/qemu/commit/066804029f089e43fe77ddbf1ba45b0dc0ba574c Author: Philippe Mathieu-Daudé <phi...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M include/hw/acpi/ich9_tco.h Log Message: ----------- hw/acpi/ich9_tco: Include missing 'migration/vmstate.h' header We need the VMStateDescription structure definition from "migration/vmstate.h" in order to declare vmstate_tco_io_sts. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Zhao Liu <zhao1....@intel.com> Message-Id: <20240219141412.71418-4-phi...@linaro.org> Commit: bd217d88dcff15981476b73612eb877a372e67f1 https://github.com/qemu/qemu/commit/bd217d88dcff15981476b73612eb877a372e67f1 Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/ide/Kconfig A hw/ide/cf.c M hw/ide/meson.build M hw/ide/qdev.c A include/hw/ide/ide-dev.h Log Message: ----------- hw/ide: Add the possibility to disable the CompactFlash device in the build For distros like downstream RHEL, it would be helpful to allow to disable the CompactFlash device. For making this possible, we need a separate Kconfig switch for this device, and the code should reside in a separate file. Let's also introduce a new header ide-dev.h which can be used to collect definitions related to IDE devices. Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Message-ID: <20240220085505.30255-2-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 7bd8b0d4f5e8abfd9bdca40555d92db27918777b https://github.com/qemu/qemu/commit/7bd8b0d4f5e8abfd9bdca40555d92db27918777b Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/arm/Kconfig M hw/ide/Kconfig A hw/ide/ide-bus.c A hw/ide/ide-dev.c M hw/ide/meson.build R hw/ide/qdev.c Log Message: ----------- hw/ide: Split qdev.c into ide-bus.c and ide-dev.c qdev.c is a mixture between IDE bus specific functions and IDE device functions. Let's split it up to make it more obvious which part is related to bus handling and which part is related to device handling. Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Message-ID: <20240220085505.30255-3-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 1b986676eb472e41dfff7c946adb14552ebb3c23 https://github.com/qemu/qemu/commit/1b986676eb472e41dfff7c946adb14552ebb3c23 Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: A include/hw/ide/ide-dma.h M include/hw/ide/internal.h Log Message: ----------- hw/ide: Move IDE DMA related definitions to a separate header ide-dma.h These definitions are required outside of the hw/ide/ code, too, so lets's move them from internal.h to a new header called ide-dma.h. Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240220085505.30255-4-th...@redhat.com> [PMD: Use IDEDMAOps typedef in struct IDEDMA] Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 5fc5934a4b06d3983edfebcccc1cdb78d5cf526e https://github.com/qemu/qemu/commit/5fc5934a4b06d3983edfebcccc1cdb78d5cf526e Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/ide/ide-dev.c M include/hw/ide/ide-dev.h M include/hw/ide/internal.h Log Message: ----------- hw/ide: Move IDE device related definitions to ide-dev.h Untangle internal.h by moving public IDE device related definitions to ide-dev.h. Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240220085505.30255-5-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: f74c6177bb9ae5763a123e1e9dbcda1405e03032 https://github.com/qemu/qemu/commit/f74c6177bb9ae5763a123e1e9dbcda1405e03032 Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: A include/hw/ide/ide-bus.h M include/hw/ide/internal.h Log Message: ----------- hw/ide: Move IDE bus related definitions to a new header ide-bus.h Let's consolidate the public IDE bus related functions in a separate header. Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240220085505.30255-6-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 40e074a50964844fab23f7e753e9153b2b1f7b3a https://github.com/qemu/qemu/commit/40e074a50964844fab23f7e753e9153b2b1f7b3a Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M MAINTAINERS R include/hw/ide.h M include/hw/ide/ide-dev.h M include/hw/ide/internal.h Log Message: ----------- hw/ide: Remove the include/hw/ide.h legacy file There was only one prototype left in this legacy file. Move it to ide-dev.h to finally get rid of it. Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Message-ID: <20240220085505.30255-7-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: a11f439a0ea99bc6bca371260a711ab940013b8f https://github.com/qemu/qemu/commit/a11f439a0ea99bc6bca371260a711ab940013b8f Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/i386/pc.c M hw/ide/cmd646.c M hw/ide/pci.c M hw/ide/piix.c M hw/ide/sii3112.c M hw/ide/via.c M include/hw/ide/pci.h Log Message: ----------- hw/ide: Stop exposing internal.h to non-IDE files include/hw/ide/internal.h is currently included by include/hw/ide/pci.h and thus exposed to a lot of files that are not part of the IDE subsystem. Stop including internal.h there and use the appropriate new headers ide-bus.h and ide-dma.h instead. Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Message-ID: <20240220085505.30255-8-th...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: 7164f7e4028ad3b01a5f98c27482587b401ad420 https://github.com/qemu/qemu/commit/7164f7e4028ad3b01a5f98c27482587b401ad420 Author: Thomas Huth <th...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M hw/sparc/leon3.c Log Message: ----------- hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro leon3.c currently fails to compile with some compilers when the -Wvla option has been enabled: ../hw/sparc/leon3.c: In function ‘leon3_cpu_reset’: ../hw/sparc/leon3.c:153:5: error: ISO C90 forbids variable length array ‘offset_must_be_zero’ [-Werror=vla] 153 | ResetData *s = (ResetData *)DO_UPCAST(ResetData, info[id], info); | ^~~~~~~~~ cc1: all warnings being treated as errors Looking at this code, the DO_UPCAST macro is indeed used in a wrong way here: DO_UPCAST is supposed to check that the second parameter is the first entry of the struct that the first parameter indicates, but since we use and index into the info[] array, this of course cannot work. The intention here was likely rather to use the container_of() macro instead, so switch the code accordingly. Fixes: d65aba8286 ("hw/sparc/leon3: implement multiprocessor") Signed-off-by: Thomas Huth <th...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-ID: <20240221180751.190489-1-th...@redhat.com> Tested-by: Clément Chigot <chi...@adacore.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> Commit: a8bf9de2f4f398315ac5340e4b88c478d5457731 https://github.com/qemu/qemu/commit/a8bf9de2f4f398315ac5340e4b88c478d5457731 Author: Daniel P. Berrangé <berra...@redhat.com> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M .gitlab-ci.d/cirrus/build.yml Log Message: ----------- gitlab: force allow use of pip in Cirrus jobs Python is transitioning to a world where you're not allowed to use 'pip install' outside of a virutal env by default. The rationale is to stop use of pip clashing with distro provided python packages, which creates a major headache on distro upgrades. All our CI environments, however, are 100% disposable so the upgrade headaches don't exist. Thus we can undo the python defaults to allow pip to work. Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> Tested-by: Philippe Mathieu-Daudé <phi...@linaro.org> Tested-by: Thomas Huth <th...@redhat.com> Message-id: 20240222114038.2348718-1-berra...@redhat.com Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Commit: 3d54cbf269d63ff1d500b35b2bcf4565ff8ad485 https://github.com/qemu/qemu/commit/3d54cbf269d63ff1d500b35b2bcf4565ff8ad485 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-02-22 (Thu, 22 Feb 2024) Changed paths: M MAINTAINERS M hw/arm/Kconfig M hw/core/sysbus.c M hw/i2c/smbus_slave.c M hw/i386/acpi-common.c M hw/i386/fw_cfg.c M hw/i386/fw_cfg.h M hw/i386/kvmvapic.c M hw/i386/pc.c M hw/i386/pc_piix.c M hw/i386/pc_q35.c M hw/i386/pc_sysfw.c M hw/ide/Kconfig A hw/ide/cf.c M hw/ide/cmd646.c A hw/ide/ide-bus.c A hw/ide/ide-dev.c M hw/ide/meson.build M hw/ide/pci.c M hw/ide/piix.c R hw/ide/qdev.c M hw/ide/sii3112.c M hw/ide/via.c M hw/input/pckbd.c M hw/isa/meson.build M hw/mips/mipssim.c M hw/nvram/fw_cfg.c M hw/pci-host/Kconfig M hw/pci-host/meson.build A hw/pci-host/ppc440_pcix.c A hw/pci-host/ppc4xx_pci.c M hw/pci-host/ppce500.c M hw/pci-host/trace-events M hw/ppc/Kconfig M hw/ppc/meson.build M hw/ppc/pnv_bmc.c M hw/ppc/ppc440_bamboo.c R hw/ppc/ppc440_pcix.c M hw/ppc/ppc440_uc.c R hw/ppc/ppc4xx_pci.c M hw/ppc/sam460ex.c M hw/ppc/spapr_cpu_core.c M hw/ppc/trace-events M hw/sparc/leon3.c M hw/tricore/tricore_testboard.c M include/hw/acpi/cpu.h M include/hw/acpi/ich9_tco.h M include/hw/acpi/memory_hotplug.h M include/hw/i386/pc.h M include/hw/i386/x86.h R include/hw/ide.h A include/hw/ide/ide-bus.h A include/hw/ide/ide-dev.h A include/hw/ide/ide-dma.h M include/hw/ide/internal.h M include/hw/ide/pci.h M include/hw/input/i8042.h A include/hw/pci-host/ppc4xx.h M include/hw/ppc/ppc4xx.h M include/hw/sysbus.h M include/hw/tricore/tricore_testdevice.h Log Message: ----------- Merge tag 'hw-misc-20240222' of https://github.com/philmd/qemu into staging Misc HW patch queue - Remove sysbus_add_io (Phil) - Build PPC 4xx PCI host bridges once (Phil) - Display QOM path while debugging SMBus targets (Joe) - Simplify x86 PC code (Bernhard) - Remove qemu_[un]register_reset() calls in x86 PC CMOS (Peter) - Fix wiring of ICH9 LPC interrupts (Bernhard) - Split core IDE as device / bus / dma (Thomas) - Prefer QDev API over QOM for devices (Phil) - Fix invalid use of DO_UPCAST() in Leon3 (Thomas) # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmXXQ1IACgkQ4+MsLN6t # wN4e2xAAig55EJh/JwpdGx55rFUab3Ay22jgXrExmBir8hzhyzssY+RUj2ALRa5e # T26kxCEqiuT549FtWm/ci6kVax0QD6bqz/6/j451XB9469Z/3BDOV5rhsqF6zlr5 # BMbyC8PKnMUluG8v1ZuRjC3m2lK3ZvkVnZtj7SZUR50ssEnR32fVIziN14/OYkts # 2B24sLrnLBfvyatMRsuFqGWrcbtMdnwNpjenGfDPOTF33W1sxTQ8GSvx1RV32l69 # Yr/iCVoCl+rGxbLLP1TwqtOwzk32p8RsbIt6rWMqVMv/p5F6ezFeiOk7VHnnEJRH # e7TPxt4XeLGPARMQLT3gQh0MGIIodanSHePRBkczuNmKYTJrz+5jMu2Qg4MmMUE/ # TV0fKgdjh/edhAOHzJgZqLmNV71icl8WBjfsw2qT4ZwgJzWq7YM2/XZKkeWhk2nQ # whLxfgiU4PNJ6vHhebJNjOovCYQTK2FbXR+PvVn5FEbH4CuFr8mqkYc+vNYM9dLA # b7uMk1H8kcb5+kqfPPU2lVd1wO7uqhxYOYU2O9nYq8aw7ioLoLeEdj2IicLtrA/H # GMtyA5cYeabeRzSXF30tM2AR1uQ/e4Z7oNxW6z3GVK1NrQtKilqPgMKut8uWYvva # crJLpRQhGiY3sDrIkkCcAHzv256dZaJNLR1KPViaHOyVPZV+x2s= # =+h2O # -----END PGP SIGNATURE----- # gpg: Signature made Thu 22 Feb 2024 12:51:30 GMT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4...@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20240222' of https://github.com/philmd/qemu: (32 commits) hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro hw/ide: Stop exposing internal.h to non-IDE files hw/ide: Remove the include/hw/ide.h legacy file hw/ide: Move IDE bus related definitions to a new header ide-bus.h hw/ide: Move IDE device related definitions to ide-dev.h hw/ide: Move IDE DMA related definitions to a separate header ide-dma.h hw/ide: Split qdev.c into ide-bus.c and ide-dev.c hw/ide: Add the possibility to disable the CompactFlash device in the build hw/acpi/ich9_tco: Include missing 'migration/vmstate.h' header hw/acpi/cpu: Use CPUState typedef hw/acpi: Include missing 'qapi/qapi-types-acpi.h' generated header hw/isa/meson.build: Sort alphabetically hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI function hw/i386/pc_sysfw: Use qdev_is_realized() instead of QOM API hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it hw/i386/pc: Confine system flash handling to pc_sysfw hw/i386/pc: Defer smbios_set_defaults() to machine_done hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn() hw/i386/x86: Turn apic_xrupt_override into class attribute hw/i386/pc: Do pc_cmos_init_late() from pc_machine_done() ... Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> # Conflicts: # include/hw/i386/pc.h Compare: https://github.com/qemu/qemu/compare/6630bc04bcca...3d54cbf269d6 To unsubscribe from these emails, change your notification settings at https://github.com/qemu/qemu/settings/notifications