qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] d11b79: hw/i386/Kconfig: ISAPC works fine wit


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] d11b79: hw/i386/Kconfig: ISAPC works fine without VGA_ISA
Date: Mon, 22 May 2023 15:20:00 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d11b791890b17d3e80e31aae5028660f41c1b58b
      
https://github.com/qemu/qemu/commit/d11b791890b17d3e80e31aae5028660f41c1b58b
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/i386/Kconfig

  Log Message:
  -----------
  hw/i386/Kconfig: ISAPC works fine without VGA_ISA

The "isapc" machine can also be run without VGA card, so there
is no need for a hard requirement with a "select" here - "imply"
is enough.

Message-Id: <20230512124033.502654-2-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d563cc84cdc599c3fbd40b36d6b71411e008b039
      
https://github.com/qemu/qemu/commit/d563cc84cdc599c3fbd40b36d6b71411e008b039
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  softmmu/vl.c: Check for the availability of the VGA device before using it

In case the user disabled the default VGA device in the binary (e.g.
with the "--without-default-devices" configure switch), we should
not try to use it by default if QEMU is running with the default
devices, otherwise it aborts when trying to use it. Simply emit a
warning instead.

Message-Id: <20230512124033.502654-3-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 01ecdaa40e0c14b99ae7e81b5bfce9b6bd6e167c
      
https://github.com/qemu/qemu/commit/01ecdaa40e0c14b99ae7e81b5bfce9b6bd6e167c
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/boards.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw: Move the default NIC machine class setting from the x86 to the generic one

We are going to re-use this setting for other targets, so let's
move this to the main MachineClass.

Message-Id: <20230512124033.502654-4-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 26a0802d1ccbf3c3c659f3d2641cf7deef0e70ac
      
https://github.com/qemu/qemu/commit/26a0802d1ccbf3c3c659f3d2641cf7deef0e70ac
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  softmmu/vl.c: Disable default NIC if it has not been compiled into the binary

Don't try to instantiate a default NIC if it is not available (since
this will cause QEMU to abort). Emit a warning instead.

Message-Id: <20230512124033.502654-5-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 053b7086274487c31a136940c75a665211bc2b4a
      
https://github.com/qemu/qemu/commit/053b7086274487c31a136940c75a665211bc2b4a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/ppc/e500.c
    M hw/ppc/e500plat.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/mpc8544ds.c
    M hw/ppc/ppc440_bamboo.c
    M hw/ppc/prep.c

  Log Message:
  -----------
  hw/ppc: Use MachineClass->default_nic in the ppc machines

Mark the default NIC via the new MachineClass->default_nic setting
so that the machine-defaults code in vl.c can decide whether the
default NIC is usable or not (for example when compiling with the
"--without-default-devices" configure switch).

Message-Id: <20230512124033.502654-6-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a32b158a838e21197fef05aebe5ba066e62f45f5
      
https://github.com/qemu/qemu/commit/a32b158a838e21197fef05aebe5ba066e62f45f5
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  hw/s390x: Use MachineClass->default_nic in the s390x machine

Mark the default NIC via the new MachineClass->default_nic setting
so that the machine-defaults code in vl.c can decide whether the
default NIC is usable or not (for example when compiling with the
"--without-default-devices" configure switch).

Message-Id: <20230512124033.502654-7-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: cf2528a53613b85c91678d14bd5551245089081a
      
https://github.com/qemu/qemu/commit/cf2528a53613b85c91678d14bd5551245089081a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/sh4/r2d.c

  Log Message:
  -----------
  hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine

Mark the default NIC via the new MachineClass->default_nic setting
so that the machine-defaults code in vl.c can decide whether the
default NIC is usable or not (for example when compiling with the
"--without-default-devices" configure switch).

Message-Id: <20230512124033.502654-8-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 963e94a97b3052529678253c6e6efcf102ca3635
      
https://github.com/qemu/qemu/commit/963e94a97b3052529678253c6e6efcf102ca3635
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/char/parallel-isa.c
    M hw/char/parallel.c
    M hw/isa/isa-superio.c
    M include/hw/char/parallel.h

  Log Message:
  -----------
  hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file

We are going to require the macro from other files, too, so move
this #define to the header file.

Message-Id: <20230512124033.502654-9-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 545d8574bafbfe308908f10b4027010f6a12a441
      
https://github.com/qemu/qemu/commit/545d8574bafbfe308908f10b4027010f6a12a441
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  hw/i386: Ignore the default parallel port if it has not been compiled into 
QEMU

Don't try to instantiate the parallel port if it has not been
enabled in the build configuration.

Message-Id: <20230512124033.502654-10-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e8273b0c456a26aad046f48424861ecd26bd16c7
      
https://github.com/qemu/qemu/commit/e8273b0c456a26aad046f48424861ecd26bd16c7
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel

Announce the default NIC via MachineClass->default_nic and set up
MachineClass->no_parallel according to the availability of the
"isa-parallel" device, so that the Sun machines also work when
QEMU has been configured with "--without-default-devices".

Message-Id: <20230512124033.502654-11-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 335da81152357114b5d5dbfebb680a886b78fe0a
      
https://github.com/qemu/qemu/commit/335da81152357114b5d5dbfebb680a886b78fe0a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/readconfig-test.c

  Log Message:
  -----------
  tests/qtest/readconfig-test: Check for the availability of USB controllers

The USB controllers might not be available in the QEMU binary
(e.g. when using the "--without-default-devices" configure switch),
so we have to check whether the devices can be used before running
the related test.

Message-Id: <20230512124033.502654-12-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 9b76fc5a71689d06d219fc9662ac43a64469d08a
      
https://github.com/qemu/qemu/commit/9b76fc5a71689d06d219fc9662ac43a64469d08a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/usb-hcd-uhci-test.c

  Log Message:
  -----------
  tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available

The test is already fenced with CONFIG_USB_UHCI in meson.build, but in
case we build the ppc or mips targets in parallel, this config switch
is still set in "config_all_devices" and thus the test is still run.
Thus we need an explicit additional check here before adding the tests
to the test plan.

Message-Id: <20230512124033.502654-13-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b49056b5a306ce950d0eb96ce41bdbf4f152e491
      
https://github.com/qemu/qemu/commit/b49056b5a306ce950d0eb96ce41bdbf4f152e491
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/cdrom-test.c

  Log Message:
  -----------
  tests/qtest/cdrom-test: Fix the test to also work without optional devices

It's possible to disable virtio-scsi and virtio-blk in the binaries,
so we must not run the corresponding tests if these devices are missing.

Message-Id: <20230512124033.502654-14-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 9a671714615e0b232059e8dcb17359722b607fc9
      
https://github.com/qemu/qemu/commit/9a671714615e0b232059e8dcb17359722b607fc9
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/virtio-ccw-test.c

  Log Message:
  -----------
  tests/qtest/virtio-ccw-test: Remove superfluous tests

virtio-balloon-ccw is already tested in the device-plug-test,
virtio-blk-ccw is already tested in cdrom-test, and virtio-net-ccw
is already tested in the pxe-test, so there is not much point
in doing "nop" tests here again.

Message-Id: <20230512124033.502654-15-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 65331bf5d13fda151ecffe81c91fe482da15c3d5
      
https://github.com/qemu/qemu/commit/65331bf5d13fda151ecffe81c91fe482da15c3d5
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/device-plug-test.c
    M tests/qtest/virtio-ccw-test.c

  Log Message:
  -----------
  tests/qtest: Check for the availability of virtio-ccw devices before using 
them

The devices might not have been compiled into the QEMU binary, so we
have to check before we can use them.

Message-Id: <20230512124033.502654-16-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 973d97feca93ce9f5c349aa607944b517cd415eb
      
https://github.com/qemu/qemu/commit/973d97feca93ce9f5c349aa607944b517cd415eb
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qtest/meson.build

  Log Message:
  -----------
  tests/qtest/meson.build: Run the net filter tests only with default devices

These tests rely on a default NIC to be available. Skip them if we
used the "--without-default-devices" configure option.

Message-Id: <20230512124033.502654-17-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 2feae891ea50e7637dd6b2f7c037cb1db2be0f89
      
https://github.com/qemu/qemu/commit/2feae891ea50e7637dd6b2f7c037cb1db2be0f89
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/qemu-iotests/172

  Log Message:
  -----------
  tests/qemu-iotests/172: Run QEMU with -vga none and -nic none

This way QEMU won't complain in case the VGA card or the NIC device
are not available in the binary, thus it won't spoil the output
and the test then passes with such QEMU binaries that have a limited
configuration, too.

Message-Id: <20230512124033.502654-18-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: bb6e473450d7f0cba50e19fd79a0155087025adc
      
https://github.com/qemu/qemu/commit/bb6e473450d7f0cba50e19fd79a0155087025adc
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml

  Log Message:
  -----------
  .gitlab-ci.d/buildtest.yml: Run full "make check" with 
--without-default-devices

Thanks to the fixes from the previous patches, we can now run
the full set of "make check" with all targets here.

Message-Id: <20230512124033.502654-19-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 1afae3b8813023c32eaaf422af39c402b0f1930a
      
https://github.com/qemu/qemu/commit/1afae3b8813023c32eaaf422af39c402b0f1930a
  Author: Ani Sinha <anisinha@redhat.com>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M tests/avocado/acpi-bits.py

  Log Message:
  -----------
  acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline

Biosbits avocado tests on gitlab has thus far been disabled because some
packages needed by this test was missing in the container images used by gitlab
CI. These packages have now been added with the commit:

da9000784c90d ("tests/lcitool: Add mtools and xorriso and remove genisoimage as 
dependencies")

Therefore, this change enables bits avocado test on gitlab.
At the same time, the bits cleanup code has also been made more robust with
this change.

Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-Id: <20230517065357.5614-1-anisinha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3884bf6468ac6bbb58c2b3feaa74e87f821b52f3
      
https://github.com/qemu/qemu/commit/3884bf6468ac6bbb58c2b3feaa74e87f821b52f3
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M softmmu/memory.c

  Log Message:
  -----------
  memory: stricter checks prior to unsetting engaged_in_io

engaged_in_io could be unset by an MR with re-entrancy checks disabled.
Ensure that only MRs that can set the engaged_in_io flag can unset it.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20230516084002.3813836-1-alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 37246d54d656933035094ed95f2d8e4708058856
      
https://github.com/qemu/qemu/commit/37246d54d656933035094ed95f2d8e4708058856
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-05-22 (Mon, 22 May 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M hw/char/parallel-isa.c
    M hw/char/parallel.c
    M hw/i386/Kconfig
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/isa/isa-superio.c
    M hw/ppc/e500.c
    M hw/ppc/e500plat.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/mpc8544ds.c
    M hw/ppc/ppc440_bamboo.c
    M hw/ppc/prep.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/sh4/r2d.c
    M hw/sparc64/sun4u.c
    M include/hw/boards.h
    M include/hw/char/parallel.h
    M include/hw/i386/pc.h
    M softmmu/memory.c
    M softmmu/vl.c
    M tests/avocado/acpi-bits.py
    M tests/qemu-iotests/172
    M tests/qtest/cdrom-test.c
    M tests/qtest/device-plug-test.c
    M tests/qtest/meson.build
    M tests/qtest/readconfig-test.c
    M tests/qtest/usb-hcd-uhci-test.c
    M tests/qtest/virtio-ccw-test.c

  Log Message:
  -----------
  Merge tag 'pull-request-2023-05-22' of https://gitlab.com/thuth/qemu into 
staging

* First batch of fixes to allow "make check" with "--without-default-devices"
* Enable the "bios bits" avocado test in the gitlab-CI
* Another minor fix for the redundancy DMA blocker code

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmRrVhoRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbUaiRAApPVveet6WPQ7Ag1448LtqHTGiwl8x2Ba
# jQ7FTKhqdTC5O+/BU7IQkvGmErPxCc8WPB7eoowwBVA/4dr8YIIBLKqO4RtP6LXs
# rtUkzsPI9ExW+iJjIMVOmHsp/shlRhuf+Tmlr8OsTObecCeA4Vbxc+RlvYXfCPhM
# 8tOuLO8n6LQY/62fgXSzI5WlLQSzIo3aDSmCeWa1QHkPLf6itvGkwsNBytMJLoUT
# pXZnBNqlXiuyPtloLp+DMfRRkpq8AHB04+Sri7TVPxi7bJL28RMZiaAXpvHSFLz8
# JR2ApRrzBthiLMK1I6A0c2ZGCbVOAi1dhNDNqWCyx8ZBASEJj0XuT/+Qse81sKmG
# zNXr57x0CzWAJ59/taBM2hjUks10rJOmxHJYxS6i1JJR7u1zTuvii7toPMmf35zX
# bM7TYjKpYGa2HneHpw1eOjpTgUYZpgla/pVXZhKqoGdfmseBMlFU424MNl/xDRng
# bxuam3Ku+ClOeQlzXt8aceL/gTApJfvy5FAIAK5yUOQDTs6HjJJL2AfcOzss8kXb
# k6IMHgV1tnLed8B7K4iml2rzvk+RT3CPGvmaNwSAkdh8SnE5/bv1I6s4fHiXMlvC
# mmfvFSoWwdhcsD5r+XOFxfke8sGrOeQIXKefp6UL3hYVV7o2NUe89BytXZCzut/Y
# 6ulR25HHtmI=
# =m1Px
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 22 May 2023 04:46:34 AM PDT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [undefined]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2023-05-22' of https://gitlab.com/thuth/qemu:
  memory: stricter checks prior to unsetting engaged_in_io
  acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline
  .gitlab-ci.d/buildtest.yml: Run full "make check" with 
--without-default-devices
  tests/qemu-iotests/172: Run QEMU with -vga none and -nic none
  tests/qtest/meson.build: Run the net filter tests only with default devices
  tests/qtest: Check for the availability of virtio-ccw devices before using 
them
  tests/qtest/virtio-ccw-test: Remove superfluous tests
  tests/qtest/cdrom-test: Fix the test to also work without optional devices
  tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available
  tests/qtest/readconfig-test: Check for the availability of USB controllers
  hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel
  hw/i386: Ignore the default parallel port if it has not been compiled into 
QEMU
  hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file
  hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine
  hw/s390x: Use MachineClass->default_nic in the s390x machine
  hw/ppc: Use MachineClass->default_nic in the ppc machines
  softmmu/vl.c: Disable default NIC if it has not been compiled into the binary
  hw: Move the default NIC machine class setting from the x86 to the generic one
  softmmu/vl.c: Check for the availability of the VGA device before using it
  hw/i386/Kconfig: ISAPC works fine without VGA_ISA

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/ad3387396a71...37246d54d656



reply via email to

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