[Qemu-commits] [qemu/qemu] 3bee1d: microvm: name qboot binary qboot.rom

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 3bee1d: microvm: name qboot binary qboot.rom

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 3bee1d: microvm: name qboot binary qboot.rom
Date:	Fri, 18 Sep 2020 02:45:31 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3bee1d1d14c583929af068d8fd6eef54d21046e4
      
https://github.com/qemu/qemu/commit/3bee1d1d14c583929af068d8fd6eef54d21046e4
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c
    R pc-bios/bios-microvm.bin
    M pc-bios/meson.build
    A pc-bios/qboot.rom
    M roms/Makefile

  Log Message:
  -----------
  microvm: name qboot binary qboot.rom

qboot isn't a bios and shouldnt be named that way.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200915120909.20838-2-kraxel@redhat.com


  Commit: be404fa560c72f1810c506cb83673a71ee72cd49
      
https://github.com/qemu/qemu/commit/be404fa560c72f1810c506cb83673a71ee72cd49
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M roms/Makefile
    A roms/config.seabios-microvm

  Log Message:
  -----------
  seabios: add microvm config, update build rules

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-3-kraxel@redhat.com


  Commit: 38edb514c9c2cba3c3d536504b2cddbfdc915056
      
https://github.com/qemu/qemu/commit/38edb514c9c2cba3c3d536504b2cddbfdc915056
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    A pc-bios/bios-microvm.bin
    M pc-bios/meson.build

  Log Message:
  -----------
  seabios: add bios-microvm.bin binary

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-4-kraxel@redhat.com


  Commit: 14404dd2d1c18529f619461e09e3065e1aa46c7b
      
https://github.com/qemu/qemu/commit/14404dd2d1c18529f619461e09e3065e1aa46c7b
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/acpi/generic_event_device.c
    M include/hw/acpi/generic_event_device.h

  Log Message:
  -----------
  acpi: ged: add control regs

Add control regs (sleep, reset) for hw-reduced acpi.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-5-kraxel@redhat.com


  Commit: 2025e97dc55107e4f0d2b7553d7eb325bc1f437d
      
https://github.com/qemu/qemu/commit/2025e97dc55107e4f0d2b7553d7eb325bc1f437d
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    A hw/i386/generic_event_device_x86.c
    M hw/i386/meson.build
    M include/hw/acpi/generic_event_device.h

  Log Message:
  -----------
  acpi: ged: add x86 device variant.

Set AcpiDeviceIfClass->madt_cpu,
otherwise identical to TYPE_ACPI_GED.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-6-kraxel@redhat.com


  Commit: 7bf2567c12320731b115af83f4991bbc9203df70
      
https://github.com/qemu/qemu/commit/7bf2567c12320731b115af83f4991bbc9203df70
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/acpi/generic_event_device.c
    M hw/arm/virt-acpi-build.c
    M include/hw/acpi/generic_event_device.h

  Log Message:
  -----------
  acpi: move acpi_dsdt_add_power_button() to ged

Allow reuse for microvm.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-7-kraxel@redhat.com


  Commit: d4e9d577be587c6f2e41557f7e4ac0b185f0bb1b
      
https://github.com/qemu/qemu/commit/d4e9d577be587c6f2e41557f7e4ac0b185f0bb1b
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c
    M include/hw/i386/microvm.h

  Log Message:
  -----------
  microvm: make virtio irq base runtime configurable

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-8-kraxel@redhat.com


  Commit: 8045df14bccaeec39291c3d83fea2f638656b5d0
      
https://github.com/qemu/qemu/commit/8045df14bccaeec39291c3d83fea2f638656b5d0
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/Kconfig
    A hw/i386/acpi-microvm.c
    A hw/i386/acpi-microvm.h
    M hw/i386/meson.build
    M hw/i386/microvm.c
    M include/hw/i386/microvm.h

  Log Message:
  -----------
  microvm/acpi: add minimal acpi support

$subject says all.  Can be controlled using -M microvm,acpi=on/off.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-9-kraxel@redhat.com


  Commit: 3b98c65f75c016d317f70b8b47c86044d0260d53
      
https://github.com/qemu/qemu/commit/3b98c65f75c016d317f70b8b47c86044d0260d53
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/acpi-microvm.c

  Log Message:
  -----------
  microvm/acpi: add acpi_dsdt_add_virtio() for x86

Makes x86 linux kernel find virtio-mmio devices automatically.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-10-kraxel@redhat.com


  Commit: 55c4b069973196b1d9089162e31f5bd7d9f17630
      
https://github.com/qemu/qemu/commit/55c4b069973196b1d9089162e31f5bd7d9f17630
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm/acpi: use GSI 16-23 for virtio

With ACPI enabled and IO-APIC being properly declared in the ACPI tables
we can use interrupt lines 16-23 for virtio and avoid shared interrupts.

With acpi disabled we continue to use lines 5-12.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-11-kraxel@redhat.com


  Commit: 67eb6a4007fd8f9073020e506453ff5b7c25cb34
      
https://github.com/qemu/qemu/commit/67eb6a4007fd8f9073020e506453ff5b7c25cb34
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm/acpi: use seabios with acpi=on

With acpi=off continue to use qboot.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-12-kraxel@redhat.com


  Commit: f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846
      
https://github.com/qemu/qemu/commit/f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm/acpi: disable virtio-mmio cmdline hack

... in case we are using ACPI.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-13-kraxel@redhat.com


  Commit: 9927a6329a4ce832b4b529903b0a1e1f580cbf0f
      
https://github.com/qemu/qemu/commit/9927a6329a4ce832b4b529903b0a1e1f580cbf0f
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/x86.c
    M include/hw/i386/x86.h

  Log Message:
  -----------
  x86: constify x86_machine_is_*_enabled

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200915120909.20838-14-kraxel@redhat.com


  Commit: 50aef1318166c2a5551d43fb99c5a517f54fcf3c
      
https://github.com/qemu/qemu/commit/50aef1318166c2a5551d43fb99c5a517f54fcf3c
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/i386/acpi-microvm.c
    M hw/i386/microvm.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/microvm.h
    M include/hw/i386/pc.h
    M include/hw/i386/x86.h

  Log Message:
  -----------
  x86: move acpi_dev from pc/microvm

Both pc and microvm machine types have a acpi_dev field.
Move it to the common base type.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-15-kraxel@redhat.com


  Commit: 0cca1a918b858b37484c571a9a989e2d06eeccae
      
https://github.com/qemu/qemu/commit/0cca1a918b858b37484c571a9a989e2d06eeccae
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

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

  Log Message:
  -----------
  x86: move cpu hotplug from pc to x86

The cpu hotplug code handles the initialization of coldplugged cpus
too, so it is needed even in case cpu hotplug is not supported.

Move the code from pc to x86, so microvm can use it.

Move both plug and unplug to keep everything in one place, even
though microvm needs plug only.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-16-kraxel@redhat.com


  Commit: e3ab9873d28684858b055ff4e964aa2334bdbd73
      
https://github.com/qemu/qemu/commit/e3ab9873d28684858b055ff4e964aa2334bdbd73
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm: wire up hotplug

The cpu hotplug code handles the initialization of coldplugged cpus
too, so it is needed even in case cpu hotplug is not supported.

Wire cpu hotplug up for microvm.
Without this we get a broken MADT table.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-17-kraxel@redhat.com


  Commit: 34b36c3beeaa843d2ae73d6367484961e8bd3352
      
https://github.com/qemu/qemu/commit/34b36c3beeaa843d2ae73d6367484961e8bd3352
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    A tests/data/acpi/microvm/APIC
    A tests/data/acpi/microvm/DSDT
    A tests/data/acpi/microvm/FACP
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests/acpi: allow microvm test data updates.

Also add empty test data files.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200915120909.20838-18-kraxel@redhat.com


  Commit: 3cac3784f7fac7642ccb9676613ba2efe2290f0d
      
https://github.com/qemu/qemu/commit/3cac3784f7fac7642ccb9676613ba2efe2290f0d
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  tests/acpi: allow override blkdev

microvm needs virtio-blk instead of ide.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-19-kraxel@redhat.com


  Commit: c06cbf3d79c0160629f79a79b94dcf6eca5601dc
      
https://github.com/qemu/qemu/commit/c06cbf3d79c0160629f79a79b94dcf6eca5601dc
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  tests/acpi: add microvm test

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-20-kraxel@redhat.com


  Commit: 312354f8c9b64278b8f0aef1567f213a98cf0e80
      
https://github.com/qemu/qemu/commit/312354f8c9b64278b8f0aef1567f213a98cf0e80
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M tests/data/acpi/microvm/APIC
    M tests/data/acpi/microvm/DSDT
    M tests/data/acpi/microvm/FACP
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests/acpi: update expected data files for microvm

Also clear tests/qtest/bios-tables-test-allowed-diff.h

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200915120909.20838-21-kraxel@redhat.com


  Commit: 63bcfe7be09787ad6425afcaab5501b53bc26095
      
https://github.com/qemu/qemu/commit/63bcfe7be09787ad6425afcaab5501b53bc26095
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm: enable ramfb

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200915120909.20838-22-kraxel@redhat.com


  Commit: a6a0c8394c5b0ce4cee2a1597d235d9b2b9af3c2
      
https://github.com/qemu/qemu/commit/a6a0c8394c5b0ce4cee2a1597d235d9b2b9af3c2
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M hw/acpi/generic_event_device.c
    M hw/arm/virt-acpi-build.c
    M hw/i386/Kconfig
    M hw/i386/acpi-build.c
    A hw/i386/acpi-microvm.c
    A hw/i386/acpi-microvm.h
    A hw/i386/generic_event_device_x86.c
    M hw/i386/meson.build
    M hw/i386/microvm.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/x86.c
    M include/hw/acpi/generic_event_device.h
    M include/hw/i386/microvm.h
    M include/hw/i386/pc.h
    M include/hw/i386/x86.h
    M pc-bios/bios-microvm.bin
    M pc-bios/meson.build
    A pc-bios/qboot.rom
    M roms/Makefile
    A roms/config.seabios-microvm
    A tests/data/acpi/microvm/APIC
    A tests/data/acpi/microvm/DSDT
    A tests/data/acpi/microvm/FACP
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/microvm-20200917-pull-request' into staging

microvm: add acpi support

# gpg: Signature made Thu 17 Sep 2020 14:53:06 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/microvm-20200917-pull-request: (21 commits)
  microvm: enable ramfb
  tests/acpi: update expected data files for microvm
  tests/acpi: add microvm test
  tests/acpi: allow override blkdev
  tests/acpi: allow microvm test data updates.
  microvm: wire up hotplug
  x86: move cpu hotplug from pc to x86
  x86: move acpi_dev from pc/microvm
  x86: constify x86_machine_is_*_enabled
  microvm/acpi: disable virtio-mmio cmdline hack
  microvm/acpi: use seabios with acpi=on
  microvm/acpi: use GSI 16-23 for virtio
  microvm/acpi: add acpi_dsdt_add_virtio() for x86
  microvm/acpi: add minimal acpi support
  microvm: make virtio irq base runtime configurable
  acpi: move acpi_dsdt_add_power_button() to ged
  acpi: ged: add x86 device variant.
  acpi: ged: add control regs
  seabios: add bios-microvm.bin binary
  seabios: add microvm config, update build rules
  ...

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


Compare: https://github.com/qemu/qemu/compare/3af984709398...a6a0c8394c5b
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 3bee1d: microvm: name qboot binary qboot.rom, Peter Maydell <=
Prev by Date: [Qemu-commits] [qemu/qemu] fb730c: linux-user: test, don't assert addr != test in pgb...
Next by Date: [Qemu-commits] [qemu/qemu] 17cd6e: docker.py: always use --rm
Previous by thread: [Qemu-commits] [qemu/qemu] fb730c: linux-user: test, don't assert addr != test in pgb...
Next by thread: [Qemu-commits] [qemu/qemu] 17cd6e: docker.py: always use --rm
Index(es):
- Date
- Thread