From b482fb43deb3fa9f5c44fd3da3dde04acec7750f Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 9 Feb 2023 17:15:40 +0100 Subject: [PATCH] hw/misc/sga: Remove the deprecated "sga" device It's been deprecated since QEMU v6.2, so it should be OK to finally remove this now. Message-Id: <20230209161540.1054669-1-thuth@redhat.com> Reviewed-by: Juan Quintela Acked-by: Gerd Hoffmann Signed-off-by: Thomas Huth --- .gitmodules | 3 -- MAINTAINERS | 1 - docs/about/deprecated.rst | 9 ---- docs/about/removed-features.rst | 10 ++++ hw/i386/Kconfig | 1 - hw/misc/Kconfig | 4 -- hw/misc/meson.build | 1 - hw/misc/sga.c | 71 ---------------------------- pc-bios/README | 6 --- pc-bios/meson.build | 1 - pc-bios/sgabios.bin | Bin 4096 -> 0 bytes roms/Makefile | 9 +--- roms/sgabios | 1 - tests/migration/guestperf/engine.py | 2 +- 14 files changed, 12 insertions(+), 107 deletions(-) delete mode 100644 hw/misc/sga.c delete mode 100644 pc-bios/sgabios.bin delete mode 160000 roms/sgabios diff --git a/.gitmodules b/.gitmodules index 24cffa87d42..6ce5bf49c58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "roms/qemu-palcode"] path = roms/qemu-palcode url = https://gitlab.com/qemu-project/qemu-palcode.git -[submodule "roms/sgabios"] - path = roms/sgabios - url = https://gitlab.com/qemu-project/sgabios.git [submodule "dtc"] path = dtc url = https://gitlab.com/qemu-project/dtc.git diff --git a/MAINTAINERS b/MAINTAINERS index 96e25f62aca..fd54c1f1401 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1676,7 +1676,6 @@ F: hw/acpi/piix4.c F: hw/acpi/ich9*.c F: include/hw/acpi/ich9*.h F: include/hw/southbridge/piix.h -F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/unit/test-x86-cpuid.c diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93170461778..cb1ec72347a 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -260,15 +260,6 @@ full SCSI support. Use virtio-scsi instead when SCSI passthrough is required. Note this also applies to ``-device virtio-blk-pci,scsi=on|off``, which is an alias. -``-device sga`` (since 6.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The ``sga`` device loads an option ROM for x86 targets which enables -SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards -contains native support for this feature and thus use of the option -ROM approach is obsolete. The native SeaBIOS support can be activated -by using ``-machine graphics=off``. - ``-device nvme-ns,eui64-default=on|off`` (since 7.1) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index a17d0554d66..4a84e6174fe 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -789,6 +789,16 @@ The 'ide-drive' device has been removed. Users should use 'ide-hd' or The 'scsi-disk' device has been removed. Users should use 'scsi-hd' or 'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed. +``sga`` (removed in 8.0) +'''''''''''''''''''''''' + +The ``sga`` device loaded an option ROM for x86 targets which enabled +SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards +contains native support for this feature and thus use of the option +ROM approach was obsolete. The native SeaBIOS support can be activated +by using ``-machine graphics=off``. + + Related binaries ---------------- diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 1bf47b0b0b4..9fbfe748b57 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -26,7 +26,6 @@ config PC imply QXL imply SEV imply SGX - imply SGA imply TEST_DEVICES imply TPM_CRB imply TPM_TIS_ISA diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index eaeddca277b..2ef5781ef87 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -15,10 +15,6 @@ config ISA_DEBUG bool depends on ISA_BUS -config SGA - bool - depends on ISA_BUS - config ISA_TESTDEV bool default y if TEST_DEVICES diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 448e14b531a..fe869b98ca4 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -5,7 +5,6 @@ softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) -softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c')) softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c')) diff --git a/hw/misc/sga.c b/hw/misc/sga.c deleted file mode 100644 index 1d04672b013..00000000000 --- a/hw/misc/sga.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * QEMU dummy ISA device for loading sgabios option rom. - * - * Copyright (c) 2011 Glauber Costa, Red Hat Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * sgabios code originally available at code.google.com/p/sgabios - * - */ - -#include "qemu/osdep.h" -#include "hw/isa/isa.h" -#include "hw/loader.h" -#include "qemu/module.h" -#include "qom/object.h" -#include "qemu/error-report.h" - -#define SGABIOS_FILENAME "sgabios.bin" - -#define TYPE_SGA "sga" -OBJECT_DECLARE_SIMPLE_TYPE(ISASGAState, SGA) - -struct ISASGAState { - ISADevice parent_obj; -}; - -static void sga_realizefn(DeviceState *dev, Error **errp) -{ - warn_report("-device sga is deprecated, use -machine graphics=off"); - rom_add_vga(SGABIOS_FILENAME); -} - -static void sga_class_initfn(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); - dc->realize = sga_realizefn; - dc->desc = "Serial Graphics Adapter"; -} - -static const TypeInfo sga_info = { - .name = TYPE_SGA, - .parent = TYPE_ISA_DEVICE, - .instance_size = sizeof(ISASGAState), - .class_init = sga_class_initfn, -}; - -static void sga_register_types(void) -{ - type_register_static(&sga_info); -} - -type_init(sga_register_types) diff --git a/pc-bios/README b/pc-bios/README index b94f3fb0811..3702ed485c6 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -20,12 +20,6 @@ -machine pseries,x-vof=on. When enabled, the firmware acts as a slim shim and QEMU implements parts of the IEEE 1275 Open Firmware interface. -- sgabios (the Serial Graphics Adapter option ROM) provides a means for - legacy x86 software to communicate with an attached serial console as - if a video card were attached. The master sources reside in a subversion - repository at http://sgabios.googlecode.com/svn/trunk. A git mirror is - available at https://gitlab.com/qemu-project/sgabios.git. - - The PXE roms come from the iPXE project. Built with BANNER_TIME 0. Sources available at http://ipxe.org. Vendor:Device ID -> ROM mapping: diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 388e0db6e40..a7224ef4699 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -28,7 +28,6 @@ blobs = [ 'bios-256k.bin', 'bios-microvm.bin', 'qboot.rom', - 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', 'vgabios-stdvga.bin', diff --git a/pc-bios/sgabios.bin b/pc-bios/sgabios.bin deleted file mode 100644 index 6308f2e2d7064b52ff3c2e207b71018710866c05..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 4096 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 diff --git a/roms/Makefile b/roms/Makefile index 5e44d978900..955f92286de 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -57,7 +57,6 @@ default help: @echo "available build targets:" @echo " bios -- update bios.bin (seabios)" @echo " vgabios -- update vgabios binaries (seabios)" - @echo " sgabios -- update sgabios binaries" @echo " pxerom -- update nic roms (bios only)" @echo " efirom -- update nic roms (bios+efi)" @echo " slof -- update slof.bin" @@ -102,11 +101,7 @@ build-seabios-config-%: config.% OUT=$(CURDIR)/seabios/builds/$*/ all -.PHONY: sgabios skiboot qboot -sgabios: - $(MAKE) -C sgabios - cp sgabios/sgabios.bin ../pc-bios - +.PHONY: skiboot qboot pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) @@ -199,8 +194,6 @@ npcm7xx_bootrom: clean: rm -rf seabios/.config seabios/out seabios/builds - $(MAKE) -C sgabios clean - rm -f sgabios/.depend $(MAKE) -C ipxe/src veryclean $(MAKE) -C edk2/BaseTools clean $(MAKE) -C SLOF clean diff --git a/roms/sgabios b/roms/sgabios deleted file mode 160000 index cbaee52287e..00000000000 --- a/roms/sgabios +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbaee52287e5f32373181cff50a00b6c4ac9015a diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index cc06fac5925..e69d16a62c8 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -337,7 +337,7 @@ class Engine(object): argv.extend(self._get_qemu_serial_args()) if self._debug: - argv.extend(["-device", "sga"]) + argv.extend(["-machine", "graphics=off"]) if hardware._prealloc_pages: argv_source += ["-mem-path", "/dev/shm", -- 2.39.5