From nobody Mon Feb 9 03:13:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612537745; cv=none; d=zohomail.com; s=zohoarc; b=ExJgVJI8CFgM5Chj8dv+u644Tp0wlJW41zijs4QcRppjERw1N2a/Ej2y0RqHFDfHruvM7y0a4pq931arkyoVN7YXqEaGoXXo6DHNtRKjjLBOpyF3nzdDto1a5EBKwXmt7XqpJK1WeaKn/BtCGMh1rFYBRdJudc30XSxxyJ38nNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612537745; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NQXW1/SZyEseosS3Pdw5NegFFGQKTt5n2ODFCN2dPLY=; b=UWWiIdSGPorlKxY280BGyQcaIp/73Nd2kmDfMW2Ocez9G5wxLxe+Tz2/smCSyVaKmzwu2Yyw1es3sS33NWQvgLazBK706Y5fbDpceNpvKh5c6dgPt1fUtu6feTqrszsUpEj5RtINQ+oe9XxVHROzOTab7mOuMrOesyALKPhKdN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1612537745571627.1692925015958; Fri, 5 Feb 2021 07:09:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-22-wKEHoKSCMlqxOLNxINS6bg-1; Fri, 05 Feb 2021 10:09:00 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0D5380197B; Fri, 5 Feb 2021 15:08:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6B9A19712; Fri, 5 Feb 2021 15:08:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 560E018095CB; Fri, 5 Feb 2021 15:08:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 115F7Bp5017714 for ; Fri, 5 Feb 2021 10:07:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id CD51E2166B39; Fri, 5 Feb 2021 15:07:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3A6A2166B34 for ; Fri, 5 Feb 2021 15:07:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 763CC80B926 for ; Fri, 5 Feb 2021 15:07:06 +0000 (UTC) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-FCjXzTO_MTe47PAJrxCYvw-1; Fri, 05 Feb 2021 10:03:56 -0500 Received: by mail-ed1-f70.google.com with SMTP id i4so7132583edt.11 for ; Fri, 05 Feb 2021 07:03:55 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id ah20sm4000000ejc.99.2021.02.05.07.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 07:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612537744; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NQXW1/SZyEseosS3Pdw5NegFFGQKTt5n2ODFCN2dPLY=; b=AwNHpoerQ4bnAD3q2Pp2z3yrfICa8Qr6gkU6UWmJ7WQLa/UlqjZ4uGzkM9ryJye8nygcVl HtcpKzWsw/RxnljFIm2KVo1EidkYWiLXsSjfsSrtWab+dVmMDdpGe64LhYv4gZ62wR/+sB Y1cVVkXRUyKoSf1e1Xt7qWG+0MciGsg= X-MC-Unique: wKEHoKSCMlqxOLNxINS6bg-1 X-MC-Unique: FCjXzTO_MTe47PAJrxCYvw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=NQXW1/SZyEseosS3Pdw5NegFFGQKTt5n2ODFCN2dPLY=; b=HOMRW+LTKwp5JeCq5mLmNOz6ENYW+vjFCfsTnw861sw59lWcVAsGigKtXwP5ewM7Ag a4yKU6qd8QpZvZG5PNtBQuf8/Oc/DblzctxOoDz4Xy1vejJze0whSNVka4yV2fhuMYK7 1ZKV4cw2ymPkv36r/LeCJ63Y15mipeTcHzqwSY5Ednc+yUK1c3y9IU66WQpFcYxazolz CHhCfVifwUbxISw21z0fQL25/vjUX/vpMvPf8uHFhhDqQEjyE49XvB8XFPViTrSpG6Qc F+aXKZyuhuX05IiGezyrllHQEHvKXLZzvOJvBmKEuKWjCUhjK9pgeA0kgbsBYz9VcoLH LmNA== X-Gm-Message-State: AOAM531Czi8tWieAiySjDlrUdl4OOHeuFUb5AoAuWjl6NjLzvrwRNHvR oUSFFMdPBSM7kty2gt+ByGEEsjYWKzr9E5//XF3FvVGBbKlmtPmVe9s4hjPaEsP9Lv0o2PrfHKl Oo8Soj9NbM4fMJ5YG68E= X-Received: by 2002:a17:906:4c4b:: with SMTP id d11mr4426759ejw.387.1612537434877; Fri, 05 Feb 2021 07:03:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQ6wGeqSOagw/8jmeSUqXi7g60Csz3C+pzWJ5D17OzyTpAM9E3fBhB026TdXEUPdMqpna/RA== X-Received: by 2002:a17:906:4c4b:: with SMTP id d11mr4426733ejw.387.1612537434710; Fri, 05 Feb 2021 07:03:54 -0800 (PST) Date: Fri, 5 Feb 2021 10:03:51 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 08/16] hw/i386: Remove the deprecated pc-1.x machine types Message-ID: <20210205150135.94643-9-mst@redhat.com> References: <20210205150135.94643-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210205150135.94643-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , libvir-list@redhat.com, Richard Henderson , Marcel Apfelbaum , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth They have been deprecated since QEMU v5.0, time to remove them now. Signed-off-by: Thomas Huth Message-Id: <20210203171832.483176-2-thuth@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/pc_piix.c | 94 -------------------------------- docs/system/deprecated.rst | 6 -- docs/system/removed-features.rst | 6 ++ 3 files changed, 6 insertions(+), 100 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6188c3e97e..2904b40163 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -359,18 +359,6 @@ static void pc_compat_1_4_fn(MachineState *machine) pc_compat_1_5_fn(machine); } =20 -static void pc_compat_1_3(MachineState *machine) -{ - pc_compat_1_4_fn(machine); -} - -/* PC compat function for pc-1.0 to pc-1.2 */ -static void pc_compat_1_2(MachineState *machine) -{ - pc_compat_1_3(machine); - x86_cpu_change_kvm_default("kvm-pv-eoi", NULL); -} - static void pc_init_isa(MachineState *machine) { pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); @@ -772,88 +760,6 @@ static void pc_i440fx_1_4_machine_options(MachineClass= *m) DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4_fn, pc_i440fx_1_4_machine_options); =20 -static void pc_i440fx_1_3_machine_options(MachineClass *m) -{ - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(m); - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("1.3.0") - { "usb-tablet", "usb_version", "1" }, - { "virtio-net-pci", "ctrl_mac_addr", "off" }, - { "virtio-net-pci", "mq", "off" }, - { "e1000", "autonegotiation", "off" }, - }; - - pc_i440fx_1_4_machine_options(m); - m->hw_version =3D "1.3.0"; - m->deprecation_reason =3D "use a newer machine type instead"; - x86mc->compat_apic_id_mode =3D true; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3, - pc_i440fx_1_3_machine_options); - - -static void pc_i440fx_1_2_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("1.2.0") - { "nec-usb-xhci", "msi", "off" }, - { "nec-usb-xhci", "msix", "off" }, - { "qxl", "revision", "3" }, - { "qxl-vga", "revision", "3" }, - { "VGA", "mmio", "off" }, - }; - - pc_i440fx_1_3_machine_options(m); - m->hw_version =3D "1.2.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2, - pc_i440fx_1_2_machine_options); - - -static void pc_i440fx_1_1_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("1.1.0") - { "virtio-scsi-pci", "hotplug", "off" }, - { "virtio-scsi-pci", "param_change", "off" }, - { "VGA", "vgamem_mb", "8" }, - { "vmware-svga", "vgamem_mb", "8" }, - { "qxl-vga", "vgamem_mb", "8" }, - { "qxl", "vgamem_mb", "8" }, - { "virtio-blk-pci", "config-wce", "off" }, - }; - - pc_i440fx_1_2_machine_options(m); - m->hw_version =3D "1.1.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2, - pc_i440fx_1_1_machine_options); - -static void pc_i440fx_1_0_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("1.0") - { TYPE_ISA_FDC, "check_media_rate", "off" }, - { "virtio-balloon-pci", "class", stringify(PCI_CLASS_MEMORY_RAM) }, - { "apic-common", "vapic", "off" }, - { TYPE_USB_DEVICE, "full-path", "no" }, - }; - - pc_i440fx_1_1_machine_options(m); - m->hw_version =3D "1.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, - pc_i440fx_1_0_machine_options); - - typedef struct { uint16_t gpu_device_id; uint16_t pch_device_id; diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 6ac757ed9f..2fcac7861e 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -322,12 +322,6 @@ The 'scsi-disk' device is deprecated. Users should use= 'scsi-hd' or System emulator machines ------------------------ =20 -``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -These machine types are very old and likely can not be used for live migra= tion -from old QEMU versions anymore. A newer machine type should be used instea= d. - Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 88b81a6156..c8481cafbd 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -136,6 +136,12 @@ mips ``fulong2e`` machine alias (removed in 6.0) =20 This machine has been renamed ``fuloong2e``. =20 +``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (removed in 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +These machine types were very old and likely could not be used for live +migration from old QEMU versions anymore. Use a newer machine type instead. + Related binaries ---------------- =20 --=20 MST