From nobody Sat May 4 10:47:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1575895993; cv=none; d=zohomail.com; s=zohoarc; b=DG30Iu/RQMSXonvzV+dAU++wNR5q/GgiWUj95pDlNESKyJz+HpsQRbdz/PCg92xPfVBhSEd2PRmsK00hnwLJFAbDKmkF3u982imEosG4cQ1R9ISnyPH9MCBlhMM5AaMYZEb5WHiktvtirikjXHm5h4KeNfed4MNqLh2/vrNObdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575895993; 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=vqgrircx7PlZkHyc6TyiqldClN75b+8WSJ3s/0RncA4=; b=H96K6/zHbogapLHlOjcRv39cSn3BXUk+oA62CVA5V6qPDgeaG9otKZsT9TbAyGWtKafBHfct5xrkx3QP2FM2F6jJlYUnGiRNPQhX5H446l389i7rzbSEAbob1DGg4EyL0XUoQ9qE8QBX8qc0lji0cxcBVwjcm6f2IkLJ/8hgFdA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157589599388397.83939751392313; Mon, 9 Dec 2019 04:53:13 -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-120-_wlVfAk0MY-A5tMdoqbcig-1; Mon, 09 Dec 2019 07:53:10 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86C23801E53; Mon, 9 Dec 2019 12:53:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 383F960BE1; Mon, 9 Dec 2019 12:53:05 +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 D33A783551; Mon, 9 Dec 2019 12:53:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9Cr39V023049 for ; Mon, 9 Dec 2019 07:53:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 395666E3EE; Mon, 9 Dec 2019 12:53:03 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 110B046; Mon, 9 Dec 2019 12:53:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575895992; 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=vqgrircx7PlZkHyc6TyiqldClN75b+8WSJ3s/0RncA4=; b=bGQAg8cTTS9/uZiSZbdoXCP+7EqRTF3WB4ZJys0uTZYNG9EjUDKRfd0+DXXbXoPEg6F+H9 pgaq70vBeLnNdYCec13pB53Y4sZEtU9/lmjCE0Jbxh07w8gAMSHKlXjE52Ihm2fPbe38WL QKN2hIT6Ou2H3OIbYE6xl2FLTIfPfe8= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Mon, 9 Dec 2019 13:52:45 +0100 Message-Id: <20191209125248.5849-2-thuth@redhat.com> In-Reply-To: <20191209125248.5849-1-thuth@redhat.com> References: <20191209125248.5849-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Gerd Hoffmann , Marcel Apfelbaum Subject: [libvirt] [PATCH v2 1/4] hw/i386: Remove the deprecated machines 0.12 up to 0.15 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.79 on 10.5.11.12 X-MC-Unique: _wlVfAk0MY-A5tMdoqbcig-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) These machines can't be used reliably for migration anymore, quoting https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html : " due to the introduction of the memory API, the firmware is not migrated correctly from source to destination. On QEMU <1.3 the 0xf0000-0xfffff area is basically a copy of the higher 0xffff0000-0xffffffff area, while on more recent versions it is initialized with zeroes and the firmware copies from 0xffff0000 to 0xf0000. When you migrate from old to new QEMU, after reboot there's nothing at 0xf0000 and bugs ensue. " The pc-0.x machines have been marked as deprecated since QEMU v4.0, so it is time to remove them now. And while we're at it, mark the remaining pc-1.x machine types as deprecated now, too, so that we finally only have "pc-i440fx" and "pc-q35" machine types left (apart from the non-versioned "isapc" and "microvm") once we remove them in a couple of releases. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/i386/pc_piix.c | 85 +------------------------------------------ qemu-deprecated.texi | 2 +- tests/cpu-plug-test.c | 6 +-- 3 files changed, 4 insertions(+), 89 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1bd70d1abb..c0292f1793 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -357,19 +357,13 @@ static void pc_compat_1_3(MachineState *machine) pc_compat_1_4_fn(machine); } =20 -/* PC compat function for pc-0.14 to pc-1.2 */ +/* 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); } =20 -/* PC compat function for pc-0.12 and pc-0.13 */ -static void pc_compat_0_13(MachineState *machine) -{ - pc_compat_1_2(machine); -} - static void pc_init_isa(MachineState *machine) { pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); @@ -732,6 +726,7 @@ static void pc_i440fx_1_3_machine_options(MachineClass = *m) =20 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)); } @@ -800,82 +795,6 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, pc_i440fx_1_0_machine_options); =20 =20 -static void pc_i440fx_0_15_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("0.15") - }; - - pc_i440fx_1_0_machine_options(m); - m->hw_version =3D "0.15"; - m->deprecation_reason =3D "use a newer machine type instead"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2, - pc_i440fx_0_15_machine_options); - - -static void pc_i440fx_0_14_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("0.14") - { "virtio-blk-pci", "event_idx", "off" }, - { "virtio-serial-pci", "event_idx", "off" }, - { "virtio-net-pci", "event_idx", "off" }, - { "virtio-balloon-pci", "event_idx", "off" }, - { "qxl", "revision", "2" }, - { "qxl-vga", "revision", "2" }, - }; - - pc_i440fx_0_15_machine_options(m); - m->hw_version =3D "0.14"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2, - pc_i440fx_0_14_machine_options); - -static void pc_i440fx_0_13_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("0.13") - { TYPE_PCI_DEVICE, "command_serr_enable", "off" }, - { "AC97", "use_broken_id", "1" }, - { "virtio-9p-pci", "vectors", "0" }, - { "VGA", "rombar", "0" }, - { "vmware-svga", "rombar", "0" }, - }; - - pc_i440fx_0_14_machine_options(m); - m->hw_version =3D "0.13"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); - pcmc->kvmclock_enabled =3D false; -} - -DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13, - pc_i440fx_0_13_machine_options); - -static void pc_i440fx_0_12_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] =3D { - PC_CPU_MODEL_IDS("0.12") - { "virtio-serial-pci", "max_ports", "1" }, - { "virtio-serial-pci", "vectors", "0" }, - { "usb-mouse", "serial", "1" }, - { "usb-tablet", "serial", "1" }, - { "usb-kbd", "serial", "1" }, - }; - - pc_i440fx_0_13_machine_options(m); - m->hw_version =3D "0.12"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13, - pc_i440fx_0_12_machine_options); - typedef struct { uint16_t gpu_device_id; uint16_t pch_device_id; diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index b177c0fa0e..2f9efb45ba 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -256,7 +256,7 @@ The 'scsi-disk' device is deprecated. Users should use = 'scsi-hd' or =20 @section System emulator machines =20 -@subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.0) +@subsection pc-1.0, pc-1.1, pc-1.2 and pc-1.3 (since 5.0) =20 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. diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 30e514bbfb..e8ffbbce4b 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -148,11 +148,7 @@ static void add_pc_test_case(const char *mname) (strcmp(mname, "pc-1.3") =3D=3D 0) || (strcmp(mname, "pc-1.2") =3D=3D 0) || (strcmp(mname, "pc-1.1") =3D=3D 0) || - (strcmp(mname, "pc-1.0") =3D=3D 0) || - (strcmp(mname, "pc-0.15") =3D=3D 0) || - (strcmp(mname, "pc-0.14") =3D=3D 0) || - (strcmp(mname, "pc-0.13") =3D=3D 0) || - (strcmp(mname, "pc-0.12") =3D=3D 0)) { + (strcmp(mname, "pc-1.0") =3D=3D 0)) { path =3D g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=3D%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 10:47:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1575896002; cv=none; d=zohomail.com; s=zohoarc; b=Wt5ouxC77RkuX+6JZC32E0F3t1BtopcyI3mnF/4XEKo55haxlSJcss1tU3Tc70DGmWx0ueYUau90OqZ+GQr8mwZGwjTREYdQXJ80QpUzOHbKjPKWWQlyJGC8R+ym5VR4kUcFAcccr6TND6FoGnhy7zRFCgGAEdEtUZSjY1dQ5sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575896002; 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=P4DMweKpaEuJLTHp09Hv1B3YpFQgfO9G8MW94DJ2RQw=; b=IJyWRES5l6r/uzOvk7LZfbeEOVf5TsEyI0zwidpVDOfvhggfzoQAqwPndNNc6jm0iRAIoN4BspgORnwz4HYhnyCbgDymri6Ccq55dF480sPL1YEuAZsJXRNSGmp1NpWeIcONqiySaPXOoOKy/Ml0dsWtklJhLQ3oX74CxRuEFL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1575896002034700.147909995121; Mon, 9 Dec 2019 04:53:22 -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-411-5dyrNFedM46XPpEXIAxHtQ-1; Mon, 09 Dec 2019 07:53:19 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 424D3800D5B; Mon, 9 Dec 2019 12:53:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16C8D6E3FB; Mon, 9 Dec 2019 12:53:13 +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 A5C3783557; Mon, 9 Dec 2019 12:53:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9Cr5w1023060 for ; Mon, 9 Dec 2019 07:53:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8FADA46; Mon, 9 Dec 2019 12:53:05 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8114C6E3FB; Mon, 9 Dec 2019 12:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575896000; 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=P4DMweKpaEuJLTHp09Hv1B3YpFQgfO9G8MW94DJ2RQw=; b=c1nGJtl4o4YABFNJQyHeY0LxO/7YZYgwRc6pRT4+1Nd5UMODDCB9OpRsIE17kwXVS4KM+8 ZsWLTgHHhJ+yEYvQoxn6H4FjCdBk91Bu81O9swo1mBxhE/h6OkIfiNr+aeZ1OCPz5j/b0k qLvnDx3v1l5XGHGJ9hfu1AX06SpTksA= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Mon, 9 Dec 2019 13:52:46 +0100 Message-Id: <20191209125248.5849-3-thuth@redhat.com> In-Reply-To: <20191209125248.5849-1-thuth@redhat.com> References: <20191209125248.5849-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Gerd Hoffmann , Marcel Apfelbaum Subject: [libvirt] [PATCH v2 2/4] hw/audio: Remove the "use_broken_id" hack from the AC97 device 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.79 on 10.5.11.13 X-MC-Unique: 5dyrNFedM46XPpEXIAxHtQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Now that the old pc-0.x machine types are gone, we do not need the "use_broken_id" hack anymore. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/audio/ac97.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index a136b97f68..78cda88333 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -161,7 +161,6 @@ typedef struct AC97BusMasterRegs { typedef struct AC97LinkState { PCIDevice dev; QEMUSoundCard card; - uint32_t use_broken_id; uint32_t glob_cnt; uint32_t glob_sta; uint32_t cas; @@ -1373,13 +1372,6 @@ static void ac97_realize(PCIDevice *dev, Error **err= p) c[PCI_BASE_ADDRESS_0 + 6] =3D 0x00; c[PCI_BASE_ADDRESS_0 + 7] =3D 0x00; =20 - if (s->use_broken_id) { - c[PCI_SUBSYSTEM_VENDOR_ID] =3D 0x86; - c[PCI_SUBSYSTEM_VENDOR_ID + 1] =3D 0x80; - c[PCI_SUBSYSTEM_ID] =3D 0x00; - c[PCI_SUBSYSTEM_ID + 1] =3D 0x00; - } - c[PCI_INTERRUPT_LINE] =3D 0x00; /* intr_ln interrupt line rw */ c[PCI_INTERRUPT_PIN] =3D 0x01; /* intr_pn interrupt pin ro */ =20 @@ -1411,7 +1403,6 @@ static int ac97_init (PCIBus *bus) =20 static Property ac97_properties[] =3D { DEFINE_AUDIO_PROPERTIES(AC97LinkState, card), - DEFINE_PROP_UINT32 ("use_broken_id", AC97LinkState, use_broken_id, 0), DEFINE_PROP_END_OF_LIST (), }; =20 --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 10:47:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1575896002; cv=none; d=zohomail.com; s=zohoarc; b=XRgbQsmCG+2z+Pi+yf2yitNgQRag5ebzPxvO/liLUw/binROOFaXrqGXFvI7xvC7qGYov/x2p03vs+Cj5r7IKlTcDzM0YxkSC3ctYpgUG9M+DQidsVHPTYgw/u8Bp7OlY+hMg4cQxpNwMymREJ3mwlO7SUZ4AkGSbF41dth/b28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575896002; 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=qULyVvFkEgZpp4+7j57G+Ocees1D8d0XRMJ5b+vFyYI=; b=bPWHbGzhS0+0HXHseLu2bjELRAYKr2JhYZhdkF09/d+wNTxI/Zz8fvx2szaS+M6/uRwPy4FwGQv5yf7eDAAhpQryF9yFqXSshe9V8aXfIz/FL8TZrfG7SfR4vGNF2wdVhd4Z/xiziug1aEiWHpCX2zN3hwTuNz+zKMAU2+qc01g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575896002175843.1751331074393; Mon, 9 Dec 2019 04:53:22 -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-177-w8qg9WkkPlSUfnc_JTOXxQ-1; Mon, 09 Dec 2019 07:53:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1083A8017DF; Mon, 9 Dec 2019 12:53:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE6E45C240; Mon, 9 Dec 2019 12:53:11 +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 854A483555; Mon, 9 Dec 2019 12:53:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9Cr8d8023071 for ; Mon, 9 Dec 2019 07:53:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0BFBC6BF9B; Mon, 9 Dec 2019 12:53:08 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CC9E46; Mon, 9 Dec 2019 12:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575896001; 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=qULyVvFkEgZpp4+7j57G+Ocees1D8d0XRMJ5b+vFyYI=; b=XvSNEPTnpxWBbTJ2AQNTiBsruyfqw3ZagX/kjAy9F9f3LgjMlaTIEBYBX1yF96J+sHHIJN izLqQ8kt369Ap5RgUqzA7vtFw/FFecRb07KtvWhppZAJZHVsN93nGvACb9Jh923FKH9QGY 8uZwDpM4JdKCtfSjfdWMBkHKyj+jueY= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Mon, 9 Dec 2019 13:52:47 +0100 Message-Id: <20191209125248.5849-4-thuth@redhat.com> In-Reply-To: <20191209125248.5849-1-thuth@redhat.com> References: <20191209125248.5849-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Gerd Hoffmann , Marcel Apfelbaum Subject: [libvirt] [PATCH v2 3/4] hw/pci: Remove the "command_serr_enable" property 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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: w8qg9WkkPlSUfnc_JTOXxQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that the old pc-0.x machine types have been removed, this config knob is not required anymore. Signed-off-by: Thomas Huth --- hw/pci/pci.c | 6 +----- include/hw/pci/pci.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index cbc7a32568..e3d310365d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -69,8 +69,6 @@ static Property pci_props[] =3D { DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1), DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present, QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), - DEFINE_PROP_BIT("command_serr_enable", PCIDevice, cap_present, - QEMU_PCI_CAP_SERR_BITNR, true), DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present, QEMU_PCIE_LNKSTA_DLLLA_BITNR, true), DEFINE_PROP_BIT("x-pcie-extcap-init", PCIDevice, cap_present, @@ -751,9 +749,7 @@ static void pci_init_wmask(PCIDevice *dev) pci_set_word(dev->wmask + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INTX_DISABLE); - if (dev->cap_present & QEMU_PCI_CAP_SERR) { - pci_word_test_and_set_mask(dev->wmask + PCI_COMMAND, PCI_COMMAND_S= ERR); - } + pci_word_test_and_set_mask(dev->wmask + PCI_COMMAND, PCI_COMMAND_SERR); =20 memset(dev->wmask + PCI_CONFIG_HEADER_SIZE, 0xff, config_size - PCI_CONFIG_HEADER_SIZE); diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index db75c6dfd0..2acd8321af 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -174,7 +174,7 @@ enum { #define QEMU_PCI_CAP_MULTIFUNCTION_BITNR 3 QEMU_PCI_CAP_MULTIFUNCTION =3D (1 << QEMU_PCI_CAP_MULTIFUNCTION_BITNR), =20 - /* command register SERR bit enabled */ + /* command register SERR bit enabled - unused since QEMU v5.0 */ #define QEMU_PCI_CAP_SERR_BITNR 4 QEMU_PCI_CAP_SERR =3D (1 << QEMU_PCI_CAP_SERR_BITNR), /* Standard hot plug controller. */ --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 10:47:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1575896000; cv=none; d=zohomail.com; s=zohoarc; b=ZkTdx82991xyOIp8d5rivQRdt+9oIpu5E3EQ0ydnvvZJCOHc5frmccdo3GUTpghmlPJYbfS7ReUUQVtyQ3gG0KkzZCTOIsCxVfMfLXXZPAhDtzktnTxPqv2dtuuOjkVo4gJWkPUYJngGdubQU1xFLNcaODikQnF9Tegg0oHGLY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575896000; 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=H5pvhLFMACTPOTaGios/KIjgNkI2moWfcZsquunJqAg=; b=URP+b+Kmx2zkB3sUGgpZOPho1qKhnCIhC4KTcERH3YP9ahcXonmLMAIce8m0fMA8I/m5NULCuUhmjgNfSprc4OBHyjc6OZYI/1lyYxHCZ2ncoHBL4yYHzLnOArmQ353m7jANslZ6w8WP3aLNc9oD7zMv4BzvAnfuyTHhkv5SrKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1575896000435125.362431656019; Mon, 9 Dec 2019 04:53:20 -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-262-uX0p7BHkMeqB4wH2QRoHcg-1; Mon, 09 Dec 2019 07:53:17 -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 5978D1005512; Mon, 9 Dec 2019 12:53:12 +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 2A8B48185; Mon, 9 Dec 2019 12:53:12 +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 DF86118089CE; Mon, 9 Dec 2019 12:53:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9CrAg4023081 for ; Mon, 9 Dec 2019 07:53:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 94DA36BF9B; Mon, 9 Dec 2019 12:53:10 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FC496E3FD; Mon, 9 Dec 2019 12:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575895999; 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=H5pvhLFMACTPOTaGios/KIjgNkI2moWfcZsquunJqAg=; b=I/Nc3Go28dBfkiUEqRypasnwcEdB2AcCteeiftbSGQSwCtgarNTDYQsgukWihLAgs0G+jX Mn8IENG2KvQoOn1jZRVNInKcpAgNmOBeGXscl5LpKHaCxZY2pFJ2a1aPc4M1Vw3r15Ninn BzXMx5m3kTcO67hd69tlpZyfXdPhK/g= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Mon, 9 Dec 2019 13:52:48 +0100 Message-Id: <20191209125248.5849-5-thuth@redhat.com> In-Reply-To: <20191209125248.5849-1-thuth@redhat.com> References: <20191209125248.5849-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Gerd Hoffmann , Marcel Apfelbaum Subject: [libvirt] [PATCH v2 4/4] hw/display: Remove "rombar" hack from vga-pci and vmware_vga 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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: uX0p7BHkMeqB4wH2QRoHcg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that the old pc-0.x machine types have been removed, we do not need the old "rombar" hacks anymore. Signed-off-by: Thomas Huth Suggested-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga-pci.c | 5 ----- hw/display/vga.c | 4 +--- hw/display/vmware_vga.c | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index a27b88122d..cfe095713e 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -264,11 +264,6 @@ static void pci_std_vga_realize(PCIDevice *dev, Error = **errp) =20 pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mm= io); } - - if (!dev->rom_bar) { - /* compatibility with pc-0.13 and older */ - vga_init_vbe(s, OBJECT(dev), pci_address_space(dev)); - } } =20 static void pci_std_vga_init(Object *obj) diff --git a/hw/display/vga.c b/hw/display/vga.c index 82ebe53610..636586a476 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2304,9 +2304,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryR= egion *address_space, =20 void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *system_mem= ory) { - /* With pc-0.12 and below we map both the PCI BAR and the fixed VBE re= gion, - * so use an alias to avoid double-mapping the same region. - */ + /* Use an alias to avoid double-mapping the same region */ memory_region_init_alias(&s->vram_vbe, obj, "vram.vbe", &s->vram, 0, memory_region_size(&s->vram)); /* XXX: use optimized standard vga accesses */ diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 23dc8910cc..ead754eccf 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1312,11 +1312,6 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error= **errp) &s->chip.vga.vram); pci_register_bar(dev, 2, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->chip.fifo_ram); - - if (!dev->rom_bar) { - /* compatibility with pc-0.13 and older */ - vga_init_vbe(&s->chip.vga, OBJECT(dev), pci_address_space(dev)); - } } =20 static Property vga_vmware_properties[] =3D { --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list