From nobody Fri May 3 00:43:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1612372772; cv=none; d=zohomail.com; s=zohoarc; b=kslZvesA/htP/QNfJz60FNXg5ivliWaKIQYXTXzqxTLr/HlVlfjODCbHVZX2IHi5v56Mc8cxImHHkZcoAefIYjoECgxl5srfFYnKINegOXNsHWyPxsdj42BKpSlYODdxuWgd3t0khNzhswsXO0tsx54ZKVqo+udITLA7R/O8GM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612372772; 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=mS2iiYfkU+El1jnMxzqbCAxDgXZTs0yt94ufHYCtePc=; b=Aofd+XfJzqHcE3Ffv2Ke7UbKbQF2S/PXjchsGxR2NLWORCTJp/I03zknlpw4lv2VsTPUrRVv8sbzRXqflHcPCD813+lgBatKIP2FyUm842epbRfaICroOsk90lYwDIJmVTXKYdM1cflq3s8UrgOTb/YF/E31N9ygjg6Z+vyV5a8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612372772036983.6038686602338; Wed, 3 Feb 2021 09:19:32 -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-396-wYjltAHOPO6Xc8poRXbOgw-1; Wed, 03 Feb 2021 12:19:28 -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 6EC12100F340; Wed, 3 Feb 2021 17:19:23 +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 4E9126091B; Wed, 3 Feb 2021 17:19:23 +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 D504857DFA; Wed, 3 Feb 2021 17:19:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113HJLPG020617 for ; Wed, 3 Feb 2021 12:19:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id E548C58899; Wed, 3 Feb 2021 17:19:21 +0000 (UTC) Received: from thuth.com (ovpn-112-165.ams2.redhat.com [10.36.112.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id E91AE5C238; Wed, 3 Feb 2021 17:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612372771; 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=mS2iiYfkU+El1jnMxzqbCAxDgXZTs0yt94ufHYCtePc=; b=iuaRLWzJEmI45Tzj+A8xCNzv8aKiQPeNbsRGRQ1CQ2MdwPEd7u5TxnSaKqzDNJvXQyUYkd v454pZjb1URLttlQ4Oubjk2kP3pbaKEE2uPGU3JdYSz599XaTNcPOeoIPUkuvWCzbRNBcE l1ak134cBCCZqkl6LtM6l6jLCgRZHCg= X-MC-Unique: wYjltAHOPO6Xc8poRXbOgw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/4] hw/i386: Remove the deprecated pc-1.x machine types Date: Wed, 3 Feb 2021 18:18:29 +0100 Message-Id: <20210203171832.483176-2-thuth@redhat.com> In-Reply-To: <20210203171832.483176-1-thuth@redhat.com> References: <20210203171832.483176-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , qemu-block@nongnu.org, David Hildenbrand , libvir-list@redhat.com, "Michael S. Tsirkin" , Gerd Hoffmann , John Snow 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 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" They have been deprecated since QEMU v5.0, time to remove them now. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/system/deprecated.rst | 6 -- docs/system/removed-features.rst | 6 ++ hw/i386/pc_piix.c | 94 -------------------------------- 3 files changed, 6 insertions(+), 100 deletions(-) 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 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; --=20 2.27.0 From nobody Fri May 3 00:43:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1612372776; cv=none; d=zohomail.com; s=zohoarc; b=Yv7vu43/YMEXSUzJhPtmTNQOULVZLVSGpVgxMB232txKMBORYx+0Ui/hnGNvdBogQ2ARdr8s3Wab7+pDsozVxhcfaZKDZTyjRqhXMwXh163htckCqqO0p7RJC4SQBOn09SfLl4fYqQa5K1AQHEJ2T/Wd0YQaYyMo3grftm6jwpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612372776; 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=kYklCZBhA7V8LFsFYA0gNo4ysA72N5WDoOxZLU9rWOs=; b=ZUvpws+Ua+QYl0AMOiPgXgAV8S69w2+tGULwg56othgJ7+YBdIWDXUBeSlhGhuEBHxRf1xHZ00IOdImQxLbllUikyuvYEY2zhYl8rKjqgu+FTFrJpC6SEC3PCYwtBiYgyOTh4+RZQ24EIYgjBXo0td1kPb2noTBzi1YluH5ErEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612372776053365.3500759475876; Wed, 3 Feb 2021 09:19:36 -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-136-5YGapZvANCClewzQwy8AWQ-1; Wed, 03 Feb 2021 12:19:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A3758030B7; Wed, 3 Feb 2021 17:19:27 +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 384CA5D9F4; Wed, 3 Feb 2021 17:19:27 +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 0331257DFE; Wed, 3 Feb 2021 17:19:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113HJOdh020630 for ; Wed, 3 Feb 2021 12:19:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id A22915C238; Wed, 3 Feb 2021 17:19:24 +0000 (UTC) Received: from thuth.com (ovpn-112-165.ams2.redhat.com [10.36.112.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 514C15886C; Wed, 3 Feb 2021 17:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612372775; 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=kYklCZBhA7V8LFsFYA0gNo4ysA72N5WDoOxZLU9rWOs=; b=WDc9Zaux40vtGpCIDFzKqXNADUbVDJMfx5wKZeeH7zXH/cQnwOyqB4yRB4ENgmz/eGNokV EmIHpRmNDigE7RIxpu6A7QLcE8A2mxxc4N4OcpNBxtqNBmrFRWM2xRKYI2OBo1dv1NpBj+ ROb1V2DGOybgViAYuybnx6Qp0fzo+d8= X-MC-Unique: 5YGapZvANCClewzQwy8AWQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/4] hw/block/fdc: Remove the check_media_rate property Date: Wed, 3 Feb 2021 18:18:30 +0100 Message-Id: <20210203171832.483176-3-thuth@redhat.com> In-Reply-To: <20210203171832.483176-1-thuth@redhat.com> References: <20210203171832.483176-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , qemu-block@nongnu.org, David Hildenbrand , libvir-list@redhat.com, "Michael S. Tsirkin" , Gerd Hoffmann , John Snow 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.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This was only required for the pc-1.0 and earlier machine types. Now that these have been removed, we can also drop the corresponding code from the FDC device. Signed-off-by: Thomas Huth Acked-by: John Snow Reviewed-by: John Snow --- hw/block/fdc.c | 17 ++--------------- tests/qemu-iotests/172.out | 35 ----------------------------------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 292ea87805..198940e737 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -874,7 +874,6 @@ struct FDCtrl { FloppyDriveType type; } qdev_for_drives[MAX_FD]; int reset_sensei; - uint32_t check_media_rate; FloppyDriveType fallback; /* type=3Dauto failure fallback */ /* Timers state */ uint8_t timer0; @@ -1021,18 +1020,10 @@ static const VMStateDescription vmstate_fdrive_medi= a_changed =3D { } }; =20 -static bool fdrive_media_rate_needed(void *opaque) -{ - FDrive *drive =3D opaque; - - return drive->fdctrl->check_media_rate; -} - static const VMStateDescription vmstate_fdrive_media_rate =3D { .name =3D "fdrive/media_rate", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D fdrive_media_rate_needed, .fields =3D (VMStateField[]) { VMSTATE_UINT8(media_rate, FDrive), VMSTATE_END_OF_LIST() @@ -1689,8 +1680,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int= direction) =20 /* Check the data rate. If the programmed data rate does not match * the currently inserted medium, the operation has to fail. */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { FLOPPY_DPRINTF("data rate mismatch (fdc=3D%d, media=3D%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate= ); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2489,8 +2479,7 @@ static void fdctrl_result_timer(void *opaque) cur_drv->sect =3D (cur_drv->sect % cur_drv->last_sect) + 1; } /* READ_ID can't automatically succeed! */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { FLOPPY_DPRINTF("read id rate mismatch (fdc=3D%d, media=3D%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate= ); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2895,8 +2884,6 @@ static Property isa_fdc_properties[] =3D { DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.qdev_for_drives[0].blk= ), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.qdev_for_drives[1].blk= ), - DEFINE_PROP_BIT("check_media_rate", FDCtrlISABus, state.check_media_ra= te, - 0, true), DEFINE_PROP_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 2cd4a8fd83..349ae51d6c 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -14,7 +14,6 @@ Testing: dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -44,7 +43,6 @@ Testing: -fda TEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -84,7 +82,6 @@ Testing: -fdb TEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -139,7 +136,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -195,7 +191,6 @@ Testing: -fdb dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -236,7 +231,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -276,7 +270,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -331,7 +324,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -392,7 +384,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -434,7 +425,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -478,7 +468,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -537,7 +526,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -577,7 +565,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -617,7 +604,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -678,7 +664,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -736,7 +721,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -808,7 +792,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -864,7 +847,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -920,7 +902,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -976,7 +957,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1041,7 +1021,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dnone,file=3DTEST_DIR/t.q dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1097,7 +1076,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dnone,file=3DTEST_DIR/t.q dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1161,7 +1139,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1219,7 +1196,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1277,7 +1253,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1335,7 +1310,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1391,7 +1365,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -gl= obal floppy.drive=3Dnone0 -device dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1473,7 +1446,6 @@ Testing: -device floppy dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1500,7 +1472,6 @@ Testing: -device floppy,drive-type=3D120 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1527,7 +1498,6 @@ Testing: -device floppy,drive-type=3D144 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1554,7 +1524,6 @@ Testing: -device floppy,drive-type=3D288 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1584,7 +1553,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1624,7 +1592,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1667,7 +1634,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1707,7 +1673,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" --=20 2.27.0 From nobody Fri May 3 00:43:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1612372797; cv=none; d=zohomail.com; s=zohoarc; b=k8DndgI32os0xkiXXjMhXYRiWvXwk9/W/E3D3uWWdUBDVnPBS47h51+8cu2ipBqMVRDVXNP6r+zkt1llqtdY9L4jcjCdbYx5rri0wAimtSASkdFORkxS3LQh8tPszfl3bgfKPh61ibaD9kik2m7aqT37diZM0QUnjdpFiK77iZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612372797; 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=7nr90Yzwoq06/56xL6reoAmyLnIJp44T6sVIESCbk0s=; b=R1zUKjc3TKguYLoezrU8et8+lbQXWI1g8CIj4E4XK4UhXGGRjg5yo+tbMhBht5zW+p9t8jksC6uLVBP1bcXZ+4ZOdxrbzERvPtykICkMT8Bbg7HIHFwTuGtHTD+EKNm4u2GCx/zLMNt6hCeHnL/ReTKaUrqPt1TUSWiXZEexeL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612372797397421.86169108015974; Wed, 3 Feb 2021 09:19:57 -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-219-0APeeaJHMOOhbt084qZTTQ-1; Wed, 03 Feb 2021 12:19:50 -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 6D05A801978; Wed, 3 Feb 2021 17:19:44 +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 2ED001A266; Wed, 3 Feb 2021 17:19:44 +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 DDD3818095CB; Wed, 3 Feb 2021 17:19:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113HJh4H020712 for ; Wed, 3 Feb 2021 12:19:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 215B35886C; Wed, 3 Feb 2021 17:19:43 +0000 (UTC) Received: from thuth.com (ovpn-112-165.ams2.redhat.com [10.36.112.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03F895C238; Wed, 3 Feb 2021 17:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612372794; 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=7nr90Yzwoq06/56xL6reoAmyLnIJp44T6sVIESCbk0s=; b=baXqDfDsg4+6TKEUurz0O0m5ALOQoc/W/lViuWcwR11XNdlk37QFriCxqZuWiPB6dbaQid lkNrhvy90sJ2EL+jN9OSGFmfRQyw3zrI3a7uc2AkQZd1SwihihwpjgcydZRQAYn0VgKjQj nMcZu+4cqUPUlr2v+Tl60mz9CRfjT7k= X-MC-Unique: 0APeeaJHMOOhbt084qZTTQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 3/4] hw/virtio/virtio-balloon: Remove the "class" property Date: Wed, 3 Feb 2021 18:18:31 +0100 Message-Id: <20210203171832.483176-4-thuth@redhat.com> In-Reply-To: <20210203171832.483176-1-thuth@redhat.com> References: <20210203171832.483176-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , qemu-block@nongnu.org, David Hildenbrand , libvir-list@redhat.com, "Michael S. Tsirkin" , Gerd Hoffmann , John Snow 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This property was only required for compatibility reasons in the pc-1.0 machine type and earlier. Now that these machine types have been removed, the property is not useful anymore. Signed-off-by: Thomas Huth Acked-by: David Hildenbrand --- hw/virtio/virtio-balloon-pci.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c index a2c5cc7207..79a3ba979a 100644 --- a/hw/virtio/virtio-balloon-pci.c +++ b/hw/virtio/virtio-balloon-pci.c @@ -34,21 +34,13 @@ struct VirtIOBalloonPCI { VirtIOPCIProxy parent_obj; VirtIOBalloon vdev; }; -static Property virtio_balloon_pci_properties[] =3D { - DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0), - DEFINE_PROP_END_OF_LIST(), -}; =20 static void virtio_balloon_pci_realize(VirtIOPCIProxy *vpci_dev, Error **e= rrp) { VirtIOBalloonPCI *dev =3D VIRTIO_BALLOON_PCI(vpci_dev); DeviceState *vdev =3D DEVICE(&dev->vdev); =20 - if (vpci_dev->class_code !=3D PCI_CLASS_OTHERS && - vpci_dev->class_code !=3D PCI_CLASS_MEMORY_RAM) { /* qemu < 1.1 */ - vpci_dev->class_code =3D PCI_CLASS_OTHERS; - } - + vpci_dev->class_code =3D PCI_CLASS_OTHERS; qdev_realize(vdev, BUS(&vpci_dev->bus), errp); } =20 @@ -59,7 +51,6 @@ static void virtio_balloon_pci_class_init(ObjectClass *kl= ass, void *data) PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass); k->realize =3D virtio_balloon_pci_realize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); - device_class_set_props(dc, virtio_balloon_pci_properties); pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_BALLOON; pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION; --=20 2.27.0 From nobody Fri May 3 00:43:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1612372798; cv=none; d=zohomail.com; s=zohoarc; b=gHVvglqW3U3AWI8LhzbM+0E9wTbJMyvv65KuEVMxIgZufSigoJoPBEWVxg57NHVIUTrrlRfy5OAaE1ehA4vJiZjSI1s8pdkrXW+zmuXcibTIKhsAbloZ3sYzy+OSEZOBnubfgRagm+dWQVmdvGlbVd8X46tM0kqaV4L1elPauoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612372798; 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=mJY/cGKSL/CUJEXgY5804aFPSKvib7o1+hs7CdYXhEU=; b=HL2oO8MfABrheAq9r3NVkdyyZk5FMJnbFOkvQegUL+OVQofXl91mf1ZgHBC2wIWpyxQdeOvLLSeAdMqzXk/NpovGmjRmhIyWqzUpNzDT3d24rJBR0/m+NZYDCkcVI1euutuuYIfM5eIoPLF5+eD4WL/BBCe377O+8hNOenLucpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612372798628446.06457867105405; Wed, 3 Feb 2021 09:19:58 -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-137-d0fzZ84wOSCBbAwwCuLPqA-1; Wed, 03 Feb 2021 12:19:53 -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 6DD64CE646; Wed, 3 Feb 2021 17:19:47 +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 4CC1260C5F; Wed, 3 Feb 2021 17:19:47 +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 1521A18095CE; Wed, 3 Feb 2021 17:19:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113HJjPY020744 for ; Wed, 3 Feb 2021 12:19:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id EA23458899; Wed, 3 Feb 2021 17:19:45 +0000 (UTC) Received: from thuth.com (ovpn-112-165.ams2.redhat.com [10.36.112.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B3DB61D33; Wed, 3 Feb 2021 17:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612372797; 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=mJY/cGKSL/CUJEXgY5804aFPSKvib7o1+hs7CdYXhEU=; b=ZtaECmhV8f8HuUPnbhDA143KNxY8aB1V7Gylu8jwF6eNbnMnGyVq0XhqrszEbmARmWaJwH l/AHLN1OhhtAWg5oCu8nCWlF4E40y3yW8WCDf9ixoiNaYNF6G2fCmerO4auerUAVOOcmEb NxC+A8mNigaPTt1Lem7V5P5snMjxmQw= X-MC-Unique: d0fzZ84wOSCBbAwwCuLPqA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 4/4] hw/usb/bus: Remove the "full-path" property Date: Wed, 3 Feb 2021 18:18:32 +0100 Message-Id: <20210203171832.483176-5-thuth@redhat.com> In-Reply-To: <20210203171832.483176-1-thuth@redhat.com> References: <20210203171832.483176-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , qemu-block@nongnu.org, David Hildenbrand , libvir-list@redhat.com, "Michael S. Tsirkin" , Gerd Hoffmann , John Snow 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 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This property was only required for the pc-1.0 and earlier machine types. Since these have been removed now, we can delete the property as well. Signed-off-by: Thomas Huth --- hw/usb/bus.c | 7 +------ include/hw/usb.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 064f94e9c3..df7411fea8 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -19,8 +19,6 @@ static void usb_qdev_unrealize(DeviceState *qdev); static Property usb_props[] =3D { DEFINE_PROP_STRING("port", USBDevice, port_path), DEFINE_PROP_STRING("serial", USBDevice, serial), - DEFINE_PROP_BIT("full-path", USBDevice, flags, - USB_DEV_FLAG_FULL_PATH, true), DEFINE_PROP_BIT("msos-desc", USBDevice, flags, USB_DEV_FLAG_MSOS_DESC_ENABLE, true), DEFINE_PROP_STRING("pcap", USBDevice, pcap_filename), @@ -596,11 +594,8 @@ static char *usb_get_dev_path(DeviceState *qdev) { USBDevice *dev =3D USB_DEVICE(qdev); DeviceState *hcd =3D qdev->parent_bus->parent; - char *id =3D NULL; + char *id =3D qdev_get_dev_path(hcd); =20 - if (dev->flags & (1 << USB_DEV_FLAG_FULL_PATH)) { - id =3D qdev_get_dev_path(hcd); - } if (id) { char *ret =3D g_strdup_printf("%s/%s", id, dev->port->path); g_free(id); diff --git a/include/hw/usb.h b/include/hw/usb.h index abfbfc5284..c44b77dae0 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -216,7 +216,7 @@ struct USBEndpoint { }; =20 enum USBDeviceFlags { - USB_DEV_FLAG_FULL_PATH, + USB_DEV_FLAG_FULL_PATH, /* unused since QEMU v6.0 */ USB_DEV_FLAG_IS_HOST, USB_DEV_FLAG_MSOS_DESC_ENABLE, USB_DEV_FLAG_MSOS_DESC_IN_USE, --=20 2.27.0