[Qemu-commits] [qemu/qemu] 348b8d: macio: don't reference serial

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 348b8d: macio: don't reference serial_hd() di

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 348b8d: macio: don't reference serial_hd() directly within...
Date:	Mon, 19 Oct 2020 04:29:51 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 348b8d1a76b4ab4b5a9ec756500547c5f2756d9c
      
https://github.com/qemu/qemu/commit/348b8d1a76b4ab4b5a9ec756500547c5f2756d9c
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/misc/macio/macio.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  macio: don't reference serial_hd() directly within the device

Instead use qdev_prop_set_chr() to configure the ESCC serial chardevs at the
Mac Old World and New World machine level.

Also remove the now obsolete comment referring to the use of serial_hd() and
the setting of user_creatable to false accordingly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201013114922.2946-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: b950914df3a2a936d4eca00eeb4ca0254423d265
      
https://github.com/qemu/qemu/commit/b950914df3a2a936d4eca00eeb4ca0254423d265
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/pci-host/grackle.c
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  grackle: use qdev gpios for PCI IRQs

Currently an object link property is used to pass a reference to the Heathrow
PIC into the PCI host bridge so that grackle_init_irqs() can connect the PCI
IRQs to the PIC itself.

This can be simplified by defining the PCI IRQs as qdev gpios and then wiring
up the PCI IRQs to the PIC in the Old World machine init function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201013114922.2946-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 40a0deb74bf433d5fce2cc882a61e4c9c479e9f9
      
https://github.com/qemu/qemu/commit/40a0deb74bf433d5fce2cc882a61e4c9c479e9f9
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/pci-host/uninorth.c
    M hw/ppc/mac_newworld.c
    M include/hw/pci-host/uninorth.h

  Log Message:
  -----------
  uninorth: use qdev gpios for PCI IRQs

Currently an object link property is used to pass a reference to the OpenPIC
into the PCI host bridge so that pci_unin_init_irqs() can connect the PCI
IRQs to the PIC itself.

This can be simplified by defining the PCI IRQs as qdev gpios and then wiring
up the PCI IRQs to the PIC in the New World machine init function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201013114922.2946-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 669b96484caab266f71625426b4983d31e490f96
      
https://github.com/qemu/qemu/commit/669b96484caab266f71625426b4983d31e490f96
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/rtc/m48t59-isa.c
    M include/hw/rtc/m48t59.h

  Log Message:
  -----------
  m48t59-isa: remove legacy m48t59_init_isa() function

This function is no longer used within the codebase.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-2-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: cb0fa36b31d15ab862517b4150d85d885f38ae35
      
https://github.com/qemu/qemu/commit/cb0fa36b31d15ab862517b4150d85d885f38ae35
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  sun4m: use qdev properties instead of legacy m48t59_init() function

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-3-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: dc7a05da69613d5c87ec0359c5dbb9d2b4765301
      
https://github.com/qemu/qemu/commit/dc7a05da69613d5c87ec0359c5dbb9d2b4765301
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sun4u: use qdev properties instead of legacy m48t59_init() function

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-4-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: e8a02431ecd5b5e72fb471b01880252bcc0613cb
      
https://github.com/qemu/qemu/commit/e8a02431ecd5b5e72fb471b01880252bcc0613cb
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/ppc/ppc405_boards.c

  Log Message:
  -----------
  ppc405_boards: use qdev properties instead of legacy m48t59_init() function

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-5-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 3e7e134d827790c3714cae1d5b8aff8612000116
      
https://github.com/qemu/qemu/commit/3e7e134d827790c3714cae1d5b8aff8612000116
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-18 (Sun, 18 Oct 2020)

  Changed paths:
    M hw/rtc/m48t59.c
    M include/hw/rtc/m48t59.h

  Log Message:
  -----------
  m48t59: remove legacy m48t59_init() function

Now that all of the callers of this function have been switched to use qdev
properties, this legacy init function can now be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-6-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 464c73e8eb0f52b5644768c095e553cf97cb041b
      
https://github.com/qemu/qemu/commit/464c73e8eb0f52b5644768c095e553cf97cb041b
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: Allow loading binary ROM image

The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of
the rom region and fall back to loading a binary image with -bios if
loading ELF image failed. This allows testing emulation with a ROM
image from real hardware as well as using an ELF OpenBIOS image.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201017155139.5A36A746331@zero.eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 31a6f3534aba275aa9b3da21a58e79065ba865b5
      
https://github.com/qemu/qemu/commit/31a6f3534aba275aa9b3da21a58e79065ba865b5
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/ppc/mac.h
    M hw/ppc/mac_newworld.c

  Log Message:
  -----------
  mac_newworld: Allow loading binary ROM image

Fall back to load binary ROM image if loading ELF fails. This also
moves PROM_BASE and PROM_SIZE defines to board as these are matching
the ROM size and address on this board and removes the now unused
PROM_ADDR and BIOS_SIZE defines from common mac.h.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<4d58ffe7645a0c746c8fed6aa8775c0867b624e0.1602805637.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: c3481ab096f35d7fa1c2945b05e22bef280b235b
      
https://github.com/qemu/qemu/commit/c3481ab096f35d7fa1c2945b05e22bef280b235b
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: Drop a variable, use get_system_memory() directly

Half of the occurances already use get_system_memory() directly
instead of sysmem variable, convert the two other uses to
get_system_memory() too which seems to be more common and drop the
variable.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<b4c714e03690deb6f94f80f7a5b2af47d90550ae.1602805637.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: b8df32555ce5bdae268e7bcc5b6c647c63c32373
      
https://github.com/qemu/qemu/commit/b8df32555ce5bdae268e7bcc5b6c647c63c32373
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: Drop some variables

Values not used frequently enough may not worth putting in a local
variable, especially with names almost as long as the original value
because that does not improve readability, to the contrary it makes it
harder to see what value is used. Drop a few such variables.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<d67bc8d914a366ca6822b5190c1308d31af5c9b3.1602805637.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: bb997e5c967b3b6f19f1461811df6317ed37c5ff
      
https://github.com/qemu/qemu/commit/bb997e5c967b3b6f19f1461811df6317ed37c5ff
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: Change PCI address of macio to match real hardware

The board firmware expect these to be at fixed addresses and programs
them without probing, this patch puts the macio device at the expected
PCI address.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: 
<f14bcaf3cf129500710ba5289980a134086bd949.1602805637.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: ba2a9a9e6318bfd93a2306dec40137e198205b86
      
https://github.com/qemu/qemu/commit/ba2a9a9e6318bfd93a2306dec40137e198205b86
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-10-19 (Mon, 19 Oct 2020)

  Changed paths:
    M hw/misc/macio/macio.c
    M hw/pci-host/grackle.c
    M hw/pci-host/uninorth.c
    M hw/ppc/mac.h
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/ppc405_boards.c
    M hw/rtc/m48t59-isa.c
    M hw/rtc/m48t59.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/uninorth.h
    M include/hw/rtc/m48t59.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-macppc-20201019' 
into staging

qemu-macppc updates

# gpg: Signature made Mon 19 Oct 2020 08:13:16 BST
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" 
[full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-macppc-20201019:
  mac_oldworld: Change PCI address of macio to match real hardware
  mac_oldworld: Drop some variables
  mac_oldworld: Drop a variable, use get_system_memory() directly
  mac_newworld: Allow loading binary ROM image
  mac_oldworld: Allow loading binary ROM image
  m48t59: remove legacy m48t59_init() function
  ppc405_boards: use qdev properties instead of legacy m48t59_init() function
  sun4u: use qdev properties instead of legacy m48t59_init() function
  sun4m: use qdev properties instead of legacy m48t59_init() function
  m48t59-isa: remove legacy m48t59_init_isa() function
  uninorth: use qdev gpios for PCI IRQs
  grackle: use qdev gpios for PCI IRQs
  macio: don't reference serial_hd() directly within the device

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


Compare: https://github.com/qemu/qemu/compare/22d30b340aa5...ba2a9a9e6318
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 348b8d: macio: don't reference serial_hd() directly within..., Peter Maydell <=
Prev by Date: [Qemu-commits] [qemu/qemu] 709616: util/cutils: Introduce freq_to_str() to display He...
Next by Date: [Qemu-commits] [qemu/qemu] 69958d: usb: hcd-dwc2: change assert()s to qemu_log_mask(L...
Previous by thread: [Qemu-commits] [qemu/qemu] 709616: util/cutils: Introduce freq_to_str() to display He...
Next by thread: [Qemu-commits] [qemu/qemu] 69958d: usb: hcd-dwc2: change assert()s to qemu_log_mask(L...
Index(es):
- Date
- Thread