qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 7aca37: hw/display/sm501: Always map the UART


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 7aca37: hw/display/sm501: Always map the UART0
Date: Fri, 10 Jan 2020 02:45:15 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7aca3782d93d96cc5e123617d9e1de783365d4dd
      
https://github.com/qemu/qemu/commit/7aca3782d93d96cc5e123617d9e1de783365d4dd
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  hw/display/sm501: Always map the UART0

The SM501 is a Mobile Multimedia Companion Chip with 2 UARTs.
This model only implements the first UART. Being part of the
chipset, the UART block is always mapped in memory, regardless
of whether we provide a chardev backend.

Since commit 12051d82f, qemu_chr_fe_init() accepts a NULL chardev.
Let's remove the chardev check and always map the UART in the
chipset memory.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 7e83a77f96ee18cb891f309dc617caa5e07ff51e
      
https://github.com/qemu/qemu/commit/7e83a77f96ee18cb891f309dc617caa5e07ff51e
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/core/sysbus.c
    M hw/i386/pc.c
    M include/hw/sysbus.h

  Log Message:
  -----------
  sysbus: remove unused sysbus_try_create*

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: a35c6ccc06536e076d5a23c51d67458e3546672c
      
https://github.com/qemu/qemu/commit/a35c6ccc06536e076d5a23c51d67458e3546672c
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M include/hw/sysbus.h

  Log Message:
  -----------
  sysbus: remove outdated comment

The init callback is no more since commit
817a17fc60f44e29a1944b60d32f45ea127f0cf9 ("core/sysbus: remove the
SysBusDeviceClass::init path")

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 1e419ee68fa545421e3a6d5ea32d04e9a20dfbf2
      
https://github.com/qemu/qemu/commit/1e419ee68fa545421e3a6d5ea32d04e9a20dfbf2
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M chardev/char.c
    M include/qemu/id.h
    M util/id.c

  Log Message:
  -----------
  chardev: generate an internal id when none given

Internally, qemu may create chardev without ID. Those will not be
looked up with qemu_chr_find(), which prevents using qdev_prop_set_chr().

Use id_generate(), to generate an internal name (prefixed with #), so
no conflict exist with user-named chardev.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: xiaoqiang zhao <address@hidden>


  Commit: 4305d4825c729222926ef498189e03cdccf125ae
      
https://github.com/qemu/qemu/commit/4305d4825c729222926ef498189e03cdccf125ae
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial-pci-multi.c

  Log Message:
  -----------
  serial-pci-multi: factor out multi_serial_get_port_count()

Common function to be reused in next patch.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 7781b88ee458ff933459503ade0b0a6ddaad08de
      
https://github.com/qemu/qemu/commit/7781b88ee458ff933459503ade0b0a6ddaad08de
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial-isa.c
    M hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: initial qom-ification

Make SerialState a device (the following patches will introduce IO/MM
sysbus serial devices)

None of the serial_{,mm}_init() callers actually free the returned
value (even if they did, it would be quite harmless), so we can change
the object allocation at will.

However, the devices that embed SerialState must now have their field
QOM-initialized manually (isa, pci, pci-multi).

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 4cc017e505df7e5344e4dfe7fc17711117c5f11f
      
https://github.com/qemu/qemu/commit/4cc017e505df7e5344e4dfe7fc17711117c5f11f
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial: register vmsd with DeviceClass

Migration from old to new code works, however the other way fails for
devices that use serial_init/serial_mm_init with "base", used as
instance_id previously.

(with qdev_set_legacy_instance_id, the alias_id is only used in
savevm.c:find_se(), and thus can only be used to match against
"legacy" instance id values. On new code, instance_id is generated
incrementally from 0 with calculate_new_instance_id(), based on
"qdev-path/vmsd-name")

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: xiaoqiang zhao <address@hidden>


  Commit: ff22c588f474c6799015365d25548ab845a4f5cd
      
https://github.com/qemu/qemu/commit/ff22c588f474c6799015365d25548ab845a4f5cd
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial: add "chardev" property

This is more QOM-friendly, callers may set/get the property themself.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 96651db423a0a25466629d35c775531f5145a66a
      
https://github.com/qemu/qemu/commit/96651db423a0a25466629d35c775531f5145a66a
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial-isa.c
    M hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: add "baudbase" property

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: c9808d602813bce4fada7bf9ecc463aa779b73f7
      
https://github.com/qemu/qemu/commit/c9808d602813bce4fada7bf9ecc463aa779b73f7
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial-isa.c
    M hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: realize the serial device

Instead of calling serial_realize_core(), use the QDev realize
callback.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b9975000a008c5b0801e3d24ed113a1bd2767ed5
      
https://github.com/qemu/qemu/commit/b9975000a008c5b0801e3d24ed113a1bd2767ed5
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: replace serial_exit_core() with unrealize

Instead of calling serial_exit_core() directly, use the QDev unrealize
callback.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 490a9d9b36bfa22a6b46b27e6e9e84e1bac44c68
      
https://github.com/qemu/qemu/commit/490a9d9b36bfa22a6b46b27e6e9e84e1bac44c68
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/omap_uart.c
    M hw/char/serial.c
    M hw/mips/boston.c
    M hw/mips/mips_malta.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: start making SerialMM a sysbus device

Memory mapped serial device is in fact a sysbus device. The following
patches will make use of sysbus facilities for resource and
registration. In particular, "serial-mm: use sysbus facilities" will
move internal serial realization to serial_mm_realize callback to
follow qdev best practices.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 17fd1a6490b1d66cdfa60c67060e63da71a43a51
      
https://github.com/qemu/qemu/commit/17fd1a6490b1d66cdfa60c67060e63da71a43a51
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial-mm: add "regshift" property

And a property and rename "it_shift" field to "regshift", as it seems
to be more popular (and I don't know what "it" stands for).

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 80b2eed95dd6397541cc4d7ec36db0e182a8f402
      
https://github.com/qemu/qemu/commit/80b2eed95dd6397541cc4d7ec36db0e182a8f402
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial-mm: add endianness property

Add a qdev property for endianness, so memory region setup can be done
in realize.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 9bc7176c8c30760d2dc0e5b560a6c14f5f9aa08d
      
https://github.com/qemu/qemu/commit/9bc7176c8c30760d2dc0e5b560a6c14f5f9aa08d
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  serial-mm: use sysbus facilities

Make SerialMM a regular sysbus device, by registering the irq, and the
mmio region. Reexport the internal serial properties.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 10315a70896fb82000cc4b2a1198b70c775c7a59
      
https://github.com/qemu/qemu/commit/10315a70896fb82000cc4b2a1198b70c775c7a59
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  serial: make SerialIO a sysbus device

Make serial IO a proper sysbus device, similar to serial MM.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 9fac5d88ee1a81dca643a62bfce5a2364b437bfa
      
https://github.com/qemu/qemu/commit/9fac5d88ee1a81dca643a62bfce5a2364b437bfa
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c
    M hw/mips/mips_mipssim.c
    M include/hw/char/serial.h

  Log Message:
  -----------
  mips: inline serial_init()

The function is specific to mipssim, let's inline it.

(when inlining, we use a DeviceState variable instead of SerialIO, as
it is the most common type used, and avoids having too many casts)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>


  Commit: f90f2cf7ae77bd85a8439b0abcc05d88c8cc0cb7
      
https://github.com/qemu/qemu/commit/f90f2cf7ae77bd85a8439b0abcc05d88c8cc0cb7
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/mips/mips_mipssim.c

  Log Message:
  -----------
  mips: baudbase is 115200 by default

(The default value is set for TYPE_SERIAL in serial_properties)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>


  Commit: 4f1733d4c0cdc01f6425683df7dffbc69351a323
      
https://github.com/qemu/qemu/commit/4f1733d4c0cdc01f6425683df7dffbc69351a323
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/mips/mips_mipssim.c

  Log Message:
  -----------
  mips: use sysbus_add_io()

sysbus devices should use the associated helper function instead of
calling memory_region_add_subregion() manually. This simplifies
slightly the code.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d9259178fe51a0a550fe50561eb0c346ad4518a4
      
https://github.com/qemu/qemu/commit/d9259178fe51a0a550fe50561eb0c346ad4518a4
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/char/serial.c
    M hw/mips/mips_mipssim.c

  Log Message:
  -----------
  mips: use sysbus_mmio_get_region() instead of internal fields

Register the memory region with sysbus_init_mmio() and look it up with
sysbus_mmio_get_region() to avoid accessing internal device fields.

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0ed40f16a17eaa3a53d62cc871779fa9d5b4447d
      
https://github.com/qemu/qemu/commit/0ed40f16a17eaa3a53d62cc871779fa9d5b4447d
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/display/sm501.c
    M hw/sh4/r2d.c

  Log Message:
  -----------
  sm501: make SerialMM a child, export chardev property

Embed the SerialMM sybus device, and re-export its "chardev" property.
That way, we can get rid of PROP_PTR "chr-state" and better track
devices relationship.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 0fe4bb3241110fc9fbd1c5c457d58191fcdca5d3
      
https://github.com/qemu/qemu/commit/0fe4bb3241110fc9fbd1c5c457d58191fcdca5d3
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/vmmouse.c
    M hw/input/pckbd.c
    M include/hw/input/i8042.h

  Log Message:
  -----------
  vmmouse: replace PROP_PTR with PROP_LINK

While at it, use the expected type.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 4cc76287d81036909e43e29a7a42e8d9852041db
      
https://github.com/qemu/qemu/commit/4cc76287d81036909e43e29a7a42e8d9852041db
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/dma/sparc32_dma.c
    M hw/net/lance.c
    M hw/net/pcnet-pci.c
    M hw/net/pcnet.h

  Log Message:
  -----------
  lance: replace PROP_PTR with PROP_LINK

The device remains non-user creatable since it is a sysbus device.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3af6eb8f9b489c72a1f540e752d8d5f1503b9a87
      
https://github.com/qemu/qemu/commit/3af6eb8f9b489c72a1f540e752d8d5f1503b9a87
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/net/etraxfs_eth.c
    M include/hw/cris/etraxfs.h

  Log Message:
  -----------
  etraxfs: remove PROP_PTR usage

etraxfs_dma_client are not Object, so can't be exposed to user with
QOM path. Let's remove property usage and move the constructor to the
.c unit, simplifying some code on the way.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 3110ce819278f1b6d2c4fdd3e15e773e8f226316
      
https://github.com/qemu/qemu/commit/3110ce819278f1b6d2c4fdd3e15e773e8f226316
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/m68k/q800.c
    M hw/mips/mips_jazz.c
    M hw/net/dp8393x.c

  Log Message:
  -----------
  dp8393x: replace PROP_PTR with PROP_LINK

Link property is the correct way to pass a MemoryRegion to a device
for DMA purposes.

Sidenote: as a sysbus device, this remains non-usercreatable
even though we can drop the specific flag here.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>


  Commit: ab4c072d2f2f4d2e4bfa54bb89e43e2b4cb86275
      
https://github.com/qemu/qemu/commit/ab4c072d2f2f4d2e4bfa54bb89e43e2b4cb86275
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/intc/grlib_irqmp.c
    M hw/sparc/leon3.c
    M target/sparc/cpu.h

  Log Message:
  -----------
  leon3: use qemu_irq framework instead of callback as property

"set_pin_in" property is used to define a callback mechanism where the
device says "call the callback function, passing it an opaque cookie
and a 32-bit value". We already have a generic mechanism for doing
that, which is the qemu_irq. So we should just use that.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: KONRAD Frederic <address@hidden>


  Commit: e23ae617f68420248a978c1040686658a34a7f95
      
https://github.com/qemu/qemu/commit/e23ae617f68420248a978c1040686658a34a7f95
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/sparc/leon3.c
    M target/sparc/cpu.h

  Log Message:
  -----------
  leon3: use qdev gpio facilities for the PIL

As Peter Maydell once said:
"Creating a gpio pin on some object that isn't yourself
looks a bit odd, but all this leon3 code is modifying
the CPU object from the outside anyway. Someday we might
tidy it up, but not today."

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3a87dde8a05978401fb846b6513503b9fd4186d9
      
https://github.com/qemu/qemu/commit/3a87dde8a05978401fb846b6513503b9fd4186d9
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/core/qdev.c

  Log Message:
  -----------
  qdev: use g_strcmp0() instead of open-coding it

Minor code simplification.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3cff81733da62eaea2252e638ea47849cf284ceb
      
https://github.com/qemu/qemu/commit/3cff81733da62eaea2252e638ea47849cf284ceb
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/mips/cps.c

  Log Message:
  -----------
  mips/cps: fix setting saar property

There is no "saar" property. Note: I haven't been able to test this
code. Help welcome.

May fix commit 043715d1e0fbb3e3411be3f898c5b77b7f90327a ("target/mips:
Update ITU to utilize SAARI and SAAR CP0 registers")

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>


  Commit: f4f643882d9dc4676411d1f5fcf9393aa745570b
      
https://github.com/qemu/qemu/commit/f4f643882d9dc4676411d1f5fcf9393aa745570b
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/cris/axis_dev88.c
    M hw/intc/etraxfs_pic.c
    M target/cris/cpu.c
    M target/cris/cpu.h

  Log Message:
  -----------
  cris: improve passing PIC interrupt vector to the CPU

Instead of accessing cpu interrupt vector directly from PIC, send the
vector value over the qemu_irq.

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b9751d205febdfefdb9bb9828fef07ae9a966f1b
      
https://github.com/qemu/qemu/commit/b9751d205febdfefdb9bb9828fef07ae9a966f1b
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/i2c/smbus_eeprom.c

  Log Message:
  -----------
  smbus-eeprom: remove PROP_PTR

Instead, set the initial data field directly.

(the initial data is an array of 256 bytes. As I don't know if it may
change over time, I keep the pointer to original buffer as is, but it
might be worth to consider to copy it instead)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Corey Minyard <address@hidden>


  Commit: bab592a259a6603922a4f54caedb6e52da692e35
      
https://github.com/qemu/qemu/commit/bab592a259a6603922a4f54caedb6e52da692e35
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/intc/omap_intc.c
    M include/hw/arm/omap.h

  Log Message:
  -----------
  omap-intc: remove PROP_PTR

Since clocks are not QOM objects, replace PROP_PTR of clocks with
setters methods.

(in theory there should probably be different methods for omap1 &
omap2 intc, but this is left as a future improvement)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0fd20c532faa6d5ebed8a43763f96a4829b33be2
      
https://github.com/qemu/qemu/commit/0fd20c532faa6d5ebed8a43763f96a4829b33be2
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/i2c/omap_i2c.c
    M include/hw/arm/omap.h

  Log Message:
  -----------
  omap-i2c: remove PROP_PTR

Since clocks are not QOM objects, replace PROP_PTR of clocks with
setters methods.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Corey Minyard <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: ba2aba8370e33a44ff5619844b90bb7119c5cebf
      
https://github.com/qemu/qemu/commit/ba2aba8370e33a44ff5619844b90bb7119c5cebf
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/gpio/omap_gpio.c
    M include/hw/arm/omap.h

  Log Message:
  -----------
  omap-gpio: remove PROP_PTR

Since clocks are not QOM objects, replace PROP_PTR of clocks with
setters methods.

Move/adapt the existing TODO comment about a clock framework.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 5c4d910f2d5bbf28c44e0f4dad1857c2cd9f77f4
      
https://github.com/qemu/qemu/commit/5c4d910f2d5bbf28c44e0f4dad1857c2cd9f77f4
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  qdev: remove PROP_MEMORY_REGION

PROP_MEMORY_REGION was a derivative of PROP_PTR, added in commit
ed03d749f3f513b8fb0287757cfda2cb6825f063 (qdev: add MemoryRegion
property) and thankfully no longer needed since commit
3eff40dbf44896a8180c86c84dbdefb2eb173fbe (hw/misc: Remove
mmio_interface device).

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 70f3d674bc2daac865fb75878030c063697fd16a
      
https://github.com/qemu/qemu/commit/70f3d674bc2daac865fb75878030c063697fd16a
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/core/qdev-properties.c
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  qdev: remove QDEV_PROP_PTR

No longer used in the tree. The comment about user_creatable is still
quite relevant, but there is already a similar comment in qdev-core.h.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>


  Commit: f0d753b1c1e6c334cd089be97a0eb9f1bc415559
      
https://github.com/qemu/qemu/commit/f0d753b1c1e6c334cd089be97a0eb9f1bc415559
  Author: Marc-André Lureau <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/core/qdev.c
    M qom/qom-qmp-cmds.c

  Log Message:
  -----------
  qdev/qom: remove some TODO limitations now that PROP_PTR is gone

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 1bbd1511b617eaffc1da22cde33bc01c12fb450f
      
https://github.com/qemu/qemu/commit/1bbd1511b617eaffc1da22cde33bc01c12fb450f
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M chardev/char.c
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/char/omap_uart.c
    M hw/char/serial-isa.c
    M hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/char/serial.c
    M hw/core/qdev-properties.c
    M hw/core/qdev.c
    M hw/core/sysbus.c
    M hw/cris/axis_dev88.c
    M hw/display/sm501.c
    M hw/dma/sparc32_dma.c
    M hw/gpio/omap_gpio.c
    M hw/i2c/omap_i2c.c
    M hw/i2c/smbus_eeprom.c
    M hw/i386/pc.c
    M hw/i386/vmmouse.c
    M hw/input/pckbd.c
    M hw/intc/etraxfs_pic.c
    M hw/intc/grlib_irqmp.c
    M hw/intc/omap_intc.c
    M hw/m68k/q800.c
    M hw/mips/boston.c
    M hw/mips/cps.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_mipssim.c
    M hw/net/dp8393x.c
    M hw/net/etraxfs_eth.c
    M hw/net/lance.c
    M hw/net/pcnet-pci.c
    M hw/net/pcnet.h
    M hw/sh4/r2d.c
    M hw/sparc/leon3.c
    M include/hw/arm/omap.h
    M include/hw/char/serial.h
    M include/hw/cris/etraxfs.h
    M include/hw/input/i8042.h
    M include/hw/qdev-properties.h
    M include/hw/sysbus.h
    M include/qemu/id.h
    M qom/qom-qmp-cmds.c
    M target/cris/cpu.c
    M target/cris/cpu.h
    M util/id.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/elmarco/tags/prop-ptr-pull-request' 
into staging

Clean-ups: qom-ify serial and remove QDEV_PROP_PTR

Hi,

QDEV_PROP_PTR is marked in multiple places as "FIXME/TODO/remove
me". In most cases, it can be easily replaced with QDEV_PROP_LINK when
the pointer points to an Object.

There are a few places where such substitution isn't possible. For
those places, it seems reasonable to use a specific setter method
instead, and keep the user_creatable = false. In other places,
proper usage of qdev or other facilies is the solution.

The serial code wasn't converted to qdev, which makes it a bit more
archaic to deal with. Let's convert it first, so we can more easily
embed it from other devices, and re-export some properties and drop
QDEV_PROP_PTR usage.

# gpg: Signature made Tue 07 Jan 2020 15:01:26 GMT
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Marc-André Lureau <address@hidden>" [full]
# gpg:                 aka "Marc-André Lureau <address@hidden>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/prop-ptr-pull-request: (37 commits)
  qdev/qom: remove some TODO limitations now that PROP_PTR is gone
  qdev: remove QDEV_PROP_PTR
  qdev: remove PROP_MEMORY_REGION
  omap-gpio: remove PROP_PTR
  omap-i2c: remove PROP_PTR
  omap-intc: remove PROP_PTR
  smbus-eeprom: remove PROP_PTR
  cris: improve passing PIC interrupt vector to the CPU
  mips/cps: fix setting saar property
  qdev: use g_strcmp0() instead of open-coding it
  leon3: use qdev gpio facilities for the PIL
  leon3: use qemu_irq framework instead of callback as property
  dp8393x: replace PROP_PTR with PROP_LINK
  etraxfs: remove PROP_PTR usage
  lance: replace PROP_PTR with PROP_LINK
  vmmouse: replace PROP_PTR with PROP_LINK
  sm501: make SerialMM a child, export chardev property
  mips: use sysbus_mmio_get_region() instead of internal fields
  mips: use sysbus_add_io()
  mips: baudbase is 115200 by default
  ...

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


Compare: https://github.com/qemu/qemu/compare/035eed4c0d25...1bbd1511b617



reply via email to

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