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 24cffa87d4..6ce5bf49c5 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 96e25f62ac..fd54c1f140 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 9317046177..cb1ec72347 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 a17d0554d6..4a84e6174f 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 1bf47b0b0b..9fbfe748b5 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 eaeddca277..2ef5781ef8 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 448e14b531..fe869b98ca 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 1d04672b01..0000000000 --- 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 b94f3fb081..3702ed485c 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 388e0db6e4..a7224ef469 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 HcmV?d00001 literal 4096 zcmWGt#qlzR>tz_%tJDt+A71IbVEDiQ0SaJBB_Q9Qk%@tUAqd2EVDM#NZfJN6VzYq= z2KW5@^qf>31<$->J%-@aqRhk`1^1%Ff{e`MVg<*P#DbF4A_W5zeIs*yLvw~;cSk2r z|6m0b&lD8}je?~7ysFH+Oox>Gyv(Z9l9EhKh4jpP1tW8X#DXFPBLhQo9R&jmJ!3OH zQ*#}K&=6;a014@6Lu(^bvm)teBU3XF%R@TaERP{1wJ6t0fx*?u#nDQE;nnAN3?Cqb z<#UD){}F&e&OlE=NKuJTTt!t)#!y0%Uszs5OkYq}REJSpy1mD;X+=wGTZcwhcW19L zkBKQa6Eh1d8#@Ol*K+mEye3EJHx@^qX=$Z@XtGaaKw4sEercXxV!pkuu91nNjh(Wxa!pN5jkY!j zYinz3>+06%f;nJ@uCA^wNEC#Xb!%#L6O+;lQj1GV3=Hy%Gb>Z$Y_;udYHDZj(xk<-ZT8K#=njC;6si-pVHPh zzh_ZPvt%vh*Xy*CV^T}&c4gH|TP(%IE}wWfL5_`o0Zeb_F}<{IJt-!=ZaX=q=HuLH zoNr4U)w*RHe={@`TiEcHnAmWXvUA=p(eZw*khYV7k>LQpQCdJ+P@3VTw9Xg&2Av;L zI@r^q(jxc`oYgvIn~yW8b;|ND1X(l(;>Lx149zbb`VQDK%qTMdwV02gSx=aOvG2w{ z1{VHpJPj<22Oo0jb@C}N8UFwCd5K=PoB~tYarR($M~36>EDS8i-Psrz*yR)Ff*cNW zwqCcL0u$%|5;L{5Mq7~5QXRGKST?neMg~UyZHF&Dc(I7J@i+q$<8if4QRl|r42-2r zhPT1G)H-9?K(0&Ze0t1{j{y;kU|G)pCCP9zBVWX@{so!qUCh#Wn1QkL#>EE^Q#&to z-h9mUX+6lhmaHXWV7-mU|1s}mV1$X5N;SS`VA9jJQ((IIUXR&MfvNF01EX3OYlj;j z$N|>T(T)t({s9cu(T0X~3^vixP7F5wfebd$hDLP^w$ahf47UD347SmR#&ryK(a|mp zcK*Q(cF~3=bqw~=(XI^k(T1jV4EFvZ3=YwT=5-7X{-F$x(S{av437R`3{KI8mURqH z{^1PH(MAS!49@-$3@*_|hII@s{*er=(MHB~46XiA3~kXyCUp!!(MEL)!O_Nb4Bq}O z4BpW$4DQi}bqwy&9t{4`CUp${(QXVL{*DYD(T)rO{!R=5(M}AW(WZ3_fzf7l48H!( z48GCM3=9E5!Ft_d5=_m97!3}*Yd*xZVe&h$z-~r{jvMbfemFt6&4-vb2)}DS#JGVO zCcw0T@m+LO#9^@V=0mJ+Z2lh(3V!kae~H=(#u6p4@S7D4rEfb9$??hW{=jfuUZuX{ zNXG@6`ckG19IXeUqYeieo_zB5#fkq9e?}e-4Gs)Q%VID*+4=Ovv;QS_9c~Q&4!Sn{ zWGP{NaqWNUhuu$@JD=)xsXKE#DN)qx(s$-~TOwqU$56`b`uYQeU;5+q9fJd%PdnXM znvbwVL`KIR4hRZd(NHSVab)L*|1X07uTXgSv*Q8SZSNwZA`S=3@yV}fC}C5n-#vlx zx{X3H%kBck>+;cuZP-irZ8%D}ZMaI>WRN3|_qd*Kvc#;Khr7AhjEKU)=w&Tavwjt462*E0~Jgg#9ny*-;nzv^j}o8T8CU3Lj=40;W@t&K!NaL-CrB&Qsx(r|8~pC zFm$pvA7*O)ZCAv+TaKYqPKE(g#=MOB`7-8bLg&-wqXHaHN?05Iu#~!j^mbmp__+Bo zdpEzlo+Y0IQ>lSmcN{}s98+4O9UFs>r;mTBNTVGWgBV*W&oMS328Oib>`@ViC&(uT zz0mn<@FePd;!Dn-0YNY1|CX??U@T#Nk@Y_+;-$)ufZ!mI@h?6xbj$HDXk7kwTjTq; z`y7`_**EaMnDE!&cEf+hQuYm8FIxT@{BQXEzl5vd_rFq}4ID3u|8C%Tkq1)o8>B+v zMG}bp|9>ghi-vz29A5a6q?sH(vsSeDq46oa2mr4i(m5RS2UFJzUckC!RST8pAB9wqW^4Wf3fke!GFU`FJu3Q1-+R5 zzw=s@4MPckz>D<1FSP$|2!3JyCo1l6K->KnoqyZzgY4iuSt`=-pS_g-g$u|aagaem ze_rbZb)I^m|350w;O)1Y3>W_$)U)DS&rrmw*TuJ%|R! zI7*pce*M?*hqILVrP;rRKU}5EFOB~-{NXEQekuL0;SYZ)^UHnz8vY1_wEc^Sg4_8b z`CsD8RbO|UVgO|cwk!rvR!du`!H~B2I)hr;LLG**#dkmq2Zpr8Tp&gOL)zkpAVvg3 z+G2hNwc~6W43+F^J$zaqwhluLh^+@=J21T9RO{h$0OtZ`Aa(@9br3s>;l+cW zFLZvD{@%Bd;YI21EQc%ydG`GQ3@m9VX9{vTiZ)!@LY=Km2zG5Z1-*4j!(mj)Z$ zUSnfWhMfWoe?G6`lYcSiXX(2aF2DCVFuZv5>xK32 zeZCAYZvJ{<^m|_(!;1^QUTFS?856nh1jCDczp@S{ORi0vTQ$`Ss%MuVZYU49v&aQW-Rlvn4ZJVLs00!@%Hhj4h3U zz30SnwsZythQ*l-Sq}0GS{VKv&|9>D0hHGDI@H!Pypa9&V(+(o=NVpj{nA^gz|{8O wMd7av3NLDZc072I{_DkrU!XS8X;^cR$~2;7KFS&mfzc44V+in+a diff --git a/roms/Makefile b/roms/Makefile index 5e44d97890..955f92286d 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 cbaee52287..0000000000 --- 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 cc06fac592..e69d16a62c 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",