Misc HW patches for 2024-02-21
Subsystems (2)
The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20240221
for you to fetch changes up to df07f6bb563f25f39f4f5887adab557e42bdee59:
hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro (2024-02-21 22:13:03 +0100)
Following checkpatch.pl error ignored:
ERROR: Macros with complex values should be enclosed in parenthesis #62: FILE: include/hw/ide/ide-dev.h:31:
+#define DEFINE_IDE_DEV_PROPERTIES() \
+ DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), \
+ DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf), \
+ DEFINE_PROP_STRING("ver", IDEDrive, dev.version), \
+ DEFINE_PROP_UINT64("wwn", IDEDrive, dev.wwn, 0), \ + DEFINE_PROP_STRING("serial", IDEDrive, dev.serial),\
+ DEFINE_PROP_STRING("model", IDEDrive, dev.model)
----------------------------------------------------------------
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)
----------------------------------------------------------------
Bernhard Beschow (8):
hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc
machines
hw/i386/x86: Turn apic_xrupt_override into class attribute hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn() hw/i386/pc: Defer smbios_set_defaults() to machine_done hw/i386/pc: Confine system flash handling to pc_sysfw hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI
function
hw/isa/meson.build: Sort alphabetically
Joe Komlodi (1):
hw/i2c/smbus_slave: Add object path on error prints
Peter Maydell (2):
hw/i386/pc: Store pointers to IDE buses in PCMachineState hw/i386/pc: Do pc_cmos_init_late() from pc_machine_done()
Philippe Mathieu-Daudé (6):
hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper hw/sysbus: Inline and remove sysbus_add_io() hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header hw/ppc/ppc4xx_pci: Extract PCI host definitions to
hw/pci-host/ppc4xx.h
hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/ hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/
Thomas Huth (8):
hw/ide: Add the possibility to disable the CompactFlash device in the
build
hw/ide: Split qdev.c into ide-bus.c and ide-dev.c
hw/ide: Move IDE DMA related definitions to a separate header
ide-dma.h
hw/ide: Move IDE device related definitions to ide-dev.h hw/ide: Move IDE bus related definitions to a new header ide-bus.h hw/ide: Remove the include/hw/ide.h legacy file
hw/ide: Stop exposing internal.h to non-IDE files hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro
MAINTAINERS | 5 +-
hw/i386/fw_cfg.h | 3 +-
include/hw/i386/pc.h | 9 +-
include/hw/i386/x86.h | 3 +-
include/hw/ide.h | 9 --
include/hw/ide/ide-bus.h | 42 ++++++
include/hw/ide/ide-dev.h | 184 +++++++++++++++++++++++++
include/hw/ide/ide-dma.h | 37 +++++
include/hw/ide/internal.h | 211 +----------------------------
include/hw/ide/pci.h | 2 +-
include/hw/input/i8042.h | 1 -
include/hw/pci-host/ppc4xx.h | 17 +++
include/hw/ppc/ppc4xx.h | 5 -
include/hw/sysbus.h | 2 -
hw/core/sysbus.c | 6 -
hw/i2c/smbus_slave.c | 8 +-
hw/i386/acpi-common.c | 3 +-
hw/i386/fw_cfg.c | 12 +-
hw/i386/kvmvapic.c | 2 +-
hw/i386/pc.c | 60 ++++----
hw/i386/pc_piix.c | 31 +----
hw/i386/pc_q35.c | 22 +--
hw/i386/pc_sysfw.c | 17 +--
hw/ide/cf.c | 58 ++++++++
hw/ide/cmd646.c | 1 +
hw/ide/ide-bus.c | 111 +++++++++++++++
hw/ide/{qdev.c => ide-dev.c} | 137 +------------------
hw/ide/pci.c | 1 +
hw/ide/piix.c | 1 +
hw/ide/sii3112.c | 1 +
hw/ide/via.c | 1 +
hw/input/pckbd.c | 5 -
hw/mips/mipssim.c | 2 +-
hw/nvram/fw_cfg.c | 5 +-
hw/{ppc => pci-host}/ppc440_pcix.c | 3 +-
hw/{ppc => pci-host}/ppc4xx_pci.c | 3 +-
hw/pci-host/ppce500.c | 2 +-
hw/ppc/ppc440_bamboo.c | 1 +
hw/ppc/ppc440_uc.c | 1 +
hw/ppc/sam460ex.c | 1 +
hw/sparc/leon3.c | 2 +-
hw/arm/Kconfig | 2 +
hw/ide/Kconfig | 32 +++--
hw/ide/meson.build | 4 +-
hw/isa/meson.build | 2 +-
hw/pci-host/Kconfig | 8 ++
hw/pci-host/meson.build | 2 +
hw/pci-host/trace-events | 12 ++
hw/ppc/Kconfig | 3 +-
hw/ppc/meson.build | 3 +-
hw/ppc/trace-events | 12 --
51 files changed, 591 insertions(+), 516 deletions(-)
delete mode 100644 include/hw/ide.h
create mode 100644 include/hw/ide/ide-bus.h
create mode 100644 include/hw/ide/ide-dev.h
create mode 100644 include/hw/ide/ide-dma.h
create mode 100644 include/hw/pci-host/ppc4xx.h
create mode 100644 hw/ide/cf.c
create mode 100644 hw/ide/ide-bus.c
rename hw/ide/{qdev.c => ide-dev.c} (67%)
rename hw/{ppc => pci-host}/ppc440_pcix.c (99%)
rename hw/{ppc => pci-host}/ppc4xx_pci.c (99%)Signature · 1 line
2.41.0
[PULL 02/25] 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.
Message-Id: <[email protected]>
--- include/hw/sysbus.h | 2 -- hw/core/sysbus.c | 6 ------ hw/i386/kvmvapic.c | 2 +- hw/mips/mipssim.c | 2 +- hw/nvram/fw_cfg.c | 5 +++-- 5 files changed, 5 insertions(+), 12 deletions(-)
include/hw/sysbus.h +0 -2
@@ -83,8 +83,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority);void sysbus_mmio_unmap (SysBusDevice *dev,int n); -void sysbus_add_io (SysBusDevice *dev,hwaddr addr, -MemoryRegion *mem);MemoryRegion *sysbus_address_space (SysBusDevice *dev);bool sysbus_realize (SysBusDevice *dev,Error **errp);
hw/core/sysbus.c +0 -6
@@ -298,12 +298,6 @@ static char *sysbus_get_fw_dev_path(DeviceState *dev)return g_strdup (qdev_fw_name (dev)); } -void sysbus_add_io (SysBusDevice *dev,hwaddr addr, -MemoryRegion *mem) -{ -memory_region_add_subregion (get_system_io (), addr, mem); -} -MemoryRegion *sysbus_address_space (SysBusDevice *dev) {return get_system_memory ();
hw/i386/kvmvapic.c +1 -1
@@ -727,7 +727,7 @@ static void vapic_realize(DeviceState *dev, Error **errp)VAPICROMState *s =VAPIC (dev);memory_region_init_io (&s->io,OBJECT (s), &vapic_ops, s,"kvmvapic" ,2 ); -sysbus_add_io (sbd,VAPIC_IO_PORT , &s->io); +memory_region_add_subregion (get_system_io (),VAPIC_IO_PORT , &s->io);sysbus_init_ioports (sbd,VAPIC_IO_PORT ,2 ); option_rom[nb_option_roms].name ="kvmvapic.bin" ;
hw/mips/mipssim.c +1 -1
@@ -226,7 +226,7 @@ mips_mipssim_init(MachineState *machine)qdev_prop_set_uint8 (dev,"endianness" ,DEVICE_LITTLE_ENDIAN );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , env->irq[4 ]); -sysbus_add_io (SYS_BUS_DEVICE (dev),0x3f8 , +memory_region_add_subregion (get_system_io (),0x3f8 ,sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); }
hw/nvram/fw_cfg.c +3 -2
@@ -1142,6 +1142,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,SysBusDevice *sbd;FWCfgIoState *ios;FWCfgState *s; +MemoryRegion *iomem =get_system_io ();bool dma_requested = dma_iobase && dma_as; dev =qdev_new (TYPE_FW_CFG_IO );
@@ -1155,7 +1156,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, sbd =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbd, &error_fatal); ios =FW_CFG_IO (dev); -sysbus_add_io (sbd, iobase, &ios->comb_iomem); +memory_region_add_subregion (iomem, iobase, &ios->comb_iomem); s =FW_CFG (dev);
@@ -1163,7 +1164,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,/* 64 bits for the address field */ s->dma_as = dma_as; s->dma_addr =0 ; -sysbus_add_io (sbd, dma_iobase, &s->dma_iomem); +memory_region_add_subregion (iomem, dma_iobase, &s->dma_iomem); }return s;
Signature · 1 line
2.41.0
[PULL 01/25] hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
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.
Message-Id: <[email protected]>
--- include/hw/input/i8042.h | 1 - hw/i386/pc.c | 3 ++- hw/input/pckbd.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
include/hw/input/i8042.h +0 -1
@@ -89,7 +89,6 @@ struct MMIOKBDState {void i8042_isa_mouse_fake_event (ISAKBDState *isa); -void i8042_setup_a20_line (ISADevice *dev,qemu_irq a20_out);static inline bool i8042_present (void ) {
hw/i386/pc.c +2 -1
@@ -1195,7 +1195,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, port92 =isa_create_simple (isa_bus,TYPE_PORT92 ); a20_line =qemu_allocate_irqs (handle_a20_line_change, first_cpu,2 ); -i8042_setup_a20_line (i8042, a20_line[0 ]); +qdev_connect_gpio_out_named (DEVICE (i8042), +I8042_A20_LINE ,0 , a20_line[0 ]);qdev_connect_gpio_out_named (DEVICE (port92),PORT92_A20_LINE ,0 , a20_line[1 ]);g_free (a20_line);
hw/input/pckbd.c +0 -5
@@ -777,11 +777,6 @@ void i8042_isa_mouse_fake_event(ISAKBDState *isa)ps2_mouse_fake_event (&s->ps2mouse); } -void i8042_setup_a20_line (ISADevice *dev,qemu_irq a20_out) -{ -qdev_connect_gpio_out_named (DEVICE (dev),I8042_A20_LINE ,0 , a20_out); -} -static const VMStateDescription vmstate_kbd_isa = { .name ="pckbd" , .version_id =3 ,
Signature · 1 line
2.41.0
[PULL 03/25] hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- hw/ppc/ppc440_pcix.c | 1 - hw/ppc/ppc4xx_pci.c | 1 - 2 files changed, 2 deletions(-)
hw/ppc/ppc440_pcix.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/module.h" #include "qemu/units.h" #include "hw/irq.h" -#include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h"
hw/ppc/ppc4xx_pci.c +0 -1
@@ -24,7 +24,6 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/irq.h" -#include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "migration/vmstate.h" #include "qemu/module.h"
Signature · 1 line
2.41.0
[PULL 06/25] hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/
In reply to Philippe Mathieu-Daudé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.
Message-Id: <[email protected]>
---
MAINTAINERS | 2 +-
hw/{ppc => pci-host}/ppc440_pcix.c | 0
hw/pci-host/Kconfig | 4 ++++
hw/pci-host/meson.build | 1 +
hw/pci-host/trace-events | 8 ++++++++
hw/ppc/Kconfig | 1 +
hw/ppc/meson.build | 2 +-
hw/ppc/trace-events | 8 --------
8 files changed, 16 insertions(+), 10 deletions(-)
rename hw/{ppc => pci-host}/ppc440_pcix.c (100%)MAINTAINERS +1 -1
@@ -1556,7 +1556,7 @@ L: [email protected] S: Maintained F: hw/ppc/sam460ex.c F: hw/ppc/ppc440_uc.c -F: hw/ppc/ppc440_pcix.c +F: hw/pci-host/ppc440_pcix.c F: hw/display/sm501* F: hw/ide/sii3112.c F: hw/rtc/m41t80.c
hw/pci-host/ppc440_pcix.c renamed from hw/ppc/ppc440_pcix.c +0 -0
hw/pci-host/Kconfig +4 -0
@@ -10,6 +10,10 @@ config PPC4XX_PCI bool select PCI +config PPC440_PCIX + bool + select PCI + config RAVEN_PCI bool select PCI
hw/pci-host/meson.build +1 -0
@@ -15,6 +15,7 @@ pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) # PPC devices pci_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) +pci_ss.add(when: 'CONFIG_PPC440_PCIX', if_true: files('ppc440_pcix.c')) pci_ss.add(when: 'CONFIG_RAVEN_PCI', if_true: files('raven.c')) pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c')) # NewWorld PowerMac
hw/pci-host/trace-events +8 -0
@@ -41,6 +41,14 @@ unin_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" +# ppc440_pcix.c +ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" +ppc440_pcix_set_irq(int irq_num) "PCI irq %d" +ppc440_pcix_update_pim(int idx, uint64_t size, uint64_t la) "Added window %d of size=0x%" PRIx64 " to CPU=0x%" PRIx64 +ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia) "Added window %d of size=0x%x from CPU=0x%" PRIx64 " to PCI=0x%" PRIx64 +ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 +ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x%" PRIx64 " = 0x%" PRIx32 " size 0x%" PRIx32 + # pnv_phb4.c pnv_phb4_xive_notify(uint64_t notif_port, uint64_t data) "notif=@0x%"PRIx64" data=0x%"PRIx64 pnv_phb4_xive_notify_ic(uint64_t addr, uint64_t data) "addr=@0x%"PRIx64" data=0x%"PRIx64
hw/ppc/Kconfig +1 -0
@@ -46,6 +46,7 @@ config PPC440 imply TEST_DEVICES imply E1000_PCI select PCI_EXPRESS + select PPC440_PCIX select PPC4XX select SERIAL select FDT_PPC
hw/ppc/meson.build +1 -1
@@ -60,7 +60,7 @@ ppc_ss.add(when: 'CONFIG_PPC405', if_true: files( 'ppc405_uc.c')) ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( 'ppc440_bamboo.c', - 'ppc440_pcix.c', 'ppc440_uc.c')) + 'ppc440_uc.c')) ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( 'ppc4xx_devs.c', 'ppc4xx_sdram.c'))
hw/ppc/trace-events +0 -8
@@ -146,14 +146,6 @@ rs6000mc_size_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x" rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x" rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x" -# ppc440_pcix.c -ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" -ppc440_pcix_set_irq(int irq_num) "PCI irq %d" -ppc440_pcix_update_pim(int idx, uint64_t size, uint64_t la) "Added window %d of size=0x%" PRIx64 " to CPU=0x%" PRIx64 -ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia) "Added window %d of size=0x%x from CPU=0x%" PRIx64 " to PCI=0x%" PRIx64 -ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 -ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x%" PRIx64 " = 0x%" PRIx32 " size 0x%" PRIx32 - # ppc405_boards.c opba_readb(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 opba_writeb(uint64_t addr, uint64_t val) "addr 0x%" PRIx64 " = 0x%" PRIx64
Signature · 1 line
2.41.0
[PULL 10/25] hw/i386/pc: Do pc_cmos_init_late() from pc_machine_done()
In reply to Philippe Mathieu-DaudéFrom: Peter Maydell <[email protected]>
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.
Message-ID: <[email protected]>
--- hw/i386/pc.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-)
hw/i386/pc.c +16 -23
@@ -465,11 +465,6 @@ static void pc_cmos_init_floppy(MC146818RtcState *rtc_state, ISADevice *floppy)mc146818rtc_set_cmos_data (rtc_state,REG_EQUIPMENT_BYTE , val); } -typedef struct pc_cmos_init_late_arg { -MC146818RtcState *rtc_state; -BusState *idebus[2 ]; -}pc_cmos_init_late_arg ; - typedef struct check_fdc_state { ISADevice *floppy; bool multiple;
@@ -530,23 +525,25 @@ static ISADevice *pc_find_fdc0(void)return state.floppy; } -static void pc_cmos_init_late (void *opaque) +static void pc_cmos_init_late (PCMachineState *pcms) { -pc_cmos_init_late_arg *arg = opaque; -MC146818RtcState *s = arg->rtc_state; +X86MachineState *x86ms =X86_MACHINE (pcms); +MC146818RtcState *s =MC146818_RTC (x86ms->rtc);int16_t cylinders;int8_t heads, sectors;int val;int i, trans; val =0 ; -if (arg->idebus[0 ] &&ide_get_geometry (arg->idebus[0 ],0 , - &cylinders, &heads, §ors) >=0 ) { +if (pcms->idebus[0 ] && +ide_get_geometry (pcms->idebus[0 ],0 , + &cylinders, &heads, §ors) >=0 ) {cmos_init_hd (s,0x19 ,0x1b , cylinders, heads, sectors); val |=0xf0 ; } -if (arg->idebus[0 ] &&ide_get_geometry (arg->idebus[0 ],1 , - &cylinders, &heads, §ors) >=0 ) { +if (pcms->idebus[0 ] && +ide_get_geometry (pcms->idebus[0 ],1 , + &cylinders, &heads, §ors) >=0 ) {cmos_init_hd (s,0x1a ,0x24 , cylinders, heads, sectors); val |=0x0f ; }
@@ -558,10 +555,11 @@ static void pc_cmos_init_late(void *opaque)geometry. It is always such that: 1 <= sects <= 63, 1 <= heads <= 16, 1 <= cylinders <= 16383. The BIOS geometry can be different if a translation is done. */ -if (arg->idebus[i /2 ] && -ide_get_geometry (arg->idebus[i /2 ], i %2 , +BusState *idebus = pcms->idebus[i /2 ]; +if (idebus && +ide_get_geometry (idebus, i %2 , &cylinders, &heads, §ors) >=0 ) { - trans =ide_get_bios_chs_trans (arg->idebus[i /2 ], i %2 ) -1 ; + trans =ide_get_bios_chs_trans (idebus, i %2 ) -1 ;assert ((trans & ~3 ) ==0 ); val |= trans << (i *2 ); }
@@ -569,15 +567,12 @@ static void pc_cmos_init_late(void *opaque)mc146818rtc_set_cmos_data (s,0x39 , val);pc_cmos_init_floppy (s,pc_find_fdc0 ()); - -qemu_unregister_reset (pc_cmos_init_late, opaque); }void pc_cmos_init (PCMachineState *pcms,ISADevice *rtc) {int val; -static pc_cmos_init_late_arg arg;X86MachineState *x86ms =X86_MACHINE (pcms);MC146818RtcState *s =MC146818_RTC (rtc);
@@ -631,11 +626,7 @@ void pc_cmos_init(PCMachineState *pcms, val |=0x04 ;/* PS/2 mouse installed */ mc146818rtc_set_cmos_data (s,REG_EQUIPMENT_BYTE , val); -/* hard drives and FDC */ - arg.rtc_state = s; - arg.idebus[0 ] = pcms->idebus[0 ]; - arg.idebus[1 ] = pcms->idebus[1 ]; -qemu_register_reset (pc_cmos_init_late, &arg); +/* hard drives and FDC are handled by pc_cmos_init_late() */ }static void handle_a20_line_change (void *opaque,int irq,int level)
@@ -703,6 +694,8 @@ void pc_machine_done(Notifier *notifier, void *data)/* update FW_CFG_NB_CPUS to account for -device added CPUs */ fw_cfg_modify_i16 (x86ms->fw_cfg,FW_CFG_NB_CPUS , x86ms->boot_cpus); } + +pc_cmos_init_late (pcms); }void pc_guest_info_init (PCMachineState *pcms)
Signature · 1 line
2.41.0
[PULL 16/25] hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI function
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
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.
Message-ID: <[email protected]>
--- hw/i386/pc_q35.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/pc_q35.c +1 -1
@@ -228,10 +228,10 @@ static void pc_q35_init(MachineState *machine) lpc_dev =DEVICE (lpc);qdev_prop_set_bit (lpc_dev,"smm-enabled" ,x86_machine_is_smm_enabled (x86ms)); -pci_realize_and_unref (lpc, host_bus, &error_fatal);for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {qdev_connect_gpio_out_named (lpc_dev,ICH9_GPIO_GSI , i, x86ms->gsi[i]); } +pci_realize_and_unref (lpc, host_bus, &error_fatal); rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (lpc),"rtc" ));
Signature · 1 line
2.41.0
[PULL 07/25] hw/i2c/smbus_slave: Add object path on error prints
In reply to Philippe Mathieu-DaudéFrom: Joe Komlodi <[email protected]>
The current logging doesn't tell us which specific smbus device is an error state.
Message-ID: <[email protected]>
--- hw/i2c/smbus_slave.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
hw/i2c/smbus_slave.c +6 -2
@@ -25,11 +25,15 @@#define DPRINTF (fmt, ...) \ do { printf("smbus(%02x): " fmt , dev->i2c.address, ## __VA_ARGS__); } while (0)#define BADF (fmt, ...) \ -do { fprintf(stderr, "smbus: error: " fmt , ## __VA_ARGS__); exit(1);} while (0) +do { g_autofree char *qom_path = object_get_canonical_path(OBJECT(dev)); \ + fprintf(stderr, "%s: smbus: error: " fmt , qom_path, ## __VA_ARGS__); \ + exit(1); } while (0)#else #define DPRINTF (fmt, ...) do {} while(0)#define BADF (fmt, ...) \ -do { fprintf(stderr, "smbus: error: " fmt , ## __VA_ARGS__);} while (0) +do { g_autofree char *qom_path = object_get_canonical_path(OBJECT(dev)); \ + fprintf(stderr, "%s: smbus: error: " fmt , qom_path, ## __VA_ARGS__); \ + } while (0)#endif enum {
Signature · 1 line
2.41.0
[PULL 13/25] hw/i386/pc: Defer smbios_set_defaults() to machine_done
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
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.
Message-ID: <[email protected]>
--- hw/i386/fw_cfg.h | 3 ++- include/hw/i386/pc.h | 1 - hw/i386/fw_cfg.c | 12 +++++++++++- hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 10 ---------- hw/i386/pc_q35.c | 9 --------- 6 files changed, 14 insertions(+), 23 deletions(-)
hw/i386/fw_cfg.h +2 -1
@@ -10,6 +10,7 @@#define HW_I386_FW_CFG_H #include "hw/boards.h" +#include "hw/i386/pc.h" #include "hw/nvram/fw_cfg.h" #define FW_CFG_IO_BASE 0x510
@@ -22,7 +23,7 @@FWCfgState *fw_cfg_arch_create (MachineState *ms,uint16_t boot_cpus,uint16_t apic_id_limit); -void fw_cfg_build_smbios (MachineState *ms,FWCfgState *fw_cfg); +void fw_cfg_build_smbios (PCMachineState *ms,FWCfgState *fw_cfg);void fw_cfg_build_feature_control (MachineState *ms,FWCfgState *fw_cfg);void fw_cfg_add_acpi_dsdt (Aml *scope,FWCfgState *fw_cfg);
include/hw/i386/pc.h +0 -1
@@ -12,7 +12,6 @@#include "hw/hotplug.h" #include "qom/object.h" #include "hw/i386/sgx-epc.h" -#include "hw/firmware/smbios.h" #include "hw/cxl/cxl.h" #define HPET_INTCAP "hpet-intcap"
hw/i386/fw_cfg.c +11 -1
@@ -48,15 +48,25 @@ const char *fw_cfg_arch_key_name(uint16_t key)return NULL ; } -void fw_cfg_build_smbios (MachineState *ms,FWCfgState *fw_cfg) +void fw_cfg_build_smbios (PCMachineState *pcms,FWCfgState *fw_cfg) {#ifdef CONFIG_SMBIOS uint8_t *smbios_tables, *smbios_anchor;size_t smbios_tables_len, smbios_anchor_len;struct smbios_phys_mem_area *mem_array;unsigned i, array_count; +MachineState *ms =MACHINE (pcms); +PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms); +MachineClass *mc =MACHINE_GET_CLASS (pcms);X86CPU *cpu =X86_CPU (ms->possible_cpus->cpus[0 ].cpu); +if (pcmc->smbios_defaults) { +/* These values are guest ABI, do not change */ +smbios_set_defaults ("QEMU" , mc->desc, mc->name, + pcmc->smbios_legacy_mode, pcmc->smbios_uuid_encoded, + pcms->smbios_entry_point_type); + } +/* tell smbios about cpuid version and features */ smbios_set_cpuid (cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX ]);
hw/i386/pc.c +1 -1
@@ -689,7 +689,7 @@ void pc_machine_done(Notifier *notifier, void *data)acpi_setup ();if (x86ms->fw_cfg) { -fw_cfg_build_smbios (MACHINE (pcms), x86ms->fw_cfg); +fw_cfg_build_smbios (pcms, x86ms->fw_cfg);fw_cfg_build_feature_control (MACHINE (pcms), x86ms->fw_cfg);/* update FW_CFG_NB_CPUS to account for -device added CPUs */ fw_cfg_modify_i16 (x86ms->fw_cfg,FW_CFG_NB_CPUS , x86ms->boot_cpus);
hw/i386/pc_piix.c +0 -10
@@ -36,7 +36,6 @@#include "hw/rtc/mc146818rtc.h" #include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" -#include "hw/firmware/smbios.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" #include "hw/usb.h"
@@ -225,15 +224,6 @@ static void pc_init1(MachineState *machine, &error_abort); } -if (pcmc->smbios_defaults) { -MachineClass *mc =MACHINE_GET_CLASS (machine); -/* These values are guest ABI, do not change */ -smbios_set_defaults ("QEMU" , mc->desc, - mc->name, pcmc->smbios_legacy_mode, - pcmc->smbios_uuid_encoded, - pcms->smbios_entry_point_type); - } -/* allocate ram and load rom/bios */ if (!xen_enabled ()) {pc_memory_init (pcms, system_memory, rom_memory, hole64_size);
hw/i386/pc_q35.c +0 -9
@@ -45,7 +45,6 @@#include "hw/i386/amd_iommu.h" #include "hw/i386/intel_iommu.h" #include "hw/display/ramfb.h" -#include "hw/firmware/smbios.h" #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" #include "hw/intc/ioapic.h"
@@ -188,14 +187,6 @@ static void pc_q35_init(MachineState *machine)kvmclock_create (pcmc->kvmclock_create_always); } -if (pcmc->smbios_defaults) { -/* These values are guest ABI, do not change */ -smbios_set_defaults ("QEMU" , mc->desc, - mc->name, pcmc->smbios_legacy_mode, - pcmc->smbios_uuid_encoded, - pcms->smbios_entry_point_type); - } -/* create pci host bus */ phb =OBJECT (qdev_new (TYPE_Q35_HOST_DEVICE ));
Signature · 1 line
2.41.0
[PULL 11/25] hw/i386/x86: Turn apic_xrupt_override into class attribute
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
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().
Message-ID: <[email protected]>
--- include/hw/i386/x86.h | 3 ++- hw/i386/acpi-common.c | 3 ++- hw/i386/pc.c | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-)
include/hw/i386/x86.h +2 -1
@@ -34,6 +34,8 @@ struct X86MachineClass {bool save_tsc_khz;/* use DMA capable linuxboot option rom */ bool fwcfg_dma_enabled; +/* CPU and apic information: */ +bool apic_xrupt_override; };struct X86MachineState {
@@ -57,7 +59,6 @@ struct X86MachineState {uint64_t above_4g_mem_start;/* CPU and apic information: */ -bool apic_xrupt_override;unsigned pci_irq_mask;unsigned apic_id_limit;uint16_t boot_cpus;
hw/i386/acpi-common.c +2 -1
@@ -100,6 +100,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,int i;bool x2apic_mode = false;MachineClass *mc =MACHINE_GET_CLASS (x86ms); +X86MachineClass *x86mc =X86_MACHINE_GET_CLASS (x86ms);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (MACHINE (x86ms));AcpiTable table = { .sig ="APIC" , .rev =3 , .oem_id = oem_id, .oem_table_id = oem_table_id };
@@ -122,7 +123,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE); } -if (x86ms->apic_xrupt_override) { +if (x86mc->apic_xrupt_override) {build_xrupt_override (table_data,0 ,2 ,0 /* Flags: Conforms to the specifications of the bus */ ); }
hw/i386/pc.c +2 -3
@@ -700,9 +700,6 @@ void pc_machine_done(Notifier *notifier, void *data)void pc_guest_info_init (PCMachineState *pcms) { -X86MachineState *x86ms =X86_MACHINE (pcms); - - x86ms->apic_xrupt_override = true; pcms->machine_done.notify = pc_machine_done;qemu_add_machine_init_done_notifier (&pcms->machine_done); }
@@ -1795,6 +1792,7 @@ static bool pc_hotplug_allowed(MachineState *ms, DeviceState *dev, Error **errp)static void pc_machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc); +X86MachineClass *x86mc =X86_MACHINE_CLASS (oc);PCMachineClass *pcmc =PC_MACHINE_CLASS (oc);HotplugHandlerClass *hc =HOTPLUG_HANDLER_CLASS (oc);
@@ -1814,6 +1812,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->pvh_enabled = true; pcmc->kvmclock_create_always = true; pcmc->resizable_acpi_blob = true; + x86mc->apic_xrupt_override = true;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = pc_get_hotplug_handler; mc->hotplug_allowed = pc_hotplug_allowed;
Signature · 1 line
2.41.0
[PULL 14/25] hw/i386/pc: Confine system flash handling to pc_sysfw
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
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.
Message-ID: <[email protected]>
--- include/hw/i386/pc.h | 2 -- hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_sysfw.c | 6 ++++-- 4 files changed, 4 insertions(+), 6 deletions(-)
include/hw/i386/pc.h +0 -2
@@ -193,8 +193,6 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);#define TYPE_PORT92 "port92"/* pc_sysfw.c */ -void pc_system_flash_create (PCMachineState *pcms); -void pc_system_flash_cleanup_unused (PCMachineState *pcms);void pc_system_firmware_init (PCMachineState *pcms,MemoryRegion *rom_memory);bool pc_system_ovmf_table_find (const char *entry,uint8_t **data,int *data_len);
hw/i386/pc.c +0 -1
@@ -1733,7 +1733,6 @@ static void pc_machine_initfn(Object *obj)#endif pcms->default_bus_bypass_iommu = false; -pc_system_flash_create (pcms); pcms->pcspk =isa_new (TYPE_PC_SPEAKER );object_property_add_alias (OBJECT (pcms),"pcspk-audiodev" ,OBJECT (pcms->pcspk),"audiodev" );
hw/i386/pc_piix.c +0 -1
@@ -231,7 +231,6 @@ static void pc_init1(MachineState *machine,assert (machine->ram_size == x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); -pc_system_flash_cleanup_unused (pcms);if (machine->kernel_filename !=NULL ) {/* For xen HVM direct kernel boot, load linux here */ xen_load_linux (pcms);
hw/i386/pc_sysfw.c +4 -2
@@ -91,7 +91,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,return PFLASH_CFI01 (dev); } -void pc_system_flash_create (PCMachineState *pcms) +static void pc_system_flash_create (PCMachineState *pcms) {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);
@@ -103,7 +103,7 @@ void pc_system_flash_create(PCMachineState *pcms) } } -void pc_system_flash_cleanup_unused (PCMachineState *pcms) +static void pc_system_flash_cleanup_unused (PCMachineState *pcms) {char *prop_name;int i;
@@ -212,6 +212,8 @@ void pc_system_firmware_init(PCMachineState *pcms,return ; } +pc_system_flash_create (pcms); +/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_cfi01_legacy_drive(pcms->flash[i],
Signature · 1 line
2.41.0
Re: [PULL 14/25] hw/i386/pc: Confine system flash handling to pc_sysfw
Am 21.02.24 um 22:16 schrieb Philippe Mathieu-Daudé:
Quoted 9 lines
From: Bernhard Beschow <[email protected]>
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 topc_system_flash_cleanup_unused()in the Xen case.Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 8 lines
Message-ID: <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/i386/pc.h | 2 -- hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_sysfw.c | 6 ++++-- 4 files changed, 4 insertions(+), 6 deletions(-)
Hi Bernhard,
this patch breaks QEMU on my system.
./qemu-system-x86_64 -machine q35,pflash0=pflash0-storage -blockdev driver=file,node-name=pflash0-storage,filename=/usr/share/qemu/ovmf-x86_64.bin,read-only=true
qemu-system-x86_64: Property 'pc-q35-9.0-machine.pflash0' not found
I had to revert cb05cc1602 ("hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it") and 6f6ad2b245 ("hw/i386/pc:
Confine system flash handling to pc_sysfw") to make it work again.
With best regards,
Volker
Quoted 68 lines
include/hw/i386/pc.h +0
-2@@ -193,8 +193,6 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);#define TYPE_PORT92 "port92"/* pc_sysfw.c */ -void pc_system_flash_create (PCMachineState *pcms); -void pc_system_flash_cleanup_unused (PCMachineState *pcms);void pc_system_firmware_init (PCMachineState *pcms,MemoryRegion *rom_memory);bool pc_system_ovmf_table_find (const char *entry,uint8_t **data,int *data_len);hw/i386/pc.c +0
-1@@ -1733,7 +1733,6 @@ static void pc_machine_initfn(Object *obj)#endif pcms->default_bus_bypass_iommu = false; -pc_system_flash_create (pcms); pcms->pcspk =isa_new (TYPE_PC_SPEAKER );object_property_add_alias (OBJECT (pcms),"pcspk-audiodev" ,OBJECT (pcms->pcspk),"audiodev" );hw/i386/pc_piix.c +0
-1@@ -231,7 +231,6 @@ static void pc_init1(MachineState *machine,assert (machine->ram_size == x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); -pc_system_flash_cleanup_unused (pcms);if (machine->kernel_filename !=NULL ) {/* For xen HVM direct kernel boot, load linux here */ xen_load_linux (pcms);hw/i386/pc_sysfw.c +4
-2@@ -91,7 +91,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,return PFLASH_CFI01 (dev); } -void pc_system_flash_create (PCMachineState *pcms) +static void pc_system_flash_create (PCMachineState *pcms) {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);@@ -103,7 +103,7 @@ void pc_system_flash_create(PCMachineState *pcms) } } -void pc_system_flash_cleanup_unused (PCMachineState *pcms) +static void pc_system_flash_cleanup_unused (PCMachineState *pcms) {char *prop_name;int i;@@ -212,6 +212,8 @@ void pc_system_firmware_init(PCMachineState *pcms,return ; } +pc_system_flash_create (pcms); +/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_cfi01_legacy_drive(pcms->flash[i],
Re: [PULL 14/25] hw/i386/pc: Confine system flash handling to pc_sysfw
Am 25. Februar 2024 13:03:46 UTC schrieb "Volker Rümelin" <[email protected]>:
Quoted 19 lines
Am 21.02.24 um 22:16 schrieb Philippe Mathieu-Daudé:
Quoted 9 lines
From: Bernhard Beschow <[email protected]>
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 topc_system_flash_cleanup_unused()in the Xen case.Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Quoted 8 lines
Message-ID: <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/i386/pc.h | 2 -- hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_sysfw.c | 6 ++++-- 4 files changed, 4 insertions(+), 6 deletions(-)
Quoted 1 line
Hi Bernhard,
Hi Volker,
Quoted 10 lines
this patch breaks QEMU on my system.
./qemu-system-x86_64 -machine q35,pflash0=pflash0-storage -blockdev driver=file,node-name=pflash0-storage,filename=/usr/share/qemu/ovmf-x86_64.bin,read-only=true
qemu-system-x86_64: Property 'pc-q35-9.0-machine.pflash0' not foundI had to revert
cb05cc1602("hw/i386/pc_sysfw: Inlinepc_system_flash_create()and remove it") and6f6ad2b245("hw/i386/pc:
Confine system flash handling topc_sysfw") to make it work again.
In my tests I've followed https://wiki.archlinux.org/title/QEMU#Booting_in_UEFI_mode for both pc and q35 machine, and therefore missed the machine properties. If there is no way to fix it with compat properties or the like, I propose to revert the two patches until a different solution is found.
Best regards,
Bernhard
Quoted 73 lines
With best regards,
VolkerQuoted 68 lines
include/hw/i386/pc.h +0
-2@@ -193,8 +193,6 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);#define TYPE_PORT92 "port92"/* pc_sysfw.c */ -void pc_system_flash_create (PCMachineState *pcms); -void pc_system_flash_cleanup_unused (PCMachineState *pcms);void pc_system_firmware_init (PCMachineState *pcms,MemoryRegion *rom_memory);bool pc_system_ovmf_table_find (const char *entry,uint8_t **data,int *data_len);hw/i386/pc.c +0
-1@@ -1733,7 +1733,6 @@ static void pc_machine_initfn(Object *obj)#endif pcms->default_bus_bypass_iommu = false; -pc_system_flash_create (pcms); pcms->pcspk =isa_new (TYPE_PC_SPEAKER );object_property_add_alias (OBJECT (pcms),"pcspk-audiodev" ,OBJECT (pcms->pcspk),"audiodev" );hw/i386/pc_piix.c +0
-1@@ -231,7 +231,6 @@ static void pc_init1(MachineState *machine,assert (machine->ram_size == x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); -pc_system_flash_cleanup_unused (pcms);if (machine->kernel_filename !=NULL ) {/* For xen HVM direct kernel boot, load linux here */ xen_load_linux (pcms);hw/i386/pc_sysfw.c +4
-2@@ -91,7 +91,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,return PFLASH_CFI01 (dev); } -void pc_system_flash_create (PCMachineState *pcms) +static void pc_system_flash_create (PCMachineState *pcms) {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);@@ -103,7 +103,7 @@ void pc_system_flash_create(PCMachineState *pcms) } } -void pc_system_flash_cleanup_unused (PCMachineState *pcms) +static void pc_system_flash_cleanup_unused (PCMachineState *pcms) {char *prop_name;int i;@@ -212,6 +212,8 @@ void pc_system_firmware_init(PCMachineState *pcms,return ; } +pc_system_flash_create (pcms); +/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_cfi01_legacy_drive(pcms->flash[i],
[PULL 04/25] hw/ppc/ppc4xx_pci: Extract PCI host definitions to hw/pci-host/ppc4xx.h
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- MAINTAINERS | 1 + include/hw/pci-host/ppc4xx.h | 17 +++++++++++++++++ include/hw/ppc/ppc4xx.h | 5 ----- hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/ppc440_pcix.c | 2 +- hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_pci.c | 2 +- hw/ppc/sam460ex.c | 1 + 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 include/hw/pci-host/ppc4xx.h
MAINTAINERS +1 -0
@@ -2070,6 +2070,7 @@ F: hw/ppc/ppc4xx*.c F: hw/ppc/ppc440_uc.c F: hw/ppc/ppc440.h F: hw/i2c/ppc4xx_i2c.c +F: include/hw/pci-host/ppc4xx.h F: include/hw/ppc/ppc4xx.h F: include/hw/i2c/ppc4xx_i2c.h F: hw/intc/ppc-uic.c
include/hw/pci-host/ppc4xx.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* QEMU PowerPC 4xx PCI-host definitions +* +* Copyright (c) 2018-2023 BALATON Zoltan +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_PCIHOST_PPC4XX_H +#define HW_PCIHOST_PPC4XX_H + +#define TYPE_PPC4xx_HOST_BRIDGE "ppc4xx-host-bridge" +#define TYPE_PPC4xx_PCI_HOST "ppc4xx-pci-host" +#define TYPE_PPC440_PCIX_HOST "ppc440-pcix-host" +#define TYPE_PPC460EX_PCIE_HOST "ppc460ex-pcie-host" + +#endif
include/hw/ppc/ppc4xx.h +0 -5
@@ -29,11 +29,6 @@#include "exec/memory.h" #include "hw/sysbus.h" -#define TYPE_PPC4xx_HOST_BRIDGE "ppc4xx-host-bridge" -#define TYPE_PPC4xx_PCI_HOST "ppc4xx-pci-host" -#define TYPE_PPC440_PCIX_HOST "ppc440-pcix-host" -#define TYPE_PPC460EX_PCIE_HOST "ppc460ex-pcie-host" -/* * Generic DCR device */
hw/ppc/ppc440_bamboo.c +1 -0
@@ -24,6 +24,7 @@#include "elf.h" #include "hw/char/serial.h" #include "hw/ppc/ppc.h" +#include "hw/pci-host/ppc4xx.h" #include "sysemu/sysemu.h" #include "sysemu/reset.h" #include "hw/sysbus.h"
hw/ppc/ppc440_pcix.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/module.h" #include "qemu/units.h" #include "hw/irq.h" -#include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "trace.h"
hw/ppc/ppc440_uc.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/log.h" #include "hw/irq.h" #include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/qdev-properties.h" #include "hw/pci/pci.h" #include "sysemu/reset.h"
hw/ppc/ppc4xx_pci.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/irq.h" -#include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/reset.h"
hw/ppc/sam460ex.c +1 -0
@@ -25,6 +25,7 @@#include "elf.h" #include "exec/memory.h" #include "ppc440.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/reset.h"
Signature · 1 line
2.41.0
[PULL 05/25] hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/
In reply to Philippe Mathieu-Daudé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.
Message-Id: <[email protected]>
---
MAINTAINERS | 1 +
hw/{ppc => pci-host}/ppc4xx_pci.c | 0
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/Kconfig | 4 ++++
hw/pci-host/meson.build | 1 +
hw/pci-host/trace-events | 4 ++++
hw/ppc/Kconfig | 2 +-
hw/ppc/meson.build | 1 -
hw/ppc/trace-events | 4 ----
9 files changed, 12 insertions(+), 7 deletions(-)
rename hw/{ppc => pci-host}/ppc4xx_pci.c (100%)MAINTAINERS +1 -0
@@ -1423,6 +1423,7 @@ Bamboo L: [email protected] S: Orphan F: hw/ppc/ppc440_bamboo.c +F: hw/pci-host/ppc4xx_pci.c F: tests/avocado/ppc_bamboo.py e500
hw/pci-host/ppc4xx_pci.c renamed from hw/ppc/ppc4xx_pci.c +0 -0
hw/pci-host/ppce500.c +1 -1
@@ -5,7 +5,7 @@* * Author: Yu Liu, <[email protected]> * -* This file is derived from hw/ppc4xx_pci.c, +* This file is derived from ppc4xx_pci.c, * the copyright for that material belongs to the original owners. * * This is free software; you can redistribute it and/or modify
hw/pci-host/Kconfig +4 -0
@@ -6,6 +6,10 @@ config XEN_IGD_PASSTHROUGH default y depends on XEN && PCI_I440FX +config PPC4XX_PCI + bool + select PCI + config RAVEN_PCI bool select PCI
hw/pci-host/meson.build +1 -0
@@ -14,6 +14,7 @@ pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c')) pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) # PPC devices +pci_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) pci_ss.add(when: 'CONFIG_RAVEN_PCI', if_true: files('raven.c')) pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c')) # NewWorld PowerMac
hw/pci-host/trace-events +4 -0
@@ -37,6 +37,10 @@ unin_data_read(uint64_t addr, unsigned len, uint64_t val) "read addr 0x%"PRIx64 unin_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 unin_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 +# ppc4xx_pci.c +ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" +ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" + # pnv_phb4.c pnv_phb4_xive_notify(uint64_t notif_port, uint64_t data) "notif=@0x%"PRIx64" data=0x%"PRIx64 pnv_phb4_xive_notify_ic(uint64_t addr, uint64_t data) "addr=@0x%"PRIx64" data=0x%"PRIx64
hw/ppc/Kconfig +1 -1
@@ -53,7 +53,7 @@ config PPC440 config PPC4XX bool select BITBANG_I2C - select PCI + select PPC4XX_PCI select PPC_UIC config SAM460EX
hw/ppc/meson.build +0 -1
@@ -63,7 +63,6 @@ ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( 'ppc440_pcix.c', 'ppc440_uc.c')) ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( 'ppc4xx_devs.c', - 'ppc4xx_pci.c', 'ppc4xx_sdram.c')) ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c')) # PReP
hw/ppc/trace-events +0 -4
@@ -146,10 +146,6 @@ rs6000mc_size_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x" rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x" rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x" -# ppc4xx_pci.c -ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" -ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" - # ppc440_pcix.c ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %d -> %d" ppc440_pcix_set_irq(int irq_num) "PCI irq %d"
Signature · 1 line
2.41.0
[PULL 20/25] hw/ide: Move IDE DMA related definitions to a separate header ide-dma.h
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
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.
Message-ID: <[email protected]>
--- include/hw/ide/ide-dma.h | 37 +++++++++++++++++++++++++++++++++++++ include/hw/ide/internal.h | 29 +---------------------------- 2 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 include/hw/ide/ide-dma.h
include/hw/ide/ide-dma.h new file +37 -0
@@ -0,0 +1,37 @@ +#ifndef HW_IDE_DMA_H +#define HW_IDE_DMA_H + +#include "block/aio.h" +#include "qemu/iov.h" + +typedef struct IDEState IDEState ; +typedef struct IDEDMAOps IDEDMAOps ; +typedef struct IDEDMA IDEDMA ; + +typedef void DMAStartFunc (const IDEDMA *,IDEState *,BlockCompletionFunc *); +typedef void DMAVoidFunc (const IDEDMA *); +typedef int DMAIntFunc (const IDEDMA *,bool ); +typedef int32_t DMAInt32Func (const IDEDMA *,int32_t len); +typedef void DMAu32Func (const IDEDMA *,uint32_t ); +typedef void DMAStopFunc (const IDEDMA *,bool ); + +struct IDEDMAOps { +DMAStartFunc *start_dma; +DMAVoidFunc *pio_transfer; +DMAInt32Func *prepare_buf; +DMAu32Func *commit_buf; +DMAIntFunc *rw_buf; +DMAVoidFunc *restart; +DMAVoidFunc *restart_dma; +DMAStopFunc *set_inactive; +DMAVoidFunc *cmd_done; +DMAVoidFunc *reset; +}; + +struct IDEDMA { +const IDEDMAOps *ops; +QEMUIOVector qiov; +BlockAIOCB *aiocb; +}; + +#endif
include/hw/ide/internal.h +1 -28
@@ -11,6 +11,7 @@#include "sysemu/dma.h" #include "hw/block/block.h" #include "exec/ioport.h" +#include "hw/ide/ide-dma.h" /* debug IDE devices */ #define USE_DMA_CDROM
@@ -18,8 +19,6 @@typedef struct IDEDevice IDEDevice ;typedef struct IDEState IDEState ; -typedef struct IDEDMA IDEDMA ; -typedef struct IDEDMAOps IDEDMAOps ;#define TYPE_IDE_BUS "IDE"OBJECT_DECLARE_SIMPLE_TYPE (IDEBus,IDE_BUS )
@@ -332,13 +331,6 @@ typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind;typedef void EndTransferFunc (IDEState *); -typedef void DMAStartFunc (const IDEDMA *,IDEState *,BlockCompletionFunc *); -typedef void DMAVoidFunc (const IDEDMA *); -typedef int DMAIntFunc (const IDEDMA *,bool ); -typedef int32_t DMAInt32Func (const IDEDMA *,int32_t len); -typedef void DMAu32Func (const IDEDMA *,uint32_t ); -typedef void DMAStopFunc (const IDEDMA *,bool ); -struct unreported_events {bool eject_request;bool new_media;
@@ -460,25 +452,6 @@ struct IDEState {int ncq_queues; }; -struct IDEDMAOps { -DMAStartFunc *start_dma; -DMAVoidFunc *pio_transfer; -DMAInt32Func *prepare_buf; -DMAu32Func *commit_buf; -DMAIntFunc *rw_buf; -DMAVoidFunc *restart; -DMAVoidFunc *restart_dma; -DMAStopFunc *set_inactive; -DMAVoidFunc *cmd_done; -DMAVoidFunc *reset; -}; - -struct IDEDMA { -const struct IDEDMAOps *ops; -QEMUIOVector qiov; -BlockAIOCB *aiocb; -}; -struct IDEBus {BusState qbus;IDEDevice *master;
Signature · 1 line
2.41.0
[PULL 18/25] hw/ide: Add the possibility to disable the CompactFlash device in the build
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
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.
Message-ID: <[email protected]>
--- include/hw/ide/ide-dev.h | 41 ++++++++++++++++++++++++++++ hw/ide/cf.c | 58 ++++++++++++++++++++++++++++++++++++++++ hw/ide/qdev.c | 51 ++--------------------------------- hw/ide/Kconfig | 4 +++ hw/ide/meson.build | 1 + 5 files changed, 106 insertions(+), 49 deletions(-) create mode 100644 include/hw/ide/ide-dev.h create mode 100644 hw/ide/cf.c
include/hw/ide/ide-dev.h new file +41 -0
@@ -0,0 +1,41 @@ +/* +* ide device definitions +* +* Copyright (c) 2009 Gerd Hoffmann <[email protected]> +* +* This code is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef IDE_DEV_H +#define IDE_DEV_H + +#include "hw/qdev-properties.h" +#include "hw/block/block.h" +#include "hw/ide/internal.h" + +typedef struct IDEDrive { +IDEDevice dev; +}IDEDrive ; + +#define DEFINE_IDE_DEV_PROPERTIES () \ + DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), \ + DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf), \ + DEFINE_PROP_STRING("ver", IDEDrive, dev.version), \ + DEFINE_PROP_UINT64("wwn", IDEDrive, dev.wwn, 0), \ + DEFINE_PROP_STRING("serial", IDEDrive, dev.serial),\ + DEFINE_PROP_STRING("model", IDEDrive, dev.model) + +void ide_dev_initfn (IDEDevice *dev,IDEDriveKind kind,Error **errp); + +#endif
hw/ide/cf.c new file +58 -0
58 lines not on this page · raw message
hw/ide/qdev.c +2 -49
83 lines not on this page · raw message
hw/ide/Kconfig +4 -0
@@ -57,3 +57,7 @@ config IDE_SII3112 bool select IDE_PCI select IDE_QDEV + +config IDE_CF + bool + default y if IDE_QDEV
hw/ide/meson.build +1 -0
@@ -1,6 +1,7 @@ system_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c')) system_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c')) system_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c')) +system_ss.add(when: 'CONFIG_IDE_CF', if_true: files('cf.c')) system_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c')) system_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c')) system_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
Signature · 1 line
2.41.0
[PULL 23/25] hw/ide: Remove the include/hw/ide.h legacy file
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
There was only one prototype left in this legacy file. Move it to ide-dev.h to finally get rid of it.
Message-ID: <[email protected]>
--- MAINTAINERS | 1 - include/hw/ide.h | 9 --------- include/hw/ide/ide-dev.h | 2 ++ include/hw/ide/internal.h | 3 +-- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 include/hw/ide.h
MAINTAINERS +0 -1
@@ -1937,7 +1937,6 @@ IDE M: John Snow <[email protected]> L: [email protected] S: Odd Fixes -F: include/hw/ide.h F: include/hw/ide/ F: hw/ide/ F: hw/block/block.c
include/hw/ide.h deleted +0 -9
@@ -1,9 +0,0 @@ -#ifndef HW_IDE_H -#define HW_IDE_H - -#include "exec/memory.h" - -/* ide/core.c */ -void ide_drive_get (DriveInfo **hd,int max_bus); - -#endif /* HW_IDE_H */
include/hw/ide/ide-dev.h +2 -0
@@ -179,4 +179,6 @@ typedef struct IDEDrive {void ide_dev_initfn (IDEDevice *dev,IDEDriveKind kind,Error **errp); +void ide_drive_get (DriveInfo **hd,int max_bus); +#endif
include/hw/ide/internal.h +1 -2
@@ -4,10 +4,9 @@/* * QEMU IDE Emulation -- internal header file * only files in hw/ide/ are supposed to include this file. -* non-internal declarations are in hw/ide.h +* non-internal declarations are in hw/include/ide-*.h */ -#include "hw/ide.h" #include "hw/ide/ide-bus.h" /* debug IDE devices */
Signature · 1 line
2.41.0
[PULL 12/25] hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn()
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
Resolves redundant code in the piix and q35 machines.
Message-ID: <[email protected]>
--- include/hw/i386/pc.h | 2 -- hw/i386/pc.c | 9 +++------ hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 2 -- 4 files changed, 3 insertions(+), 12 deletions(-)
include/hw/i386/pc.h +0 -2
@@ -154,8 +154,6 @@ extern int fd_bootchk;void pc_acpi_smi_interrupt (void *opaque,int irq,int level); -void pc_guest_info_init (PCMachineState *pcms); -#define PCI_HOST_PROP_RAM_MEM "ram-mem"#define PCI_HOST_PROP_PCI_MEM "pci-mem"#define PCI_HOST_PROP_SYSTEM_MEM "system-mem"
hw/i386/pc.c +3 -6
@@ -698,12 +698,6 @@ void pc_machine_done(Notifier *notifier, void *data)pc_cmos_init_late (pcms); } -void pc_guest_info_init (PCMachineState *pcms) -{ - pcms->machine_done.notify = pc_machine_done; -qemu_add_machine_init_done_notifier (&pcms->machine_done); -} -/* setup pci memory address space mapping into system address space */ void pc_pci_as_mapping_init (MemoryRegion *system_memory,MemoryRegion *pci_address_space)
@@ -1744,6 +1738,9 @@ static void pc_machine_initfn(Object *obj)object_property_add_alias (OBJECT (pcms),"pcspk-audiodev" ,OBJECT (pcms->pcspk),"audiodev" );cxl_machine_init (obj, &pcms->cxl_devices_state); + + pcms->machine_done.notify = pc_machine_done; +qemu_add_machine_init_done_notifier (&pcms->machine_done); }static void pc_machine_reset (MachineState *machine,ShutdownCause reason)
hw/i386/pc_piix.c +0 -2
@@ -225,8 +225,6 @@ static void pc_init1(MachineState *machine, &error_abort); } -pc_guest_info_init (pcms); -if (pcmc->smbios_defaults) {MachineClass *mc =MACHINE_GET_CLASS (machine);/* These values are guest ABI, do not change */
hw/i386/pc_q35.c +0 -2
@@ -188,8 +188,6 @@ static void pc_q35_init(MachineState *machine)kvmclock_create (pcmc->kvmclock_create_always); } -pc_guest_info_init (pcms); -if (pcmc->smbios_defaults) {/* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", mc->desc,
Signature · 1 line
2.41.0
[PULL 09/25] hw/i386/pc: Store pointers to IDE buses in PCMachineState
In reply to Philippe Mathieu-DaudéFrom: Peter Maydell <[email protected]>
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().
Message-ID: <[email protected]>
--- include/hw/i386/pc.h | 4 +++- hw/i386/pc.c | 5 ++--- hw/i386/pc_piix.c | 12 ++++-------- hw/i386/pc_q35.c | 9 +++------ 4 files changed, 12 insertions(+), 18 deletions(-)
include/hw/i386/pc.h +3 -1
@@ -17,6 +17,8 @@#define HPET_INTCAP "hpet-intcap" +#define MAX_IDE_BUS 2 +/** * PCMachineState: * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling
@@ -37,6 +39,7 @@ typedef struct PCMachineState {PFlashCFI01 *flash[2 ];ISADevice *pcspk;DeviceState *iommu; +BusState *idebus[MAX_IDE_BUS ];/* Configuration options: */ uint64_t max_ram_below_4g;
@@ -182,7 +185,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,bool create_fdctrl, uint32_t hpet_irqs);void pc_cmos_init (PCMachineState *pcms, -BusState *ide0,BusState *ide1,ISADevice *s);void pc_nic_init (PCMachineClass *pcmc,ISABus *isa_bus,PCIBus *pci_bus);
hw/i386/pc.c +2 -3
@@ -574,7 +574,6 @@ static void pc_cmos_init_late(void *opaque) }void pc_cmos_init (PCMachineState *pcms, -BusState *idebus0,BusState *idebus1,ISADevice *rtc) {int val;
@@ -634,8 +633,8 @@ void pc_cmos_init(PCMachineState *pcms,/* hard drives and FDC */ arg.rtc_state = s; - arg.idebus[0 ] = idebus0; - arg.idebus[1 ] = idebus1; + arg.idebus[0 ] = pcms->idebus[0 ]; + arg.idebus[1 ] = pcms->idebus[1 ];qemu_register_reset (pc_cmos_init_late, &arg); }
hw/i386/pc_piix.c +4 -8
@@ -68,7 +68,6 @@#include "kvm/kvm-cpu.h" #include "target/i386/cpu.h" -#define MAX_IDE_BUS 2#define XEN_IOAPIC_NUM_PIRQS 128ULL#ifdef CONFIG_IDE_ISA
@@ -114,7 +113,6 @@ static void pc_init1(MachineState *machine,Object *piix4_pm =NULL ;qemu_irq smi_irq;GSIState *gsi_state; -BusState *idebus[MAX_IDE_BUS ];ISADevice *rtc_state;MemoryRegion *ram_memory;MemoryRegion *pci_memory =NULL ;
@@ -299,8 +297,8 @@ static void pc_init1(MachineState *machine, piix4_pm =object_resolve_path_component (OBJECT (pci_dev),"pm" ); dev =DEVICE (object_resolve_path_component (OBJECT (pci_dev),"ide" ));pci_ide_create_devs (PCI_DEVICE (dev)); - idebus[0 ] =qdev_get_child_bus (dev,"ide.0" ); - idebus[1 ] =qdev_get_child_bus (dev,"ide.1" ); + pcms->idebus[0 ] =qdev_get_child_bus (dev,"ide.0" ); + pcms->idebus[1 ] =qdev_get_child_bus (dev,"ide.1" ); }else { isa_bus =isa_bus_new (NULL , system_memory, system_io, &error_abort);
@@ -312,8 +310,6 @@ static void pc_init1(MachineState *machine,i8257_dma_init (OBJECT (machine), isa_bus,0 ); pcms->hpet_enabled = false; - idebus[0 ] =NULL ; - idebus[1 ] =NULL ; }if (x86ms->pic ==ON_OFF_AUTO_ON || x86ms->pic ==ON_OFF_AUTO_AUTO ) {
@@ -358,12 +354,12 @@ static void pc_init1(MachineState *machine,* second one. */ busname[4 ] ='0' + i; - idebus[i] = qdev_get_child_bus(DEVICE(dev), busname); + pcms->idebus[i] = qdev_get_child_bus(DEVICE(dev), busname); } }#endif -pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); +pc_cmos_init (pcms, rtc_state);if (piix4_pm) { smi_irq =qemu_allocate_irq (pc_acpi_smi_interrupt, first_cpu,0 );
hw/i386/pc_q35.c +3 -6
@@ -126,7 +126,6 @@ static void pc_q35_init(MachineState *machine)PCIBus *host_bus;PCIDevice *lpc;DeviceState *lpc_dev; -BusState *idebus[MAX_SATA_PORTS ];ISADevice *rtc_state;MemoryRegion *system_memory =get_system_memory ();MemoryRegion *system_io =get_system_io ();
@@ -300,13 +299,11 @@ static void pc_q35_init(MachineState *machine) ICH9_SATA1_FUNC), "ich9-ahci"); ich9 =ICH9_AHCI (pdev); - idebus[0 ] =qdev_get_child_bus (DEVICE (pdev),"ide.0" ); - idebus[1 ] =qdev_get_child_bus (DEVICE (pdev),"ide.1" ); + pcms->idebus[0 ] =qdev_get_child_bus (DEVICE (pdev),"ide.0" ); + pcms->idebus[1 ] =qdev_get_child_bus (DEVICE (pdev),"ide.1" );g_assert (MAX_SATA_PORTS == ich9->ahci.ports);ide_drive_get (hd, ich9->ahci.ports);ahci_ide_create_devs (&ich9->ahci, hd); - }else { - idebus[0 ] = idebus[1 ] =NULL ; }if (machine_usb (machine)) {
@@ -327,7 +324,7 @@ static void pc_q35_init(MachineState *machine)smbus_eeprom_init (pcms->smbus,8 ,NULL ,0 ); } -pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); +pc_cmos_init (pcms, rtc_state);/* the rest devices to which pci devfn is automatically assigned */ pc_vga_init (isa_bus, host_bus);
Signature · 1 line
2.41.0
[PULL 08/25] hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc machines
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
Both invocations are the same and either one is always executed. Avoid this redundancy.
Message-ID: <[email protected]>
--- hw/i386/pc_piix.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
hw/i386/pc_piix.c +3 -5
@@ -341,11 +341,8 @@ static void pc_init1(MachineState *machine,pc_nic_init (pcmc, isa_bus, pci_bus); -if (pcmc->pci_enabled) { -pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); - }#ifdef CONFIG_IDE_ISA - else { +if (!pcmc->pci_enabled) {DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int i;
@@ -363,10 +360,11 @@ static void pc_init1(MachineState *machine, busname[4 ] ='0' + i; idebus[i] = qdev_get_child_bus(DEVICE(dev), busname); } -pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); }#endif +pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); +if (piix4_pm) { smi_irq =qemu_allocate_irq (pc_acpi_smi_interrupt, first_cpu,0 );
Signature · 1 line
2.41.0
[PULL 21/25] hw/ide: Move IDE device related definitions to ide-dev.h
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
Untangle internal.h by moving public IDE device related definitions to ide-dev.h.
Message-ID: <[email protected]>
--- include/hw/ide/ide-dev.h | 143 +++++++++++++++++++++++++++++++++++++- include/hw/ide/internal.h | 143 +------------------------------------- hw/ide/ide-dev.c | 1 + 3 files changed, 144 insertions(+), 143 deletions(-)
include/hw/ide/ide-dev.h +142 -1
@@ -20,9 +20,150 @@ #ifndef IDE_DEV_H #define IDE_DEV_H +#include "sysemu/dma.h" #include "hw/qdev-properties.h" #include "hw/block/block.h" -#include "hw/ide/internal.h" + +typedef struct IDEDevice IDEDevice; +typedef struct IDEState IDEState; +typedef struct IDEBus IDEBus; + +typedef void EndTransferFunc(IDEState *); + +#define MAX_IDE_DEVS 2 + +#define TYPE_IDE_DEVICE "ide-device" +OBJECT_DECLARE_TYPE(IDEDevice, IDEDeviceClass, IDE_DEVICE) + +typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind; + +struct unreported_events { + bool eject_request; + bool new_media; +}; + +enum ide_dma_cmd { + IDE_DMA_READ = 0, + IDE_DMA_WRITE, + IDE_DMA_TRIM, + IDE_DMA_ATAPI, + IDE_DMA__COUNT +}; + +/* NOTE: IDEState represents in fact one drive */ +struct IDEState { + IDEBus *bus; + uint8_t unit; + /* ide config */ + IDEDriveKind drive_kind; + int drive_heads, drive_sectors; + int cylinders, heads, sectors, chs_trans; + int64_t nb_sectors; + int mult_sectors; + int identify_set; + uint8_t identify_data[512]; + int drive_serial; + char drive_serial_str[21]; + char drive_model_str[41]; + uint64_t wwn; + /* ide regs */ + uint8_t feature; + uint8_t error; + uint32_t nsector; + uint8_t sector; + uint8_t lcyl; + uint8_t hcyl; + /* other part of tf for lba48 support */ + uint8_t hob_feature; + uint8_t hob_nsector; + uint8_t hob_sector; + uint8_t hob_lcyl; + uint8_t hob_hcyl; + + uint8_t select; + uint8_t status; + + bool io8; + bool reset_reverts; + + /* set for lba48 access */ + uint8_t lba48; + BlockBackend *blk; + char version[9]; + /* ATAPI specific */ + struct unreported_events events; + uint8_t sense_key; + uint8_t asc; + bool tray_open; + bool tray_locked; + uint8_t cdrom_changed; + int packet_transfer_size; + int elementary_transfer_size; + int32_t io_buffer_index; + int lba; + int cd_sector_size; + int atapi_dma; /* true if dma is requested for the packet cmd */ + BlockAcctCookie acct; + BlockAIOCB *pio_aiocb; + QEMUIOVector qiov; + QLIST_HEAD(, IDEBufferedRequest) buffered_requests; + /* ATA DMA state */ + uint64_t io_buffer_offset; + int32_t io_buffer_size; + QEMUSGList sg; + /* PIO transfer handling */ + int req_nb_sectors; /* number of sectors per interrupt */ + EndTransferFunc *end_transfer_func; + uint8_t *data_ptr; + uint8_t *data_end; + uint8_t *io_buffer; + /* PIO save/restore */ + int32_t io_buffer_total_len; + int32_t cur_io_buffer_offset; + int32_t cur_io_buffer_len; + uint8_t end_transfer_fn_idx; + QEMUTimer *sector_write_timer; /* only used for win2k install hack */ + uint32_t irq_count; /* counts IRQs when using win2k install hack */ + /* CF-ATA extended error */ + uint8_t ext_error; + /* CF-ATA metadata storage */ + uint32_t mdata_size; + uint8_t *mdata_storage; + int media_changed; + enum ide_dma_cmd dma_cmd; + /* SMART */ + uint8_t smart_enabled; + uint8_t smart_autosave; + int smart_errors; + uint8_t smart_selftest_count; + uint8_t *smart_selftest_data; + /* AHCI */ + int ncq_queues; +}; + +struct IDEDeviceClass { + DeviceClass parent_class; + void (*realize)(IDEDevice *dev, Error **errp); +}; + +struct IDEDevice { + DeviceState qdev; + uint32_t unit; + BlockConf conf; + int chs_trans; + char *version; + char *serial; + char *model; + uint64_t wwn; + /* + * 0x0000 - rotation rate not reported + * 0x0001 - non-rotating medium (SSD) + * 0x0002-0x0400 - reserved + * 0x0401-0xffe - rotations per minute + * 0xffff - reserved + */ + uint16_t rotation_rate; +}; typedef struct IDEDrive { IDEDevice dev;
include/hw/ide/internal.h +1 -142
177 lines not on this page · raw message
hw/ide/ide-dev.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/ide/ide-dev.h" +#include "hw/ide/internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h"
Signature · 1 line
2.41.0
[PULL 19/25] hw/ide: Split qdev.c into ide-bus.c and ide-dev.c
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
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.
Message-ID: <[email protected]>
---
hw/ide/ide-bus.c | 111 +++++++++++++++++++++++++++++++++++
hw/ide/{qdev.c => ide-dev.c} | 87 +--------------------------
hw/arm/Kconfig | 2 +
hw/ide/Kconfig | 30 ++++++----
hw/ide/meson.build | 3 +-
5 files changed, 134 insertions(+), 99 deletions(-)
create mode 100644 hw/ide/ide-bus.c
rename hw/ide/{qdev.c => ide-dev.c} (78%)hw/ide/ide-bus.c new file +111 -0
@@ -0,0 +1,111 @@ +/* +* ide bus support for qdev. +* +* Copyright (c) 2009 Gerd Hoffmann <[email protected]> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "hw/ide/internal.h" +#include "sysemu/block-backend.h" +#include "sysemu/blockdev.h" +#include "sysemu/runstate.h" + +static char *idebus_get_fw_dev_path (DeviceState *dev); +static void idebus_unrealize (BusState *qdev); + +static void ide_bus_class_init (ObjectClass *klass,void *data) +{ +BusClass *k =BUS_CLASS (klass); + + k->get_fw_dev_path = idebus_get_fw_dev_path; + k->unrealize = idebus_unrealize; +} + +static void idebus_unrealize (BusState *bus) +{ +IDEBus *ibus =IDE_BUS (bus); + +if (ibus->vmstate) { +qemu_del_vm_change_state_handler (ibus->vmstate); + } +} + +static const TypeInfo ide_bus_info = { + .name =TYPE_IDE_BUS , + .parent =TYPE_BUS , + .instance_size =sizeof (IDEBus), + .class_init = ide_bus_class_init, +}; + +void ide_bus_init (IDEBus *idebus,size_t idebus_size,DeviceState *dev, +int bus_id,int max_units) +{ +qbus_init (idebus, idebus_size,TYPE_IDE_BUS , dev,NULL ); + idebus->bus_id = bus_id; + idebus->max_units = max_units; +} + +static char *idebus_get_fw_dev_path (DeviceState *dev) +{ +char path[30 ]; + +snprintf (path,sizeof (path),"%s@%x" ,qdev_fw_name (dev), + ((IDEBus *)dev->parent_bus)->bus_id); + +return g_strdup (path); +} + +IDEDevice *ide_bus_create_drive (IDEBus *bus,int unit,DriveInfo *drive) +{ +DeviceState *dev; + + dev =qdev_new (drive->media_cd ?"ide-cd" :"ide-hd" ); +qdev_prop_set_uint32 (dev,"unit" , unit); +qdev_prop_set_drive_err (dev,"drive" ,blk_by_legacy_dinfo (drive), + &error_fatal); +qdev_realize_and_unref (dev, &bus->qbus, &error_fatal); +return DO_UPCAST (IDEDevice, qdev, dev); +} + +int ide_get_geometry (BusState *bus,int unit, +int16_t *cyls,int8_t *heads,int8_t *secs) +{ +IDEState *s = &DO_UPCAST (IDEBus, qbus, bus)->ifs[unit]; + +if (s->drive_kind !=IDE_HD || !s->blk) { +return -1 ; + } + + *cyls = s->cylinders; + *heads = s->heads; + *secs = s->sectors; +return 0 ; +} + +int ide_get_bios_chs_trans (BusState *bus,int unit) +{ +return DO_UPCAST (IDEBus, qbus, bus)->ifs[unit].chs_trans; +} + +static void ide_bus_register_type (void ) +{ +type_register_static (&ide_bus_info); +} + +type_init (ide_bus_register_type)
hw/ide/ide-dev.c renamed from hw/ide/qdev.c +1 -86
124 lines not on this page · raw message
hw/arm/Kconfig +2 -0
@@ -275,6 +275,8 @@ config SBSA_REF select USB_XHCI_SYSBUS select WDT_SBSA select BOCHS_DISPLAY + select IDE_BUS + select IDE_DEV config SABRELITE bool
hw/ide/Kconfig +18 -12
@@ -1,51 +1,58 @@ config IDE_CORE bool -config IDE_QDEV +config IDE_BUS bool select IDE_CORE +config IDE_DEV + bool + depends on IDE_BUS + config IDE_PCI bool depends on PCI - select IDE_QDEV + select IDE_BUS + select IDE_DEV config IDE_ISA bool depends on ISA_BUS - select IDE_QDEV + select IDE_BUS + select IDE_DEV config IDE_PIIX bool select IDE_PCI - select IDE_QDEV config IDE_CMD646 bool select IDE_PCI - select IDE_QDEV config IDE_MACIO bool - select IDE_QDEV + select IDE_BUS + select IDE_DEV config IDE_MMIO bool - select IDE_QDEV + select IDE_BUS + select IDE_DEV config IDE_VIA bool select IDE_PCI - select IDE_QDEV config MICRODRIVE bool - select IDE_QDEV + select IDE_BUS + select IDE_DEV depends on PCMCIA config AHCI bool - select IDE_QDEV + select IDE_BUS + select IDE_DEV config AHCI_ICH9 bool
@@ -56,8 +63,7 @@ config AHCI_ICH9 config IDE_SII3112 bool select IDE_PCI - select IDE_QDEV config IDE_CF bool - default y if IDE_QDEV + default y if IDE_BUS
hw/ide/meson.build +2 -1
@@ -1,15 +1,16 @@ system_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c')) system_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c')) system_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c')) +system_ss.add(when: 'CONFIG_IDE_BUS', if_true: files('ide-bus.c')) system_ss.add(when: 'CONFIG_IDE_CF', if_true: files('cf.c')) system_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c')) system_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c')) +system_ss.add(when: 'CONFIG_IDE_DEV', if_true: files('ide-dev.c')) system_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c')) system_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c')) system_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c')) system_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c')) system_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c')) -system_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c')) system_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c')) system_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c')) system_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
Signature · 1 line
2.41.0
[PULL 15/25] hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
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.
Message-ID: <[email protected]>
--- hw/i386/pc_sysfw.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
hw/i386/pc_sysfw.c +2 -13
@@ -91,18 +91,6 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,return PFLASH_CFI01 (dev); } -static void pc_system_flash_create (PCMachineState *pcms) -{ -PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms); - -if (pcmc->pci_enabled) { - pcms->flash[0 ] =pc_pflash_create (pcms,"system.flash0" , -"pflash0" ); - pcms->flash[1 ] =pc_pflash_create (pcms,"system.flash1" , -"pflash1" ); - } -} -static void pc_system_flash_cleanup_unused (PCMachineState *pcms) {char *prop_name;
@@ -212,7 +200,8 @@ void pc_system_firmware_init(PCMachineState *pcms,return ; } -pc_system_flash_create (pcms); + pcms->flash[0 ] =pc_pflash_create (pcms,"system.flash0" ,"pflash0" ); + pcms->flash[1 ] =pc_pflash_create (pcms,"system.flash1" ,"pflash1" );/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) {
Signature · 1 line
2.41.0
[PULL 22/25] hw/ide: Move IDE bus related definitions to a new header ide-bus.h
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
Let's consolidate the public IDE bus related functions in a separate header.
Message-ID: <[email protected]>
--- include/hw/ide/ide-bus.h | 42 +++++++++++++++++++++++++++++++++++++++ include/hw/ide/internal.h | 40 +------------------------------------ 2 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 include/hw/ide/ide-bus.h
include/hw/ide/ide-bus.h new file +42 -0
@@ -0,0 +1,42 @@ +#ifndef HW_IDE_BUS_H +#define HW_IDE_BUS_H + +#include "exec/ioport.h" +#include "hw/ide/ide-dev.h" +#include "hw/ide/ide-dma.h" + +struct IDEBus { +BusState qbus; +IDEDevice *master; +IDEDevice *slave; +IDEState ifs[2 ]; +QEMUBH *bh; + +int bus_id; +int max_units; +IDEDMA *dma; +uint8_t unit; +uint8_t cmd; +qemu_irq irq;/* bus output */ + +int error_status; +uint8_t retry_unit; +int64_t retry_sector_num; +uint32_t retry_nsector; +PortioList portio_list; +PortioList portio2_list; +VMChangeStateEntry *vmstate; +}; + +#define TYPE_IDE_BUS "IDE" +OBJECT_DECLARE_SIMPLE_TYPE(IDEBus, IDE_BUS) + +void ide_bus_init (IDEBus *idebus,size_t idebus_size,DeviceState *dev, +int bus_id,int max_units); +IDEDevice *ide_bus_create_drive (IDEBus *bus,int unit,DriveInfo *drive); + +int ide_get_geometry (BusState *bus,int unit, +int16_t *cyls,int8_t *heads,int8_t *secs); +int ide_get_bios_chs_trans (BusState *bus,int unit); + +#endif
include/hw/ide/internal.h +1 -39
@@ -8,16 +8,10 @@*/ #include "hw/ide.h" -#include "exec/ioport.h" -#include "hw/ide/ide-dma.h" -#include "hw/ide/ide-dev.h" +#include "hw/ide/ide-bus.h" /* debug IDE devices */ #define USE_DMA_CDROM -#include "qom/object.h" - -#define TYPE_IDE_BUS "IDE" -OBJECT_DECLARE_SIMPLE_TYPE (IDEBus,IDE_BUS )/* Device/Head ("select") Register */ #define ATA_DEV_SELECT 0x10
@@ -338,29 +332,6 @@ typedef struct IDEBufferedRequest {bool orphaned; } IDEBufferedRequest; -struct IDEBus { -BusState qbus; -IDEDevice *master; -IDEDevice *slave; -IDEState ifs[2 ]; -QEMUBH *bh; - -int bus_id; -int max_units; -IDEDMA *dma; -uint8_t unit; -uint8_t cmd; -qemu_irq irq;/* bus output */ - -int error_status; -uint8_t retry_unit; -int64_t retry_sector_num; -uint32_t retry_nsector; -PortioList portio_list; -PortioList portio2_list; -VMChangeStateEntry *vmstate; -}; -/* These are used for the error_status field of IDEBus */ #define IDE_RETRY_MASK 0xf8#define IDE_RETRY_DMA 0x08
@@ -477,15 +448,6 @@ void ide_cancel_dma_sync(IDEState *s);void ide_atapi_cmd (IDEState *s);void ide_atapi_cmd_reply_end (IDEState *s); -/* hw/ide/qdev.c */ -void ide_bus_init (IDEBus *idebus,size_t idebus_size,DeviceState *dev, -int bus_id,int max_units); -IDEDevice *ide_bus_create_drive (IDEBus *bus,int unit,DriveInfo *drive); - -int ide_get_geometry (BusState *bus,int unit, -int16_t *cyls,int8_t *heads,int8_t *secs); -int ide_get_bios_chs_trans (BusState *bus,int unit); -int ide_handle_rw_error (IDEState *s,int error,int op);#endif /* HW_IDE_INTERNAL_H */
Signature · 1 line
2.41.0
[PULL 24/25] hw/ide: Stop exposing internal.h to non-IDE files
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
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.
Message-ID: <[email protected]>
--- include/hw/ide/pci.h | 2 +- hw/i386/pc.c | 2 +- hw/ide/cmd646.c | 1 + hw/ide/pci.c | 1 + hw/ide/piix.c | 1 + hw/ide/sii3112.c | 1 + hw/ide/via.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-)
include/hw/ide/pci.h +1 -1
@@ -1,7 +1,7 @@#ifndef HW_IDE_PCI_H #define HW_IDE_PCI_H -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/pci/pci_device.h" #include "qom/object.h"
hw/i386/pc.c +1 -1
@@ -31,7 +31,7 @@#include "hw/i386/fw_cfg.h" #include "hw/i386/vmport.h" #include "sysemu/cpus.h" -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/timer/hpet.h" #include "hw/loader.h" #include "hw/rtc/mc146818rtc.h"
hw/ide/cmd646.c +1 -0
@@ -33,6 +33,7 @@#include "sysemu/reset.h" #include "hw/ide/pci.h" +#include "hw/ide/internal.h" #include "trace.h" /* CMD646 specific */
hw/ide/pci.c +1 -0
@@ -30,6 +30,7 @@#include "sysemu/dma.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "trace.h"
hw/ide/piix.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/pci/pci.h" +#include "hw/ide/internal.h" #include "hw/ide/piix.h" #include "hw/ide/pci.h" #include "trace.h"
hw/ide/sii3112.c +1 -0
@@ -13,6 +13,7 @@*/ #include "qemu/osdep.h" +#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "qemu/module.h" #include "trace.h"
hw/ide/via.c +1 -0
@@ -25,6 +25,7 @@*/ #include "qemu/osdep.h" +#include "hw/ide/internal.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h"
Signature · 1 line
2.41.0
[PULL 17/25] hw/isa/meson.build: Sort alphabetically
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
Message-ID: <[email protected]>
--- hw/isa/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/isa/meson.build +1 -1
@@ -1,10 +1,10 @@ system_ss.add(when: 'CONFIG_APM', if_true: files('apm.c')) +system_ss.add(when: 'CONFIG_FDC37M81X', if_true: files('fdc37m81x-superio.c')) system_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c')) system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c')) system_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c')) system_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c')) system_ss.add(when: 'CONFIG_PIIX', if_true: files('piix.c')) -system_ss.add(when: 'CONFIG_FDC37M81X', if_true: files('fdc37m81x-superio.c')) system_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c')) system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
Signature · 1 line
2.41.0
[PULL 25/25] hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
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.
Message-ID: <[email protected]>
--- hw/sparc/leon3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/sparc/leon3.c +1 -1
@@ -150,7 +150,7 @@ static void leon3_cpu_reset(void *opaque) {struct CPUResetData *info = (struct CPUResetData *) opaque;int id = info->id; -ResetData *s = (ResetData *)DO_UPCAST (ResetData, info[id], info); +ResetData *s =container_of (info, ResetData, info[id]);CPUState *cpu =CPU (s->info[id].cpu);CPUSPARCState *env =cpu_env (cpu);
Signature · 1 line
2.41.0
Hi,
Quoted 36 lines · Philippe Mathieu-Daudé
The following changes since commit
760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20240221for you to fetch changes up to
df07f6bb563f25f39f4f5887adab557e42bdee59:hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro (2024-02-21 22:13:03 +0100)Following checkpatch.pl error ignored:
ERROR: Macros with complex values should be enclosed in parenthesis #62: FILE:
include/hw/ide/ide-dev.h:31:+#define DEFINE_IDE_DEV_PROPERTIES() \ + DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), \ + DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf), \ + DEFINE_PROP_STRING("ver", IDEDrive, dev.version), \ + DEFINE_PROP_UINT64("wwn", IDEDrive, dev.wwn, 0), \+
DEFINE_PROP_STRING("serial", IDEDrive, dev.serial),\
+DEFINE_PROP_STRING("model", IDEDrive, dev.model)----------------------------------------------------------------
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 ofDO_UPCAST()in Leon3 (Thomas)
Quoted 1 line
----------------------------------------------------------------
I did the mistake to rebase on master after testing, and not test again, and missed a new header must be added in "hw/i386/kvmvapic.c". I apologize for that and will respin a v2 once fully tested again.
Regards,
Phil.