From nobody Sat Apr 27 15:27:07 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=1575562085; cv=none; d=zohomail.com; s=zohoarc; b=c1rPKdun3KXoKzxSmxA+SpHgltdox6b7z093epqJ3YmVXUx9or0gkTBbPNlvD4RZkUp3ORsxnNKg0gaKCTw+1RSCEXIKsTbw/9B0/dY99AzDtEpdpIj+oooVKtt+kja8CpFgo5NL2VJkVIlytjkHDqcy1vN0ZcAV49WnjHu9EyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575562085; 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=QX69GwvyFcPQ3npO2gHtzdJ6tP8LpN8zJMTSaLKB3T8=; b=cVEyvBNNvY0/Ux3EDMVzGBe3ADeLeyVFqLb1k/GaCccl0Szm8JJEEwBLi5sSS67R2eOMqe2qQ6QcjiMOLSbrrNlhGW1HUXI+5aWq688M2LM7ivXUElQi/9qRUGEyQTfAMuJ9v3TliAfBFUFGctAx3OhKZw8vjQWAOZ89S2xBu8k= 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 1575562085095615.2063380585074; Thu, 5 Dec 2019 08:08: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-133-q2E38Zi2NTe_zHESbkFtPw-1; Thu, 05 Dec 2019 11:07:31 -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 7A42A107B299; Thu, 5 Dec 2019 16:07:25 +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 4E9B019C7F; Thu, 5 Dec 2019 16:07:25 +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 0636C65D21; Thu, 5 Dec 2019 16:07:25 +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 xB5G794s023783 for ; Thu, 5 Dec 2019 11:07:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2EB2D6B8D6; Thu, 5 Dec 2019 16:07:09 +0000 (UTC) Received: from thuth.com (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 418306B8D5; Thu, 5 Dec 2019 16:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575562082; 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=QX69GwvyFcPQ3npO2gHtzdJ6tP8LpN8zJMTSaLKB3T8=; b=Btdh1RDfA2Acn6CxtoPbgPQgs72AroNvIj5jUOJajTTBiNEHjykbKxBH8MAgTVy9mBi6OT iiJQFA76JgnWM21k2TjfqTk7Pop8ZMNlerhk9JuPZOB3GKJ6ja81/Mhnyya3ylzwAx1W90 rU/xdTvjuDgoIT/4Ru/MHM+T6k67hG8= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Thu, 5 Dec 2019 17:06:50 +0100 Message-Id: <20191205160652.23493-2-thuth@redhat.com> In-Reply-To: <20191205160652.23493-1-thuth@redhat.com> References: <20191205160652.23493-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 1/3] 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: , 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: q2E38Zi2NTe_zHESbkFtPw-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" They can't be used reliable for live-migration anymore (see https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html for details) and have been marked as deprecated since QEMU v4.0, so 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 removed them in a couple of releases. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 82 ------------------------------------------- qemu-deprecated.texi | 2 +- tests/cpu-plug-test.c | 6 +--- 3 files changed, 2 insertions(+), 88 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1bd70d1abb..59ac9d82c9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -364,12 +364,6 @@ static void pc_compat_1_2(MachineState *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); @@ -800,82 +794,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 e407cc085e..2850f9a520 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -261,7 +261,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 Apr 27 15:27:07 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=1575562042; cv=none; d=zohomail.com; s=zohoarc; b=m9ZmN8qVQp2Z21Pb5Z5hfh+gnsrXrPyHkaSO7qXTN3b7G5iqGz9qh6FVDoECAPo5TX8/jScV+PZtaaekzVVuOnlEfBkL/8CW88cH+oEgI7C7RO2KwY5HyQRrQQ0ydELEwPG7i9s6nPf1yIr9AdsU6owmGUUEjhhWgA/8yZGoA2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575562042; 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=2gImdvSvf1hh+1wv6w0s0cC+zULnUfY6hzO8+9xHqEg=; b=KTKHfL6cXe+6nDTpVOk/6NtIvnd70if/ymS620nvo8gExKLjSZl5jQFh8O5Jq09Fzp9Rh5EKRPQ0mxRHW8WnA8y39Y8QYWBoLn3qSacorMeqtxaTBSfD2rC6Tq2i4nIUjV0weCo8UmgPIUXfLxrufEBvgEeZawX5/Hzr4YwZMkY= 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 1575562042959715.4899900708823; Thu, 5 Dec 2019 08:07: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-394-9WEhQjnCPryi4wcu3C0MRQ-1; Thu, 05 Dec 2019 11:07:20 -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 98DB518C35A8; Thu, 5 Dec 2019 16:07:14 +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 14ABD5C1BB; Thu, 5 Dec 2019 16:07:14 +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 944A718089CF; Thu, 5 Dec 2019 16:07:13 +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 xB5G7BZO023791 for ; Thu, 5 Dec 2019 11:07:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7502A6B8D2; Thu, 5 Dec 2019 16:07:11 +0000 (UTC) Received: from thuth.com (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98A7F6B8CD; Thu, 5 Dec 2019 16:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575562041; 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=2gImdvSvf1hh+1wv6w0s0cC+zULnUfY6hzO8+9xHqEg=; b=Ypnw9l46gHJ7F+k4rPdq0TFc703O5HjSSAkEVMiMQ3h/qQw5rA3ikB/UiLE9Cmex3J93HZ bZkNm+S1ifcSX/kbK+gMsDN2mUK3LN1cd6qA/9Q0xUzUZ2pat6AjDTCDwEXGupLqSSH4um QHw9QTh2sCwonu+mZh3TjwpPEmz4DiE= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Thu, 5 Dec 2019 17:06:51 +0100 Message-Id: <20191205160652.23493-3-thuth@redhat.com> In-Reply-To: <20191205160652.23493-1-thuth@redhat.com> References: <20191205160652.23493-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 2/3] 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: , 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: 9WEhQjnCPryi4wcu3C0MRQ-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 are gone, we do not need the "use_broken_id" hack anymore. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 Apr 27 15:27:07 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=1575562053; cv=none; d=zohomail.com; s=zohoarc; b=elrZBjYv11R2hFW3trdyLqyT6SKphxtK+6LgBvLKp4xB9U7HdCf6yy8/5ag+YCMAYLVniFeehwxtk/G9Wo7oyR0CWNGAPsnL0E19au+n9uTj2yz72BtWrjXsLJaFVT2YK3FpTfX82QunL4c772nKb/wnQnwtUo/kY8ETwHlRn4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575562053; 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=iGzXAa7yfSf6M6qQPi1HkoqVS/jikh5uIXRk6wOb7GM=; b=BTavxuI6sWUXYNwtQeplA8BNa2TfCHj5EJsPFUqjB+uRLGIO4AL0CipJRtblY5xm4vYsPCqEPaqIzZemvYGlxZJReuVLmFeM6QRIhCxL6+X616pfmws+thxjMLMs9uZmAmf3ubHtqoWvVZLguPbwl+bX5Pgf/WhWj4ksOVe4h08= 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 1575562053993609.2564950691516; Thu, 5 Dec 2019 08:07:33 -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-133-KeVS4MHINmCOPopDX0AliA-1; Thu, 05 Dec 2019 11:07:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 727B4805AC7; Thu, 5 Dec 2019 16:07:25 +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 407345D6AE; Thu, 5 Dec 2019 16:07:25 +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 F0A1718089CD; Thu, 5 Dec 2019 16:07:24 +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 xB5G7F8Q023808 for ; Thu, 5 Dec 2019 11:07:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id F133F691AA; Thu, 5 Dec 2019 16:07:15 +0000 (UTC) Received: from thuth.com (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7BD6691BF; Thu, 5 Dec 2019 16:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575562052; 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=iGzXAa7yfSf6M6qQPi1HkoqVS/jikh5uIXRk6wOb7GM=; b=Kjl7CDTl/9u7PbIfg+aULBCc2HAQG5pjXoE+X5Oiia4PYPLVKOQMBAM+KhMxLSuoDL9THi +r/JYS7YKGi2V73T4MAOxk46qMVfMfPH3ceCreBsk8bfWvpJ/8ceTowwC7NCFxyMy7jZgr HCJXQo/4mKtyR2itayTlHg56FfM//Q8= From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" Date: Thu, 5 Dec 2019 17:06:52 +0100 Message-Id: <20191205160652.23493-4-thuth@redhat.com> In-Reply-To: <20191205160652.23493-1-thuth@redhat.com> References: <20191205160652.23493-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 3/3] 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.15 X-MC-Unique: KeVS4MHINmCOPopDX0AliA-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 | 3 --- 2 files changed, 1 insertion(+), 8 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..5b6ebd15c6 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -174,9 +174,6 @@ 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 */ -#define QEMU_PCI_CAP_SERR_BITNR 4 - QEMU_PCI_CAP_SERR =3D (1 << QEMU_PCI_CAP_SERR_BITNR), /* Standard hot plug controller. */ #define QEMU_PCI_SHPC_BITNR 5 QEMU_PCI_CAP_SHPC =3D (1 << QEMU_PCI_SHPC_BITNR), --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list