qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 51e5ba: cmd646: register cmd646_reset() funct

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 51e5ba: cmd646: register cmd646_reset() function in Device...
Date: Thu, 19 Mar 2020 05:45:12 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 51e5ba5582ffb6bce7b990ae518a67cc33d306c3
      
https://github.com/qemu/qemu/commit/51e5ba5582ffb6bce7b990ae518a67cc33d306c3
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-09 (Mon, 09 Mar 2020)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: register cmd646_reset() function in DeviceClass

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 62b411bdaa9be7eee64e8ae12903bd3270c764cf
      
https://github.com/qemu/qemu/commit/62b411bdaa9be7eee64e8ae12903bd3270c764cf
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-09 (Mon, 09 Mar 2020)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: register vmstate_ide_pci VMStateDescription in DeviceClass

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 2529791082199b4134b37b5dbf78e33bc0c86e89
      
https://github.com/qemu/qemu/commit/2529791082199b4134b37b5dbf78e33bc0c86e89
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-10 (Tue, 10 Mar 2020)

  Changed paths:
    M hw/alpha/dp264.c

  Log Message:
  -----------
  dp264: use pci_create_simple() to initialise the cmd646 device

Remove the call to pci_cmd646_ide_init() since global device init functions
are deprecated in preference of using qdev directly.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: d32a4f3bdf4ad85672d41a245c090da79482bf85
      
https://github.com/qemu/qemu/commit/d32a4f3bdf4ad85672d41a245c090da79482bf85
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-10 (Tue, 10 Mar 2020)

  Changed paths:
    M hw/ide/cmd646.c
    M include/hw/ide.h

  Log Message:
  -----------
  cmd646: remove unused pci_cmd646_ide_init() function

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 75f2b28baed4ab71bb96d1d0c8571f3467c5b06c
      
https://github.com/qemu/qemu/commit/75f2b28baed4ab71bb96d1d0c8571f3467c5b06c
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c

  Log Message:
  -----------
  via-ide: move registration of VMStateDescription to DeviceClass

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: c06cde44eb41a6762fc4b79827dda84ea8842d2a
      
https://github.com/qemu/qemu/commit/c06cde44eb41a6762fc4b79827dda84ea8842d2a
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c
    M hw/mips/mips_fulong2e.c
    M include/hw/ide.h

  Log Message:
  -----------
  ide/via: Get rid of via_ide_init()

Follow example of CMD646 and remove via_ide_init function and do it
directly in board code instead.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 7ff81d6357ad3ce31bc96f830b000bac37dafb41
      
https://github.com/qemu/qemu/commit/7ff81d6357ad3ce31bc96f830b000bac37dafb41
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Honour wmask when resetting PCI_INTERRUPT_LINE

The pci_do_device_reset() function (called from pci_device_reset)
clears the PCI_INTERRUPT_LINE config reg of devices on the bus but did
this without taking wmask into account. We'll have a device model now
that needs to set a constant value for this reg and this patch allows
to do that without additional workaround in device emulation to
reverse the effect of this PCI bus reset function.

Suggested-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 3a514010aba088c9d5005b2e62048a61761a12d4
      
https://github.com/qemu/qemu/commit/3a514010aba088c9d5005b2e62048a61761a12d4
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c

  Log Message:
  -----------
  via-ide: ensure that PCI_INTERRUPT_LINE is hard-wired to its default value

Some firmwares accidentally write to PCI_INTERRUPT_LINE on startup which has
no effect on real hardware since it is hard-wired to its default value, but
causes the guest OS to become confused trying to initialise IDE devices
when running under QEMU.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: fa8ac1b769ae1b7681924d4c9d7252e57c612909
      
https://github.com/qemu/qemu/commit/fa8ac1b769ae1b7681924d4c9d7252e57c612909
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c

  Log Message:
  -----------
  via-ide: initialise IDE controller in legacy mode

According to both the VT82C686B and VT8231 datasheets the VIA Southbridge IDE
controller is initialised in legacy mode.

This allows Linux to correctly determine that legacy rather than PCI IRQ routing
should be used since the boot console text in the fulong2e test image changes 
from:

scsi0 : pata_via
scsi1 : pata_via
ata1: PATA max UDMA/100 cmd 0xffffffffbfd04050 ctl 0xffffffffbfd04062 \
  bmdma 0xffffffffbfd04040 irq 14
ata2: PATA max UDMA/100 cmd 0xffffffffbfd04058 ctl 0xffffffffbfd04066 \
  bmdma 0xffffffffbfd04048 irq 14

to:

scsi0 : pata_via
scsi1 : pata_via
ata1: PATA max UDMA/100 cmd 0xffffffffbfd001f0 ctl 0xffffffffbfd003f6 \
  bmdma 0xffffffffbfd04040 irq 14
ata2: PATA max UDMA/100 cmd 0xffffffffbfd00170 ctl 0xffffffffbfd00376 \
  bmdma 0xffffffffbfd04048 irq 15

Signed-off-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 20042479810511895d94f2f6ec8455fe0d0a2ce3
      
https://github.com/qemu/qemu/commit/20042479810511895d94f2f6ec8455fe0d0a2ce3
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c

  Log Message:
  -----------
  via-ide: allow guests to write to PCI_CLASS_PROG

MorphOS writes to PCI_CLASS_PROG during IDE initialisation to place the
controller in native mode, but thinks the initialisation has failed
because the native mode bits aren't set when reading the register back.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 1a519323d3e8425f0cf58fc85a346237edf8aeac
      
https://github.com/qemu/qemu/commit/1a519323d3e8425f0cf58fc85a346237edf8aeac
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M hw/ide/via.c

  Log Message:
  -----------
  via-ide: always use legacy IRQ 14/15 routing

The existing code uses fixed PCI IRQ routing on IRQ 14 rather than legacy IRQ
14/15 routing as documented in the datasheet.

With the changes in this patchset guest OSs now correctly detect and configure
the VIA controller in legacy IRQ routing mode, allowing the incorrect fixed
PCI IRQ routing to be removed.

Note that this fixed legacy IRQ 14/15 routing is identical to similar behaviour
in the early PIIX IDE controllers.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 6e9d611a1b4f858962cccfe16625bd82aa894e25
      
https://github.com/qemu/qemu/commit/6e9d611a1b4f858962cccfe16625bd82aa894e25
  Author: Markus Armbruster <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M tests/qtest/hd-geo-test.c

  Log Message:
  -----------
  hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr()

valgrind reports write unitialized bytes from buf[].  Clear them.

ASan reports we store to misaligned address in buf[].  Use stl_le_p()
for that.

Cc: Sam Eiderman <address@hidden>
Cc: John Snow <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: df45d38f7328219a709047ebf3b726d0f4ba4ee7
      
https://github.com/qemu/qemu/commit/df45d38f7328219a709047ebf3b726d0f4ba4ee7
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/ide/pci.c
    M hw/ide/piix.c
    M include/hw/ide.h

  Log Message:
  -----------
  hw/ide: Get rid of piix3_init functions

This removes pci_piix3_ide_init() and pci_piix3_xen_ide_init()
functions similar to clean up done to other ide devices.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 902283c1df32de3a08b6410aad7a738d179dc8af
      
https://github.com/qemu/qemu/commit/902283c1df32de3a08b6410aad7a738d179dc8af
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/isa/piix4.c

  Log Message:
  -----------
  hw/isa/piix4.c: Introduce variable to store devfn

To avoid any problem with reassigning pci variable store devfn in a
variable instead of acessing it from the PCIDevice.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: f42b65b8a0e8d556f3a802e32908aaf40e619341
      
https://github.com/qemu/qemu/commit/f42b65b8a0e8d556f3a802e32908aaf40e619341
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/ide/piix.c
    M hw/isa/piix4.c
    M include/hw/ide.h

  Log Message:
  -----------
  hw/ide: Get rid of piix4_init function

This removes pci_piix4_ide_init() function similar to clean up done to
other ide devices.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 5a6ac100f64bea4b1580e3e4de123cac8abc203c
      
https://github.com/qemu/qemu/commit/5a6ac100f64bea4b1580e3e4de123cac8abc203c
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/ide/ahci_internal.h
    M include/hw/ide.h
    M include/hw/ide/pci.h
    M include/hw/misc/macio/macio.h

  Log Message:
  -----------
  hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h

After previous patches we don't need hw/pci/pci.h any more in
hw/ide.h. Some files depended on implicit inclusion by this header
which are also fixed up here.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 417adc2d50937b95e5e89d8939f13d7e85d5ad9d
      
https://github.com/qemu/qemu/commit/417adc2d50937b95e5e89d8939f13d7e85d5ad9d
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/ide/pci.c

  Log Message:
  -----------
  hw/ide/pci.c: Coding style update to fix checkpatch errors

Spaces are required around a + operator and if statements should have
braces even for single line. Also make it simpler by reversing the
condition instead of breaking the loop.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: be1765f39884ec0de413f8619685b3481b1dfa5a
      
https://github.com/qemu/qemu/commit/be1765f39884ec0de413f8619685b3481b1dfa5a
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/alpha/dp264.c
    M hw/i386/pc_piix.c
    M hw/ide/pci.c
    M hw/isa/piix4.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/sparc64/sun4u.c
    M include/hw/ide/pci.h
    M include/hw/southbridge/piix.h

  Log Message:
  -----------
  hw/ide: Do ide_drive_get() within pci_ide_create_devs()

The pci_ide_create_devs() function takes a hd_table parameter but all
callers just pass what ide_drive_get() returns so we can do it locally
simplifying callers and removing hd_table parameter.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: d475fb1252faa8c284e62be5f55b2e932cbab2aa
      
https://github.com/qemu/qemu/commit/d475fb1252faa8c284e62be5f55b2e932cbab2aa
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/mips/mips_r4k.c
    M include/hw/ide.h
    M include/hw/ide/internal.h

  Log Message:
  -----------
  hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h

We can move this define now that less files use it to internal.h to
further reduce dependency on hw/ide.h.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 7d0776ca7f853d466b6174d96daa5c8afc43d1a4
      
https://github.com/qemu/qemu/commit/7d0776ca7f853d466b6174d96daa5c8afc43d1a4
  Author: BALATON Zoltan <address@hidden>
  Date:   2020-03-17 (Tue, 17 Mar 2020)

  Changed paths:
    M hw/hppa/hppa_sys.h
    M hw/hppa/machine.c
    M hw/i386/pc_piix.c
    M hw/isa/piix4.c
    M hw/mips/mips_fulong2e.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c

  Log Message:
  -----------
  hw/ide: Remove unneeded inclusion of hw/ide.h

After previous clean ups we can drop direct inclusion of hw/ide.h from
several places.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: ce73691e2588950a854b8b63a8ecd81f69eda458
      
https://github.com/qemu/qemu/commit/ce73691e2588950a854b8b63a8ecd81f69eda458
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-19 (Thu, 19 Mar 2020)

  Changed paths:
    M hw/alpha/dp264.c
    M hw/hppa/hppa_sys.h
    M hw/hppa/machine.c
    M hw/i386/pc_piix.c
    M hw/ide/ahci_internal.h
    M hw/ide/cmd646.c
    M hw/ide/pci.c
    M hw/ide/piix.c
    M hw/ide/via.c
    M hw/isa/piix4.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_r4k.c
    M hw/pci/pci.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c
    M hw/sparc64/sun4u.c
    M include/hw/ide.h
    M include/hw/ide/internal.h
    M include/hw/ide/pci.h
    M include/hw/misc/macio/macio.h
    M include/hw/southbridge/piix.h
    M tests/qtest/hd-geo-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into 
staging

Pull request

# gpg: Signature made Tue 17 Mar 2020 23:22:33 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hw/ide: Remove unneeded inclusion of hw/ide.h
  hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
  hw/ide: Do ide_drive_get() within pci_ide_create_devs()
  hw/ide/pci.c: Coding style update to fix checkpatch errors
  hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
  hw/ide: Get rid of piix4_init function
  hw/isa/piix4.c: Introduce variable to store devfn
  hw/ide: Get rid of piix3_init functions
  hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr()
  via-ide: always use legacy IRQ 14/15 routing
  via-ide: allow guests to write to PCI_CLASS_PROG
  via-ide: initialise IDE controller in legacy mode
  via-ide: ensure that PCI_INTERRUPT_LINE is hard-wired to its default value
  pci: Honour wmask when resetting PCI_INTERRUPT_LINE
  ide/via: Get rid of via_ide_init()
  via-ide: move registration of VMStateDescription to DeviceClass
  cmd646: remove unused pci_cmd646_ide_init() function
  dp264: use pci_create_simple() to initialise the cmd646 device
  cmd646: register vmstate_ide_pci VMStateDescription in DeviceClass
  cmd646: register cmd646_reset() function in DeviceClass

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f57587c7d47b...ce73691e2588
reply via email to
[Prev in Thread] Current Thread [Next in Thread]