qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] be57fd: loongarch: Change the UEFI loading mo


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] be57fd: loongarch: Change the UEFI loading mode to loongarch
Date: Thu, 22 Feb 2024 01:48:21 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: be57fd1e526e70fd55f1e87b0b70fab3c6baf089
      
https://github.com/qemu/qemu/commit/be57fd1e526e70fd55f1e87b0b70fab3c6baf089
  Author: Xianglai Li <lixianglai@loongson.cn>
  Date:   2024-02-21 (Wed, 21 Feb 2024)

  Changed paths:
    M hw/loongarch/acpi-build.c
    M hw/loongarch/virt.c
    M include/hw/loongarch/virt.h

  Log Message:
  -----------
  loongarch: Change the UEFI loading mode to loongarch

The UEFI loading mode in loongarch is very different
from that in other architectures:loongarch's UEFI code
is in rom, while other architectures' UEFI code is in flash.

loongarch UEFI can be loaded as follows:
-machine virt,pflash=pflash0-format
-bios ./QEMU_EFI.fd

Other architectures load UEFI using the following methods:
-machine virt,pflash0=pflash0-format,pflash1=pflash1-format

loongarch's UEFI loading method makes qemu and libvirt incompatible
when using NVRAM, and the cost of loongarch's current loading method
far outweighs the benefits, so we decided to use the same UEFI loading
scheme as other architectures.

Cc: Andrea Bolognani <abologna@redhat.com>
Cc: maobibo@loongson.cn
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Song Gao <gaosong@loongson.cn>
Cc: zhaotianrui@loongson.cn
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
Tested-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: 
<0bd892aa9b88e0f4cc904cb70efd0251fc1cde29.1708336919.git.lixianglai@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>


  Commit: c3b66ea210c731ee7f0f2be2d80749a89df5a1c1
      
https://github.com/qemu/qemu/commit/c3b66ea210c731ee7f0f2be2d80749a89df5a1c1
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2024-02-21 (Wed, 21 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.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Message-Id: <20211218130437.1516929-6-f4bug@amsat.org>


  Commit: 513c877978b0327e4968f97684d76b7ae24442dc
      
https://github.com/qemu/qemu/commit/513c877978b0327e4968f97684d76b7ae24442dc
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-21 (Wed, 21 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.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20240216150441.45681-1-philmd@linaro.org>


  Commit: 9ff6a5f32dcf21d511d9258443fe196a724e8e0b
      
https://github.com/qemu/qemu/commit/9ff6a5f32dcf21d511d9258443fe196a724e8e0b
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240215105017.57748-2-philmd@linaro.org>


  Commit: caf91e5f39c549f12f96de93c5bd9359a61f12f6
      
https://github.com/qemu/qemu/commit/caf91e5f39c549f12f96de93c5bd9359a61f12f6
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-21 (Wed, 21 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 <balaton@eik.bme.hu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240215105017.57748-3-philmd@linaro.org>


  Commit: ba918614de572559358a82dd5754be65dfb7383e
      
https://github.com/qemu/qemu/commit/ba918614de572559358a82dd5754be65dfb7383e
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240215105017.57748-4-philmd@linaro.org>


  Commit: 05991f335aa9e252112cd0459e165b3ca9d51d2b
      
https://github.com/qemu/qemu/commit/05991f335aa9e252112cd0459e165b3ca9d51d2b
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-21 (Wed, 21 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 <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240215105017.57748-5-philmd@linaro.org>


  Commit: 64f8f3c156b5735726bec39807a67bb7524ce313
      
https://github.com/qemu/qemu/commit/64f8f3c156b5735726bec39807a67bb7524ce313
  Author: Joe Komlodi <komlodi@google.com>
  Date:   2024-02-21 (Wed, 21 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 <komlodi@google.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240202204847.2062798-3-komlodi@google.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 8ab9b333c2fc313aca46902498356e6d7f026c69
      
https://github.com/qemu/qemu/commit/8ab9b333c2fc313aca46902498356e6d7f026c69
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 070b07209c9f5c34248a323b2aee388e925021b5
      
https://github.com/qemu/qemu/commit/070b07209c9f5c34248a323b2aee388e925021b5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-21 (Wed, 21 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.maydell@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[PMD: Do not zero-init pcms->idebus[] again]
Message-ID: <20240220160622.114437-2-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 693b455942dad7cd6ef5d9176918e3fcbc2451aa
      
https://github.com/qemu/qemu/commit/693b455942dad7cd6ef5d9176918e3fcbc2451aa
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-21 (Wed, 21 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.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240220160622.114437-3-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 0fa0f106816e81f11b80566d401c1ac395d32a12
      
https://github.com/qemu/qemu/commit/0fa0f106816e81f11b80566d401c1ac395d32a12
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-4-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 034dbeaa650ae6ebcf27828cd017a1cba6f6d499
      
https://github.com/qemu/qemu/commit/034dbeaa650ae6ebcf27828cd017a1cba6f6d499
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-5-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: be82e47e66c46c8c16283699f33e77470a6638fa
      
https://github.com/qemu/qemu/commit/be82e47e66c46c8c16283699f33e77470a6638fa
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-6-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 57b395abcc4e0b4c90549d9440ff1067304b6874
      
https://github.com/qemu/qemu/commit/57b395abcc4e0b4c90549d9440ff1067304b6874
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-7-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: e3303e1c6a9c056ee28cc583b3dc102ed46dba97
      
https://github.com/qemu/qemu/commit/e3303e1c6a9c056ee28cc583b3dc102ed46dba97
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-8-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 8b1536958ac8adf14573208570598f8546f60211
      
https://github.com/qemu/qemu/commit/8b1536958ac8adf14573208570598f8546f60211
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-ID: <20240217104644.19755-1-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: ca5e8107605239bd1a5eb0420563f41db83258d9
      
https://github.com/qemu/qemu/commit/ca5e8107605239bd1a5eb0420563f41db83258d9
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2024-02-21 (Wed, 21 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 <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240218131701.91132-2-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 15e94c9c2c26da4bc1b6b6fbfd998c13489822b3
      
https://github.com/qemu/qemu/commit/15e94c9c2c26da4bc1b6b6fbfd998c13489822b3
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-2-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 30b6db7ff8e9bc7e069e79c12023c0dffdfa02f6
      
https://github.com/qemu/qemu/commit/30b6db7ff8e9bc7e069e79c12023c0dffdfa02f6
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-3-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: dc7597d9a61d044a847902acd9c742aa3710e894
      
https://github.com/qemu/qemu/commit/dc7597d9a61d044a847902acd9c742aa3710e894
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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 <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240220085505.30255-4-thuth@redhat.com>
[PMD: Use IDEDMAOps typedef in struct IDEDMA]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 0fab0b23a433c90a9aa32927695d834bdda41f7b
      
https://github.com/qemu/qemu/commit/0fab0b23a433c90a9aa32927695d834bdda41f7b
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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 <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240220085505.30255-5-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 9ad5b517b5a0d77f51d211545c3e1946d5050aea
      
https://github.com/qemu/qemu/commit/9ad5b517b5a0d77f51d211545c3e1946d5050aea
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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 <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240220085505.30255-6-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: f75c811762491452f3860974cde949856350558d
      
https://github.com/qemu/qemu/commit/f75c811762491452f3860974cde949856350558d
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-7-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 3197526534e76d5ad0dc1c333c6ebf4199f89011
      
https://github.com/qemu/qemu/commit/3197526534e76d5ad0dc1c333c6ebf4199f89011
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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é <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-8-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: df07f6bb563f25f39f4f5887adab557e42bdee59
      
https://github.com/qemu/qemu/commit/df07f6bb563f25f39f4f5887adab557e42bdee59
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-21 (Wed, 21 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 <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240221180751.190489-1-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: be8a8668b00bbd3de55b73792b0bd9513efcf773
      
https://github.com/qemu/qemu/commit/be8a8668b00bbd3de55b73792b0bd9513efcf773
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-22 (Thu, 22 Feb 2024)

  Changed paths:
    M .gitlab-ci.d/windows.yml

  Log Message:
  -----------
  .gitlab-ci.d/windows.yml: Drop msys2-32bit job

MSYS2 is dropping support for 32-bit Windows.  This shows up for us
as various packages we were using in our CI job no longer being
available to install, which causes the job to fail.  In commit
8e31b744fdf we dropped the dependency on libusb and spice, but the
dtc package has also now been removed.

For us as QEMU upstream, "32 bit x86 hosts for system emulation" have
already been deprecated as of QEMU 8.0, so we are ready to drop them
anyway.

Drop the msys2-32bit CI job, as the first step in doing this.

This is cc'd to stable, because this job will also be broken for CI
on the stable branches.  We can't drop 32-bit support entirely there,
but we will still be covering at least compilation for 32-bit Windows
via the cross-win32-system job.

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20240220165602.135695-1-peter.maydell@linaro.org


  Commit: cea2aa58bed2bdf0acc5d324d5b97c8cc8cccc70
      
https://github.com/qemu/qemu/commit/cea2aa58bed2bdf0acc5d324d5b97c8cc8cccc70
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-22 (Thu, 22 Feb 2024)

  Changed paths:
    M hw/loongarch/acpi-build.c
    M hw/loongarch/virt.c
    M include/hw/loongarch/virt.h

  Log Message:
  -----------
  Merge tag 'pull-loongarch-20240221' of https://gitlab.com/gaosong/qemu into 
staging

pull-loongarch-20240221

# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZdW9bwAKCRBAov/yOSY+
# 33jWA/4tVKCRX+WMsapUSsFJr4sPYgVSsxeWK34SjIztMjc3gF0tu5OPKTfQ19An
# v6nXJEZTZLAc8Bt6mRYHcOiVOB/ZwWjLYObowpfk3AbovIx9SJWrSE9DWcp2Bd99
# 2YuvIQG/2l/DjTh67pVcW3wNzoZzl9r3LvWiWng3NQyq3dcOeQ==
# =2voU
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 21 Feb 2024 09:07:59 GMT
# gpg:                using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C  6C2C 40A2 FFF2 3926 3EDF

* tag 'pull-loongarch-20240221' of https://gitlab.com/gaosong/qemu:
  loongarch: Change the UEFI loading mode to loongarch

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


  Commit: 6593e0e107a96abf448642d9173669e466b44530
      
https://github.com/qemu/qemu/commit/6593e0e107a96abf448642d9173669e466b44530
  Author: Peter Maydell <peter.maydell@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/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/trace-events
    M hw/sparc/leon3.c
    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

  Log Message:
  -----------
  Merge tag 'hw-misc-20240221' 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)
- Fix invalid use of DO_UPCAST() in Leon3 (Thomas)

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmXWZ2kACgkQ4+MsLN6t
# wN4hVg//XhxZL6U1ZCynoOMaHQyyP5dxcsZaEETQXIM1UuPXMEGQ3TfX+FRVNyMV
# dtFcZcWpCaD3gwXG6HI1DOdrcZ22erjEevLRX0T6IcBVfi+29HIIz21sjLdOr7PT
# 2D7dQ98rg/gSV3qCVvhtIj3XkkIXyV/twF1iF5CcKfoDxqdWVEMAjEmk7gmw1iDK
# Nk+w9h7ZeH1PtNKLDNdiInXpLUpjrHA372dL3OLt2II0NCSq3K/zMIU6keQqOIYe
# /rYF8+QPUsc9QXmxBVzmxPDZpEKmw3KHdGfDTMiyH5iYEobSGF8BUt+xtN39/JJn
# kmYFwm0zv+xBkn83ZuC6nDN7a3semsZSrc3HTnfenXz6eQuuxaZ07/FzhrCqt6rt
# 0hn79OqCOY0A5XHaUeZE11euVYNzz7KMogSKklkUVRn28x7T/2PRhBPXV/bzW1ui
# Si7wX490RExIGQS+7tz8NhYygfIqAI3kL5JfEB2MHUhmMaUDH7hEwrm74neTmINy
# r76CBuIJKfyGCiOGRor1eqrxZe528bhIpjCy8+R9Af7uBNScv1Szst6Bb0KxBgD3
# PmV4YZ8Wojn9gGgApEoTA0x/Eeu8XrByNJUbiWHv3gR4SRWHrmKdU+JBCRsWsM6l
# BEBQUUarbBU42gIiNWCfQeuaszQ2ErdzIMCepMkCa0c1meHOjto=
# =j1lO
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 21 Feb 2024 21:13:13 GMT
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* tag 'hw-misc-20240221' of https://github.com/philmd/qemu: (25 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/isa/meson.build: Sort alphabetically
  hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI function
  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()
  hw/i386/pc: Store pointers to IDE buses in PCMachineState
  hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc machines
  hw/i2c/smbus_slave: Add object path on error prints
  hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/
  ...

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


Compare: https://github.com/qemu/qemu/compare/760b4dcdddba...6593e0e107a9

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications



reply via email to

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