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

[Qemu-commits] [qemu/qemu] bbd9e6: qemu-options.hx: Update for reboot-ti

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] bbd9e6: qemu-options.hx: Update for reboot-timeout parameter
Date: Fri, 25 Oct 2019 06:59:27 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8
      
https://github.com/qemu/qemu/commit/bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8
  Author: Han Han <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options.hx: Update for reboot-timeout parameter

Since ee5d0f89d, -1 is not valid for the value of reboot-timeout. Update
that in qemu-options doc.

Signed-off-by: Han Han <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 5892cfc719756ef306f74558aed250103b0714d4
      
https://github.com/qemu/qemu/commit/5892cfc719756ef306f74558aed250103b0714d4
  Author: Mao Zhongyi <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/pci/pci_bridge.c

  Log Message:
  -----------
  pci_bridge: fix a typo in comment

Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 765e35d71f37325a2bc41b915c7658ac7598ce5f
      
https://github.com/qemu/qemu/commit/765e35d71f37325a2bc41b915c7658ac7598ce5f
  Author: Frediano Ziglio <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M util/async.c

  Log Message:
  -----------
  util/async: avoid useless cast

event_notifier_dummy_cb is already compatible with EventNotifierHandler.

Signed-off-by: Frediano Ziglio <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 105e1023a855dd13fc15a8253fe6476f443e48aa
      
https://github.com/qemu/qemu/commit/105e1023a855dd13fc15a8253fe6476f443e48aa
  Author: Frediano Ziglio <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M util/event_notifier-posix.c

  Log Message:
  -----------
  event_notifier: avoid dandling file descriptor in event_notifier_cleanup

If rfd is equal to wfd the file descriptor is closed but
rfd will still have the closed value.
The EventNotifier structure should not be used again after calling
event_notifier_cleanup or should be initialized again but make
sure to not have dandling file descriptors around.

Signed-off-by: Frediano Ziglio <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 5bd3435442104a73caba0167e57911e72b791500
      
https://github.com/qemu/qemu/commit/5bd3435442104a73caba0167e57911e72b791500
  Author: Frediano Ziglio <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M util/qemu-timer.c

  Log Message:
  -----------
  qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms

Signed-off-by: Frediano Ziglio <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
[lv: removed the two useless casts]
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 2baa483bb76f3e3924a799f90ff47f48e3237a59
      
https://github.com/qemu/qemu/commit/2baa483bb76f3e3924a799f90ff47f48e3237a59
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/timer/Makefile.objs

  Log Message:
  -----------
  hw/timer: Compile devices not target-dependent as common object

All these devices do not contain any target-specific. While most
of them are arch-specific, they are shared between different
targets of the same arch family (ARM and AArch64, MIPS32/MIPS64,
endianess, ...).
Put them into common-obj-y to compile them once for all targets.

Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 877c181cd41e024ba1d076f96efe3c5777938846
      
https://github.com/qemu/qemu/commit/877c181cd41e024ba1d076f96efe3c5777938846
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M Makefile.objs
    M hw/Kconfig
    M hw/Makefile.objs
    M hw/arm/musca.c
    A hw/rtc/Kconfig
    A hw/rtc/Makefile.objs
    A hw/rtc/pl031.c
    A hw/rtc/trace-events
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/pl031.c
    M hw/timer/trace-events
    A include/hw/rtc/pl031.h
    R include/hw/timer/pl031.h

  Log Message:
  -----------
  hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory

The PL031 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: bcdb90640ae41128e0c2ae2ec8ebf5a832102097
      
https://github.com/qemu/qemu/commit/bcdb90640ae41128e0c2ae2ec8ebf5a832102097
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M hw/alpha/dp264.c
    M hw/hppa/machine.c
    M hw/i386/acpi-build.c
    M hw/i386/pc.c
    M hw/i386/pc_q35.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_r4k.c
    M hw/ppc/pnv.c
    M hw/ppc/prep.c
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/mc146818rtc.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    M hw/timer/hpet.c
    R hw/timer/mc146818rtc.c
    A include/hw/rtc/mc146818rtc.h
    A include/hw/rtc/mc146818rtc_regs.h
    R include/hw/timer/mc146818rtc.h
    R include/hw/timer/mc146818rtc_regs.h
    M tests/rtc-test.c

  Log Message:
  -----------
  hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory

The MC146818 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.

Use copyright statement from 80cabfad163 for "hw/rtc/mc146818rtc.h".

Reviewed-by: Alistair Francis <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 819ce6b2a598b5c5c6866a3a6d1acb5261592f8a
      
https://github.com/qemu/qemu/commit/819ce6b2a598b5c5c6866a3a6d1acb5261592f8a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M hw/ppc/ppc405_boards.c
    M hw/ppc/prep.c
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/m48t59-internal.h
    A hw/rtc/m48t59-isa.c
    A hw/rtc/m48t59.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/m48t59-internal.h
    R hw/timer/m48t59-isa.c
    R hw/timer/m48t59.c
    A include/hw/rtc/m48t59.h
    R include/hw/timer/m48t59.h

  Log Message:
  -----------
  hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory

The M48T59 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: de04c31d31c229220d731462380a4255e7936374
      
https://github.com/qemu/qemu/commit/de04c31d31c229220d731462380a4255e7936374
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/m41t80.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/m41t80.c

  Log Message:
  -----------
  hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory

The M41T80 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 2811ac30596644c1bfc3eee4e2ebffd2a107c3e4
      
https://github.com/qemu/qemu/commit/2811ac30596644c1bfc3eee4e2ebffd2a107c3e4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/sun4v-rtc.c
    M hw/rtc/trace-events
    M hw/sparc64/niagara.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/sun4v-rtc.c
    M hw/timer/trace-events
    A include/hw/rtc/sun4v-rtc.h
    R include/hw/timer/sun4v-rtc.h

  Log Message:
  -----------
  hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 6a648a5f230d8cfb191a3cef52b15a05db1c47b5
      
https://github.com/qemu/qemu/commit/6a648a5f230d8cfb191a3cef52b15a05db1c47b5
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/twl92230.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/twl92230.c

  Log Message:
  -----------
  hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory

The TWL92230 is an "energy management device" companion with
a RTC. Since we mostly model the RTC, move it under the hw/rtc/
subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 64e85ffde832120be59f1621d2d1f34de2e347bd
      
https://github.com/qemu/qemu/commit/64e85ffde832120be59f1621d2d1f34de2e347bd
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/Kconfig
    M hw/rtc/Makefile.objs
    A hw/rtc/ds1338.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/ds1338.c

  Log Message:
  -----------
  hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory

The DS1338 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 8035f85ef3ef4bc7ad4e181b9ebfe3f620cf614b
      
https://github.com/qemu/qemu/commit/8035f85ef3ef4bc7ad4e181b9ebfe3f620cf614b
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/Makefile.objs
    M hw/rtc/trace-events
    A hw/rtc/xlnx-zynqmp-rtc.c
    M hw/timer/Makefile.objs
    M hw/timer/trace-events
    R hw/timer/xlnx-zynqmp-rtc.c
    M include/hw/arm/xlnx-zynqmp.h
    A include/hw/rtc/xlnx-zynqmp-rtc.h
    R include/hw/timer/xlnx-zynqmp-rtc.h

  Log Message:
  -----------
  hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Remove Alistair outdated email address (see commit c22e580c2ad).

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 7f0df1ccdf4f0500798b42d4b21dd7fc5ed854ba
      
https://github.com/qemu/qemu/commit/7f0df1ccdf4f0500798b42d4b21dd7fc5ed854ba
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/Makefile.objs
    A hw/rtc/exynos4210_rtc.c
    M hw/timer/Makefile.objs
    R hw/timer/exynos4210_rtc.c

  Log Message:
  -----------
  hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: ea5dcf4e1d00ea6de8112968164a97ce8a92ddce
      
https://github.com/qemu/qemu/commit/ea5dcf4e1d00ea6de8112968164a97ce8a92ddce
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/Makefile.objs
    A hw/rtc/aspeed_rtc.c
    M hw/rtc/trace-events
    M hw/timer/Makefile.objs
    R hw/timer/aspeed_rtc.c
    M hw/timer/trace-events
    M include/hw/arm/aspeed_soc.h
    A include/hw/rtc/aspeed_rtc.h
    R include/hw/timer/aspeed_rtc.h

  Log Message:
  -----------
  hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Reviewed-by: Cédric Le Goater <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 7ffcb73d3f16bfffa946e4fc780292725638953f
      
https://github.com/qemu/qemu/commit/7ffcb73d3f16bfffa946e4fc780292725638953f
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/mc146818rtc.c
    M hw/timer/hpet.c
    M include/hw/rtc/mc146818rtc.h

  Log Message:
  -----------
  hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less

Only 2 source files require the "mc146818rtc_regs.h" header.
Instead of having it processed 12 times, by all objects
using "mc146818rtc.h", include it directly where used.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 2330113bf5514eb8e0e74d7a2207a3d5183a3008
      
https://github.com/qemu/qemu/commit/2330113bf5514eb8e0e74d7a2207a3d5183a3008
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M hw/rtc/xlnx-zynqmp-rtc.c

  Log Message:
  -----------
  hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include

The "hw/ptimer.h" header is not used, remove it.

Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: fabb862f76f093cdd1610571de9ba714d3333c1c
      
https://github.com/qemu/qemu/commit/fabb862f76f093cdd1610571de9ba714d3333c1c
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-10-24 (Thu, 24 Oct 2019)

  Changed paths:
    M include/hw/rtc/aspeed_rtc.h

  Log Message:
  -----------
  hw/rtc/aspeed_rtc: Remove unused includes

The system <stdint.h> include is already provided by "osdep.h"
(the scripts/clean-includes file clean such headers).

Commit 64552b6be47 suggests we don't need to include "hw/irq.h":

    Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to
    qemu/typedefs.h, and then include hw/irq.h only where it's still
    needed.

Reviewed-by: Cédric Le Goater <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: bad76ac319556dab2497429d473b49a237672e1c
      
https://github.com/qemu/qemu/commit/bad76ac319556dab2497429d473b49a237672e1c
  Author: Peter Maydell <address@hidden>
  Date:   2019-10-25 (Fri, 25 Oct 2019)

  Changed paths:
    M MAINTAINERS
    M Makefile.objs
    M hw/Kconfig
    M hw/Makefile.objs
    M hw/alpha/dp264.c
    M hw/arm/musca.c
    M hw/hppa/machine.c
    M hw/i386/acpi-build.c
    M hw/i386/pc.c
    M hw/i386/pc_q35.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_r4k.c
    M hw/pci/pci_bridge.c
    M hw/ppc/pnv.c
    M hw/ppc/ppc405_boards.c
    M hw/ppc/prep.c
    A hw/rtc/Kconfig
    A hw/rtc/Makefile.objs
    A hw/rtc/aspeed_rtc.c
    A hw/rtc/ds1338.c
    A hw/rtc/exynos4210_rtc.c
    A hw/rtc/m41t80.c
    A hw/rtc/m48t59-internal.h
    A hw/rtc/m48t59-isa.c
    A hw/rtc/m48t59.c
    A hw/rtc/mc146818rtc.c
    A hw/rtc/pl031.c
    A hw/rtc/sun4v-rtc.c
    A hw/rtc/trace-events
    A hw/rtc/twl92230.c
    A hw/rtc/xlnx-zynqmp-rtc.c
    M hw/sparc/sun4m.c
    M hw/sparc64/niagara.c
    M hw/sparc64/sun4u.c
    M hw/timer/Kconfig
    M hw/timer/Makefile.objs
    R hw/timer/aspeed_rtc.c
    R hw/timer/ds1338.c
    R hw/timer/exynos4210_rtc.c
    M hw/timer/hpet.c
    R hw/timer/m41t80.c
    R hw/timer/m48t59-internal.h
    R hw/timer/m48t59-isa.c
    R hw/timer/m48t59.c
    R hw/timer/mc146818rtc.c
    R hw/timer/pl031.c
    R hw/timer/sun4v-rtc.c
    M hw/timer/trace-events
    R hw/timer/twl92230.c
    R hw/timer/xlnx-zynqmp-rtc.c
    M include/hw/arm/aspeed_soc.h
    M include/hw/arm/xlnx-zynqmp.h
    A include/hw/rtc/aspeed_rtc.h
    A include/hw/rtc/m48t59.h
    A include/hw/rtc/mc146818rtc.h
    A include/hw/rtc/mc146818rtc_regs.h
    A include/hw/rtc/pl031.h
    A include/hw/rtc/sun4v-rtc.h
    A include/hw/rtc/xlnx-zynqmp-rtc.h
    R include/hw/timer/aspeed_rtc.h
    R include/hw/timer/m48t59.h
    R include/hw/timer/mc146818rtc.h
    R include/hw/timer/mc146818rtc_regs.h
    R include/hw/timer/pl031.h
    R include/hw/timer/sun4v-rtc.h
    R include/hw/timer/xlnx-zynqmp-rtc.h
    M qemu-options.hx
    M tests/rtc-test.c
    M util/async.c
    M util/event_notifier-posix.c
    M util/qemu-timer.c

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

Fix typos and docs, trivial changes and RTC devices split

# gpg: Signature made Fri 25 Oct 2019 09:35:02 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  hw/rtc/aspeed_rtc: Remove unused includes
  hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include
  hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less
  hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory
  hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory
  hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory
  hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory
  hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory
  hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory
  hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
  hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory
  hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory
  hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory
  hw/timer: Compile devices not target-dependent as common object
  qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms
  event_notifier: avoid dandling file descriptor in event_notifier_cleanup
  util/async: avoid useless cast
  pci_bridge: fix a typo in comment
  qemu-options.hx: Update for reboot-timeout parameter

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

# Conflicts:
#       hw/timer/trace-events


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