From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615923976; cv=none; d=zohomail.com; s=zohoarc; b=MvRvX5NhmYn4bHaq4ZduAkKL/aqz4XPbjXUX/mw13PrmdKBlY/i/2zY400fubECmO4lXt3HP9H4KZ66n/gh0Du8qDrOF0F10YP+XhTijpPcu2rLrZ03w2yvhuCcU3rRs/oR2n9SBYAztklpxbsNTzGXzDg4j+ZAgE3CkuMZcM4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615923976; 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=dJYjNgajbdrKPGVso9nBBfcftq7OGhSEEJq33Mank1w=; b=b60/S/QQnl8v0l+1LqI5aVPlnwjnbtNkj5Cr98CD7Fu4ypb78majhsDsLcSXp2/UkLjHxHfoltJgIbqDprG8MUkhvShgOQTLhQMnunopIC3pdP4bE2kP/JkdAQEy4ElUv6M/hC0q4FnvcrgzJ4tWQahlX3/bX7Tt028cs/2I2Ro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615923976243978.168539998564; Tue, 16 Mar 2021 12:46:16 -0700 (PDT) Received: from localhost ([::1]:60344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFdv-0000Fy-3e for importer@patchew.org; Tue, 16 Mar 2021 15:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIT-0000Ff-3c for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMFII-0002Nf-1L for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:04 -0400 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-598-T55jRDyjOAqAbuMssyZKTQ-1; Tue, 16 Mar 2021 15:23:49 -0400 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 DE031760C7; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF05D5D768; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2F44A1132C13; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922633; h=from:from: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; bh=dJYjNgajbdrKPGVso9nBBfcftq7OGhSEEJq33Mank1w=; b=efMNI4j219+j8niJXkp6Evo3IPuWtuqtx6+43VuywFPT2Z8a8W3l9Mfb7VbQBxNV94hTxV n5SgHGnGv/dgdh8lPzXIuulgFfXHCH3V5yno9OBJfP74PSlPEPbii9wbVOry24TNwxCcH8 vvUGUHbcp9hS/4wQUgeOgTwQXUox1CE= X-MC-Unique: T55jRDyjOAqAbuMssyZKTQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 1/6] docs/system/deprecated: Fix note on fdc drive properties Date: Tue, 16 Mar 2021 20:23:42 +0100 Message-Id: <20210316192347.3918857-2-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit 4a27a638e7 "fdc: Deprecate configuring floppies with -global isa-fdc" actually deprecated any use of floppy controller driver properties, not just with -global. Correct the deprecation note accordingly. Fixes: 4a27a638e718b445648de6b27c709353551d9b44 Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Message-id: 20210309161214.1402527-2-armbru@redhat.com Signed-off-by: John Snow --- docs/system/deprecated.rst | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 5e3a31c123..c89d0a207c 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -94,10 +94,11 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -``Configuring floppies with ``-global`` -''''''''''''''''''''''''''''''''''''''' +Floppy controllers' drive properties (since 5.1) +'''''''''''''''''''''''''''''''''''''''''''''''' =20 -Use ``-device floppy,...`` instead: +Use ``-device floppy,...`` instead. When configuring onboard floppy +controllers :: =20 -global isa-fdc.driveA=3D... @@ -120,8 +121,30 @@ become =20 -device floppy,unit=3D1,drive=3D... =20 -``-drive`` with bogus interface type -'''''''''''''''''''''''''''''''''''' +When plugging in a floppy controller +:: + + -device isa-fdc,...,driveA=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D0,drive=3D... + +and +:: + + -device isa-fdc,...,driveB=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D1,drive=3D... + +``-drive`` with bogus interface type (since 5.1) +'''''''''''''''''''''''''''''''''''''''''''''''' =20 Drives with interface types other than ``if=3Dnone`` are for onboard devices. It is possible to use drives the board doesn't pick up with --=20 2.26.2 From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615924452; cv=none; d=zohomail.com; s=zohoarc; b=CVec9O3rMXW8I3CqqZer6/g8xYewHqdjl+PxkKfw74I3tQ8f2WG1fQ4xnY0zVptIZ1aBPas1SuXuSLCCI5kjXASvtw/lOsEAmZNM8D8XK0XbSAZfhf/1qpNVXHlGciz2gs0bAx4tqjqj36zIYs1n30YsiXvWc4/tq65kGQJJebk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615924452; 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=P73mbHZWEKWOJ+udz0i04RWCoN9vx1f1zfg5SMVTcsg=; b=PwsAmg6jJq6TYIUyBJLU9PCX5kY7zdBbmKwZ/lSwHwGb3wrLvHHP2PwW/dEdUSnVNKlQ7KSJxAFH+3U3K90Y5O8KKspgGhNQP58JRGFSx0utF5T19S9XH5BTxmfJ+/qmmzz9Ib07cUzIYxKJ3Bfa4sTwURnsZ3QmejyMXrV7wS4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615924452214870.4319782884754; Tue, 16 Mar 2021 12:54:12 -0700 (PDT) Received: from localhost ([::1]:57426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFla-0002R4-SR for importer@patchew.org; Tue, 16 Mar 2021 15:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIN-0000FS-Jy for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFII-0002Nh-Pt for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:59 -0400 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-223-K-CZwKpXP_eIWD36he6Mng-1; Tue, 16 Mar 2021 15:23:50 -0400 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 759571850604; Tue, 16 Mar 2021 19:23:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF00B60CCC; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3356E1132C14; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922633; h=from:from: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; bh=P73mbHZWEKWOJ+udz0i04RWCoN9vx1f1zfg5SMVTcsg=; b=dyHY0FfQPut2J8TyjDZYJLr6Va7TPzA7bhyPUdZEN6rkCJZ88/ljI7uRvZQGMQGtvcdikL W0GEh5apnyXSDFYAgx+DENBo76CrNArMptUH0J78vYhi4zspEXuOfbMncmh5HoLvmX4BPR bVL9ZXFY5pDmNCTulqFUIon3QoegtIc= X-MC-Unique: K-CZwKpXP_eIWD36he6Mng-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 2/6] fdc: Drop deprecated floppy configuration Date: Tue, 16 Mar 2021 20:23:43 +0100 Message-Id: <20210316192347.3918857-3-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Drop the crap deprecated in commit 4a27a638e7 "fdc: Deprecate configuring floppies with -global isa-fdc" (v5.1.0). Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Message-id: 20210309161214.1402527-3-armbru@redhat.com Signed-off-by: John Snow --- docs/system/deprecated.rst | 49 --- docs/system/removed-features.rst | 49 +++ hw/block/fdc.c | 54 +-- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 5 files changed, 53 insertions(+), 692 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index c89d0a207c..8e78ff3dad 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -94,55 +94,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -Floppy controllers' drive properties (since 5.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -Use ``-device floppy,...`` instead. When configuring onboard floppy -controllers -:: - - -global isa-fdc.driveA=3D... - -global sysbus-fdc.driveA=3D... - -global SUNW,fdtwo.drive=3D... - -become -:: - - -device floppy,unit=3D0,drive=3D... - -and -:: - - -global isa-fdc.driveB=3D... - -global sysbus-fdc.driveB=3D... - -become -:: - - -device floppy,unit=3D1,drive=3D... - -When plugging in a floppy controller -:: - - -device isa-fdc,...,driveA=3D... - -becomes -:: - - -device isa-fdc,... - -device floppy,unit=3D0,drive=3D... - -and -:: - - -device isa-fdc,...,driveB=3D... - -becomes -:: - - -device isa-fdc,... - -device floppy,unit=3D1,drive=3D... - ``-drive`` with bogus interface type (since 5.1) '''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 83148dcfda..1d73567acf 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -38,6 +38,55 @@ or ``-display default,show-cursor=3Don`` instead. QEMU 5.0 introduced an alternative syntax to specify the size of the trans= lation block cache, ``-accel tcg,tb-size=3D``. =20 +Floppy controllers' drive properties (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-device floppy,...`` instead. When configuring onboard floppy +controllers +:: + + -global isa-fdc.driveA=3D... + -global sysbus-fdc.driveA=3D... + -global SUNW,fdtwo.drive=3D... + +become +:: + + -device floppy,unit=3D0,drive=3D... + +and +:: + + -global isa-fdc.driveB=3D... + -global sysbus-fdc.driveB=3D... + +become +:: + + -device floppy,unit=3D1,drive=3D... + +When plugging in a floppy controller +:: + + -device isa-fdc,...,driveA=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D0,drive=3D... + +and +:: + + -device isa-fdc,...,driveB=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D1,drive=3D... + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 198940e737..f978ddf647 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -870,7 +870,6 @@ struct FDCtrl { uint8_t num_floppies; FDrive drives[MAX_FD]; struct { - BlockBackend *blk; FloppyDriveType type; } qdev_for_drives[MAX_FD]; int reset_sensei; @@ -2517,56 +2516,12 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, D= eviceState *fdc_dev, { unsigned int i; FDrive *drive; - DeviceState *dev; - BlockBackend *blk; - bool ok; - const char *fdc_name, *drive_suffix; =20 for (i =3D 0; i < MAX_FD; i++) { drive =3D &fdctrl->drives[i]; drive->fdctrl =3D fdctrl; - - /* If the drive is not present, we skip creating the qdev device, = but - * still have to initialise the controller. */ - blk =3D fdctrl->qdev_for_drives[i].blk; - if (!blk) { - fd_init(drive); - fd_revalidate(drive); - continue; - } - - fdc_name =3D object_get_typename(OBJECT(fdc_dev)); - drive_suffix =3D !strcmp(fdc_name, "SUNW,fdtwo") ? "" : i ? "B" : = "A"; - warn_report("warning: property %s.drive%s is deprecated", - fdc_name, drive_suffix); - error_printf("Use -device floppy,unit=3D%d,drive=3D... instead.\n"= , i); - - dev =3D qdev_new("floppy"); - qdev_prop_set_uint32(dev, "unit", i); - qdev_prop_set_enum(dev, "drive-type", fdctrl->qdev_for_drives[i].t= ype); - - /* - * Hack alert: we move the backend from the floppy controller - * device to the floppy device. We first need to detach the - * controller, or else floppy_create()'s qdev_prop_set_drive() - * will die when it attaches floppy device. We also need to - * take another reference so that blk_detach_dev() doesn't - * free blk while we still need it. - * - * The hack is probably a bad idea. - */ - blk_ref(blk); - blk_detach_dev(blk, fdc_dev); - fdctrl->qdev_for_drives[i].blk =3D NULL; - ok =3D qdev_prop_set_drive_err(dev, "drive", blk, errp); - blk_unref(blk); - if (!ok) { - return; - } - - if (!qdev_realize_and_unref(dev, &fdctrl->bus.bus, errp)) { - return; - } + fd_init(drive); + fd_revalidate(drive); } } =20 @@ -2882,8 +2837,6 @@ static Property isa_fdc_properties[] =3D { DEFINE_PROP_UINT32("iobase", FDCtrlISABus, iobase, 0x3f0), DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), 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_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), @@ -2941,8 +2894,6 @@ static const VMStateDescription vmstate_sysbus_fdc = =3D{ }; =20 static Property sysbus_fdc_properties[] =3D { - DEFINE_PROP_DRIVE("driveA", FDCtrlSysBus, state.qdev_for_drives[0].blk= ), - DEFINE_PROP_DRIVE("driveB", FDCtrlSysBus, state.qdev_for_drives[1].blk= ), DEFINE_PROP_SIGNED("fdtypeA", FDCtrlSysBus, state.qdev_for_drives[0].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), @@ -2971,7 +2922,6 @@ static const TypeInfo sysbus_fdc_info =3D { }; =20 static Property sun4m_fdc_properties[] =3D { - DEFINE_PROP_DRIVE("drive", FDCtrlSysBus, state.qdev_for_drives[0].blk), DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].ty= pe, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 0ac942a6c5..ff269ca7b5 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -123,15 +123,6 @@ check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IM= G" check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG",index=3D1 check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dflopp= y,file=3D"$TEST_IMG.2",index=3D1 =20 -echo -echo -echo =3D=3D=3D Using -drive if=3Dnone and -global =3D=3D=3D - -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veA=3Dnone0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veB=3Dnone0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB= =3Dnone1 - echo echo echo =3D=3D=3D Using -drive if=3Dnone and -device =3D=3D=3D @@ -145,13 +136,6 @@ echo echo echo =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 -# Working -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 - -# Conflicting -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 # Conflicting, -fdX wins check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global floppy.drive=3Dnone0 =20 @@ -186,23 +170,10 @@ echo echo =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 # Working -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 - -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" \ -global floppy.drive=3Dnone0 -device floppy,unit=3D0 =20 # Conflicting -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global floppy.drive=3Dnone0 -device floppy,drive=3Dnon= e1,unit=3D0 =20 @@ -227,7 +198,7 @@ echo =3D=3D=3D Too many floppy drives =3D=3D=3D check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" \ -drive if=3Dnone,file=3D"$TEST_IMG.2" \ -drive if=3Dnone,file=3D"$TEST_IMG.3" \ - -global isa-fdc.driveB=3Dnone0 \ + -device floppy,drive=3Dnone0 \ -device floppy,drive=3Dnone1 =20 echo diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 349ae51d6c..d53f61d0de 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -12,8 +12,6 @@ Testing: iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -41,8 +39,6 @@ Testing: -fda TEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -80,8 +76,6 @@ Testing: -fdb TEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -134,8 +128,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -189,8 +181,6 @@ Testing: -fdb iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -229,8 +219,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -268,8 +256,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -322,8 +308,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -372,150 +356,6 @@ sd0: [not inserted] =20 =20 =20 -=3D=3D=3D Using -drive if=3Dnone and -global =3D=3D=3D - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global isa-fdc.driveA= =3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global isa-fdc.driveB= =3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB=3D= none1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - - =3D=3D=3D Using -drive if=3Dnone and -device =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0 @@ -524,8 +364,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -563,8 +401,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -602,8 +438,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -654,130 +488,6 @@ sd0: [not inserted] =20 =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "floppy0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "floppy1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: Floppy unit 0 is in use - -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. -QEMU_PROG: Floppy unit 1 is in use - Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global floppy.drive=3Dnone0 QEMU_PROG: -global floppy.drive=3D... conflicts with drive=3Dfloppy0 =20 @@ -790,8 +500,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -845,8 +553,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -900,8 +606,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -955,8 +659,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1019,8 +721,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1074,8 +774,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1129,242 +827,12 @@ QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: F= loppy unit 0 is in use =20 =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -sd0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit - - Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global floppy.drive=3Dn= one0 -device floppy,unit=3D0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1396,16 +864,6 @@ sd0: [not inserted] (qemu) quit =20 =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: Floppy unit 0 is in use - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. -QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D1: Floppy unit 1 is in use - Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global floppy.drive=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: -global floppy.drive=3D.= .. conflicts with drive=3Dnone1 =20 @@ -1430,9 +888,7 @@ QEMU_PROG: -device floppy,drive=3Dfloppy0: Property 'f= loppy.drive' can't find valu =20 =3D=3D=3D Too many floppy drives =3D=3D=3D =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.3 -global is= a-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.3 -device fl= oppy,drive=3Dnone0 -device floppy,drive=3Dnone1 QEMU_PROG: -device floppy,drive=3Dnone1: Can't create floppy unit 2, bus s= upports only 2 units =20 =20 @@ -1444,8 +900,6 @@ Testing: -device floppy iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1470,8 +924,6 @@ Testing: -device floppy,drive-type=3D120 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1496,8 +948,6 @@ Testing: -device floppy,drive-type=3D144 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1522,8 +972,6 @@ Testing: -device floppy,drive-type=3D288 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1551,8 +999,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dev= ice floppy,drive=3Dnone0,drive-t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1590,8 +1036,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1632,8 +1076,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1671,8 +1113,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" --=20 2.26.2 From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615923833; cv=none; d=zohomail.com; s=zohoarc; b=LjJxQsGUFO4E+nRBTYQi9mMZkFTHrNIZ7oEp4d65bQCJZ9jSN1/O7L/2W2ynxi/JsZ9i5l+YeBgLgMEh83Pjpul1XTrkMyjpPmwKEqsOcHjRG5uI3xDHm09nQJmFawXbZANd2WQM1TJSykjOWAMi4posc/u3moTm8a6F9yleZpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615923833; 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=fdSer4G8YKk2oNImVWO7Db5YrIwrVO3xMGHC6suIL7w=; b=LndxChzIkSwzwc+4F+wePgzNoqCFtIIfAa/TKmcWV1mjqKPAfflX9ipdJC68Eo8qJTyd3NWJGJ6N0r4fRpbvci7vhodaw5VN/OVVVUTq8CgdyIhYlzlS9VTJP6qFfvFyut9nO9vQ0KyX43rb86U+GNQ8MJF3r26y4u1ZdG5jsRQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615923833445383.65078281186095; Tue, 16 Mar 2021 12:43:53 -0700 (PDT) Received: from localhost ([::1]:51642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFbc-0005CD-EG for importer@patchew.org; Tue, 16 Mar 2021 15:43:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIL-0000DM-7P for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIH-0002NX-5b for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:56 -0400 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-197-1kX0FYNDOt22q_iOBefBzA-1; Tue, 16 Mar 2021 15:23:50 -0400 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 EDC65107B005; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF2445C1A1; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 368081131C01; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922632; h=from:from: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; bh=fdSer4G8YKk2oNImVWO7Db5YrIwrVO3xMGHC6suIL7w=; b=Ygl35baJ5rVGzUm26CsPpf7jidxpg9Ysg6LETFcn0/IfoHO1tzhi+o8oplt7eosrw2oA4e 9riByf9hmprZ41oyaFZkYaQLS+rmrBbZMtOWGZl1uEfJcvyZnU2uB+7QEoGfC6ruFUrxAr wAoG1K2FXyxr3+LXZTkj9KTrt1dvJqY= X-MC-Unique: 1kX0FYNDOt22q_iOBefBzA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 3/6] fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() Date: Tue, 16 Mar 2021 20:23:44 +0100 Message-Id: <20210316192347.3918857-4-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The previous commit rendered the name fdctrl_connect_drives() somewhat misleading. Get rid of it by inlining the (now pretty simple) function into its only caller. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Message-id: 20210309161214.1402527-4-armbru@redhat.com Signed-off-by: John Snow --- hw/block/fdc.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f978ddf647..32701c2bc5 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2511,20 +2511,6 @@ void isa_fdc_init_drives(ISADevice *fdc, DriveInfo *= *fds) fdctrl_init_drives(&ISA_FDC(fdc)->state.bus, fds); } =20 -static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev, - Error **errp) -{ - unsigned int i; - FDrive *drive; - - for (i =3D 0; i < MAX_FD; i++) { - drive =3D &fdctrl->drives[i]; - drive->fdctrl =3D fdctrl; - fd_init(drive); - fd_revalidate(drive); - } -} - void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { @@ -2565,6 +2551,7 @@ static void fdctrl_realize_common(DeviceState *dev, F= DCtrl *fdctrl, Error **errp) { int i, j; + FDrive *drive; static int command_tables_inited =3D 0; =20 if (fdctrl->fallback =3D=3D FLOPPY_DRIVE_TYPE_AUTO) { @@ -2604,7 +2591,13 @@ static void fdctrl_realize_common(DeviceState *dev, = FDCtrl *fdctrl, } =20 floppy_bus_create(fdctrl, &fdctrl->bus, dev); - fdctrl_connect_drives(fdctrl, dev, errp); + + for (i =3D 0; i < MAX_FD; i++) { + drive =3D &fdctrl->drives[i]; + drive->fdctrl =3D fdctrl; + fd_init(drive); + fd_revalidate(drive); + } } =20 static const MemoryRegionPortio fdc_portio_list[] =3D { --=20 2.26.2 From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615924760; cv=none; d=zohomail.com; s=zohoarc; b=Yv9rv3xfPtnXotocBWBC/Qzx5zBm3WdbrPYs38WgetghQtW5qlcAHXJpahJfIY47fZqclikf9Kc2akhvRnHder71Xyyh4z5KtEyaT7Npod5EDIgBI3cwM3SywLLYGJcYuOr3DErL0DMmC+6ERicQWwYAAqYQCqK2QKm44MfHq4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615924760; 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=kc4d6r+3sXGGJ/oNxWXpu0foyVkHM068skE2UU78FFg=; b=S9mMRHnHrm3QicJ4424foTnEYttTdwuMNsxOpNBrYpey1Vgszb2fiJLoqHqR7bNTXtkYqv0bdYVLNaedC54V9y5MdEq4w/Q7wHA+L4J7dUxTqZsme0DYK5S8XwjtQkWQPDptYeTQJLwvWd32BA33bl08VP8HKWDiGe7zzJH9SW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615924760228953.8421339897907; Tue, 16 Mar 2021 12:59:20 -0700 (PDT) Received: from localhost ([::1]:46244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFqY-000115-8o for importer@patchew.org; Tue, 16 Mar 2021 15:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIM-0000EY-4U for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMFIH-0002NZ-HS for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:57 -0400 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-600-ao7hsJTJM_mh6biWeqgiXw-1; Tue, 16 Mar 2021 15:23:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2311E88127C; Tue, 16 Mar 2021 19:23:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC2521001281; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 39A741141CBD; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922632; h=from:from: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; bh=kc4d6r+3sXGGJ/oNxWXpu0foyVkHM068skE2UU78FFg=; b=AWBhMMBqxYfQ86AYIrAP75kbWlWgxycukGnQjU6es8zFbZ33pZlDXz1zZZrRCLv0a9LNB6 DeXGb+wszoAZKMmyzWA+LBYitSnU02PCcDz+LYJkxcmhc3Ad3LkfBjNB97I5v7DQXwXzpR vy7VfPpavzhz9wTLEMpkc9Rht+XAaXI= X-MC-Unique: ao7hsJTJM_mh6biWeqgiXw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 4/6] blockdev: Drop deprecated bogus -drive interface type Date: Tue, 16 Mar 2021 20:23:45 +0100 Message-Id: <20210316192347.3918857-5-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Drop the crap deprecated in commit a1b40bda08 "blockdev: Deprecate -drive with bogus interface type" (v5.1.0). Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Message-id: 20210309161214.1402527-5-armbru@redhat.com Signed-off-by: John Snow --- docs/system/deprecated.rst | 7 ------ docs/system/removed-features.rst | 7 ++++++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +++++++++++++------------------- softmmu/vl.c | 8 +------ 5 files changed, 23 insertions(+), 37 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 8e78ff3dad..b817a3b279 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -94,13 +94,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -``-drive`` with bogus interface type (since 5.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -Drives with interface types other than ``if=3Dnone`` are for onboard -devices. It is possible to use drives the board doesn't pick up with --device. This usage is now deprecated. Use ``if=3Dnone`` instead. - Short-form boolean options (since 6.0) '''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 1d73567acf..51efd42846 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -87,6 +87,13 @@ becomes -device isa-fdc,... -device floppy,unit=3D1,drive=3D... =20 +``-drive`` with bogus interface type (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Drives with interface types other than ``if=3Dnone`` are for onboard +devices. Drives the board doesn't pick up can no longer be used with +-device. Use ``if=3Dnone`` instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h index 3b5fcda08d..32c2d6023c 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -35,7 +35,6 @@ struct DriveInfo { bool is_default; /* Added by default_drive() ? */ int media_cd; QemuOpts *opts; - bool claimed_by_board; QTAILQ_ENTRY(DriveInfo) next; }; =20 diff --git a/blockdev.c b/blockdev.c index 5cc7c7effe..cf70bb4e43 100644 --- a/blockdev.c +++ b/blockdev.c @@ -239,19 +239,10 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus= , int unit) return NULL; } =20 -void drive_mark_claimed_by_board(void) -{ - BlockBackend *blk; - DriveInfo *dinfo; - - for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { - dinfo =3D blk_legacy_dinfo(blk); - if (dinfo && blk_get_attached_dev(blk)) { - dinfo->claimed_by_board =3D true; - } - } -} - +/* + * Check board claimed all -drive that are meant to be claimed. + * Fatal error if any remain unclaimed. + */ void drive_check_orphaned(void) { BlockBackend *blk; @@ -261,7 +252,17 @@ void drive_check_orphaned(void) =20 for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { dinfo =3D blk_legacy_dinfo(blk); - if (dinfo->is_default || dinfo->type =3D=3D IF_NONE) { + /* + * Ignore default drives, because we create certain default + * drives unconditionally, then leave them unclaimed. Not the + * users fault. + * Ignore IF_VIRTIO, because it gets desugared into -device, + * so we can leave failing to -device. + * Ignore IF_NONE, because leaving unclaimed IF_NONE remains + * available for device_add is a feature. + */ + if (dinfo->is_default || dinfo->type =3D=3D IF_VIRTIO + || dinfo->type =3D=3D IF_NONE) { continue; } if (!blk_get_attached_dev(blk)) { @@ -272,14 +273,6 @@ void drive_check_orphaned(void) if_name[dinfo->type], dinfo->bus, dinfo->unit); loc_pop(&loc); orphans =3D true; - continue; - } - if (!dinfo->claimed_by_board && dinfo->type !=3D IF_VIRTIO) { - loc_push_none(&loc); - qemu_opts_loc_restore(dinfo->opts); - warn_report("bogus if=3D%s is deprecated, use if=3Dnone", - if_name[dinfo->type]); - loc_pop(&loc); } } =20 diff --git a/softmmu/vl.c b/softmmu/vl.c index b7673b9613..1be618655b 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2460,13 +2460,7 @@ static void qemu_init_board(void) /* From here on we enter MACHINE_PHASE_INITIALIZED. */ machine_run_board_init(current_machine); =20 - /* - * TODO To drop support for deprecated bogus if=3D..., move - * drive_check_orphaned() here, replacing this call. Also drop - * its deprecation warning, along with DriveInfo member - * @claimed_by_board. - */ - drive_mark_claimed_by_board(); + drive_check_orphaned(); =20 realtime_init(); =20 --=20 2.26.2 From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615924956; cv=none; d=zohomail.com; s=zohoarc; b=K0quuS1MCu6VrDpGSDpXUVsNPnF+n7Lnm7RQnry34Cti0ApcYZFHJwSoXAVsXJIKbDfZh1zZJtEXEkT4I1w9e85lE/Zhj0SFeKIn6nqSjsVjpQGuCYtk8FR0xMH9JuW23v9CXX27b8BXioLMtQhoQr5hiTJc5adVVyPTG5iTJwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615924956; 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=SlMTUPrOBJt6W7zT6auXBeMCGFW+KREBVSKiFujd//w=; b=V7xqCCNIpNdqeoq2fi8ejRS767wxIOAgSwNHvZA+CxX+plN0Q5SFhkoI6lzE9FlxIevmueVajq76UJpelGGgPTG2w0dWsHhm6mmU/wze9YSImb1mDrFYoKMFNmTdCC9a1pyOP9RyR/C35KEovB74tgkObP/VqChrkYRJRrAM/tM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615924956055797.489413504015; Tue, 16 Mar 2021 13:02:36 -0700 (PDT) Received: from localhost ([::1]:53566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFti-00047s-SY for importer@patchew.org; Tue, 16 Mar 2021 16:02:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIM-0000F6-Qa for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMFIJ-0002Oz-KJ for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:58 -0400 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-495-sAK9irYCNFGoClzzhNxoTw-1; Tue, 16 Mar 2021 15:23:52 -0400 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 03483107B004; Tue, 16 Mar 2021 19:23:51 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A8D160C0F; Tue, 16 Mar 2021 19:23:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3D187114200B; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922635; h=from:from: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; bh=SlMTUPrOBJt6W7zT6auXBeMCGFW+KREBVSKiFujd//w=; b=FoPkc7m56/TyAli3PWn/hWFg5uRu4YQyllczG3FG5TBa4QSJU9GLMs9LdMWixKjHu4v4SB UXBKSsyyHW/idjZlKBHdxUbOFN3TF5puejht8vIrSOAh1/Joj434pGSEvSya7o1NiAsrqk QUm0RuV5b6HU3TVzgIC2zzgm3qZCNCA= X-MC-Unique: sAK9irYCNFGoClzzhNxoTw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 5/6] hw: Replace anti-social QOM type names Date: Tue, 16 Mar 2021 20:23:46 +0100 Message-Id: <20210316192347.3918857-6-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Mark Cave-Ayland , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Several QOM type names contain ',': ARM,bitband-memory etraxfs,pic etraxfs,serial etraxfs,timer fsl,imx25 fsl,imx31 fsl,imx6 fsl,imx6ul fsl,imx7 grlib,ahbpnp grlib,apbpnp grlib,apbuart grlib,gptimer grlib,irqmp qemu,register SUNW,bpp SUNW,CS4231 SUNW,DBRI SUNW,DBRI.prom SUNW,fdtwo SUNW,sx SUNW,tcx xilinx,zynq_slcr xlnx,zynqmp xlnx,zynqmp-pmu-soc xlnx,zynq-xadc These are all device types. They can't be plugged with -device / device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one actually works. They *can* be used with -device / device_add to request help. Usability is poor, though: you have to double the comma, like this: $ qemu-system-x86_64 -device SUNW,,fdtwo,help Trap for the unwary. The fact that this was broken in device-introspect-test for more than six years until commit e27bd49876 fixed it demonstrates that "the unwary" includes seasoned developers. One QOM type name contains ' ': "ICH9 SMB". Because having to remember just one way to quote would be too easy. Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and ' ' by '-' in the other type names. Signed-off-by: Markus Armbruster Message-Id: <20210304140229.575481-2-armbru@redhat.com> Reviewed-by: Mark Cave-Ayland Acked-by: Paolo Bonzini --- include/hw/arm/armv7m.h | 2 +- include/hw/arm/fsl-imx25.h | 2 +- include/hw/arm/fsl-imx31.h | 2 +- include/hw/arm/fsl-imx6.h | 2 +- include/hw/arm/fsl-imx6ul.h | 2 +- include/hw/arm/fsl-imx7.h | 2 +- include/hw/arm/xlnx-zynqmp.h | 2 +- include/hw/cris/etraxfs.h | 2 +- include/hw/i386/ich9.h | 2 +- include/hw/misc/grlib_ahb_apb_pnp.h | 4 ++-- include/hw/misc/zynq-xadc.h | 2 +- include/hw/register.h | 2 +- include/hw/sparc/grlib.h | 6 +++--- hw/arm/xilinx_zynq.c | 2 +- hw/audio/cs4231.c | 2 +- hw/block/fdc.c | 4 ++-- hw/char/etraxfs_ser.c | 2 +- hw/cris/axis_dev88.c | 6 +++--- hw/display/tcx.c | 2 +- hw/intc/etraxfs_pic.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/sparc/sun4m.c | 12 ++++++------ hw/timer/etraxfs_timer.c | 2 +- softmmu/vl.c | 2 +- tests/vmstate-static-checker-data/dump1.json | 4 ++-- tests/vmstate-static-checker-data/dump2.json | 4 ++-- 27 files changed, 40 insertions(+), 40 deletions(-) diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index 0791dcb68a..189b23a8ce 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -15,7 +15,7 @@ #include "target/arm/idau.h" #include "qom/object.h" =20 -#define TYPE_BITBAND "ARM,bitband-memory" +#define TYPE_BITBAND "ARM-bitband-memory" OBJECT_DECLARE_SIMPLE_TYPE(BitBandState, BITBAND) =20 struct BitBandState { diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h index c1603b2ac2..1b1086e945 100644 --- a/include/hw/arm/fsl-imx25.h +++ b/include/hw/arm/fsl-imx25.h @@ -34,7 +34,7 @@ #include "target/arm/cpu.h" #include "qom/object.h" =20 -#define TYPE_FSL_IMX25 "fsl,imx25" +#define TYPE_FSL_IMX25 "fsl-imx25" OBJECT_DECLARE_SIMPLE_TYPE(FslIMX25State, FSL_IMX25) =20 #define FSL_IMX25_NUM_UARTS 5 diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h index b9792d58ae..c116a73e0b 100644 --- a/include/hw/arm/fsl-imx31.h +++ b/include/hw/arm/fsl-imx31.h @@ -30,7 +30,7 @@ #include "target/arm/cpu.h" #include "qom/object.h" =20 -#define TYPE_FSL_IMX31 "fsl,imx31" +#define TYPE_FSL_IMX31 "fsl-imx31" OBJECT_DECLARE_SIMPLE_TYPE(FslIMX31State, FSL_IMX31) =20 #define FSL_IMX31_NUM_UARTS 2 diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 29cc425acc..83291457cf 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -36,7 +36,7 @@ #include "cpu.h" #include "qom/object.h" =20 -#define TYPE_FSL_IMX6 "fsl,imx6" +#define TYPE_FSL_IMX6 "fsl-imx6" OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6State, FSL_IMX6) =20 #define FSL_IMX6_NUM_CPUS 4 diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index f8ebfba4f9..7812e516a5 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -40,7 +40,7 @@ #include "cpu.h" #include "qom/object.h" =20 -#define TYPE_FSL_IMX6UL "fsl,imx6ul" +#define TYPE_FSL_IMX6UL "fsl-imx6ul" OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6ULState, FSL_IMX6UL) =20 enum FslIMX6ULConfiguration { diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 161fdc36da..f5d527a490 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -41,7 +41,7 @@ #include "cpu.h" #include "qom/object.h" =20 -#define TYPE_FSL_IMX7 "fsl,imx7" +#define TYPE_FSL_IMX7 "fsl-imx7" OBJECT_DECLARE_SIMPLE_TYPE(FslIMX7State, FSL_IMX7) =20 enum FslIMX7Configuration { diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 1676a84ec8..d3e2ef97f6 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -37,7 +37,7 @@ #include "net/can_emu.h" #include "hw/dma/xlnx_csu_dma.h" =20 -#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" +#define TYPE_XLNX_ZYNQMP "xlnx-zynqmp" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) =20 #define XLNX_ZYNQMP_NUM_APU_CPUS 4 diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h index 9e99380e0c..8b01ed67d3 100644 --- a/include/hw/cris/etraxfs.h +++ b/include/hw/cris/etraxfs.h @@ -41,7 +41,7 @@ static inline DeviceState *etraxfs_ser_create(hwaddr addr, DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_new("etraxfs,serial"); + dev =3D qdev_new("etraxfs-serial"); s =3D SYS_BUS_DEVICE(dev); qdev_prop_set_chr(dev, "chardev", chr); sysbus_realize_and_unref(s, &error_fatal); diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index d1ea000d3d..23ee8e371b 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -216,7 +216,7 @@ struct ICH9LPCState { =20 =20 /* D31:F3 SMBus controller */ -#define TYPE_ICH9_SMB_DEVICE "ICH9 SMB" +#define TYPE_ICH9_SMB_DEVICE "ICH9-SMB" =20 #define ICH9_A2_SMB_REVISION 0x02 #define ICH9_SMB_PI 0x00 diff --git a/include/hw/misc/grlib_ahb_apb_pnp.h b/include/hw/misc/grlib_ah= b_apb_pnp.h index 341451bff6..bab0b5f47f 100644 --- a/include/hw/misc/grlib_ahb_apb_pnp.h +++ b/include/hw/misc/grlib_ahb_apb_pnp.h @@ -25,10 +25,10 @@ #define GRLIB_AHB_APB_PNP_H #include "qom/object.h" =20 -#define TYPE_GRLIB_AHB_PNP "grlib,ahbpnp" +#define TYPE_GRLIB_AHB_PNP "grlib-ahbpnp" OBJECT_DECLARE_SIMPLE_TYPE(AHBPnp, GRLIB_AHB_PNP) =20 -#define TYPE_GRLIB_APB_PNP "grlib,apbpnp" +#define TYPE_GRLIB_APB_PNP "grlib-apbpnp" OBJECT_DECLARE_SIMPLE_TYPE(APBPnp, GRLIB_APB_PNP) =20 void grlib_ahb_pnp_add_entry(AHBPnp *dev, uint32_t address, uint32_t mask, diff --git a/include/hw/misc/zynq-xadc.h b/include/hw/misc/zynq-xadc.h index 602bfb4ab1..2017b7a803 100644 --- a/include/hw/misc/zynq-xadc.h +++ b/include/hw/misc/zynq-xadc.h @@ -23,7 +23,7 @@ #define ZYNQ_XADC_NUM_ADC_REGS 128 #define ZYNQ_XADC_FIFO_DEPTH 15 =20 -#define TYPE_ZYNQ_XADC "xlnx,zynq-xadc" +#define TYPE_ZYNQ_XADC "xlnx-zynq-xadc" OBJECT_DECLARE_SIMPLE_TYPE(ZynqXADCState, ZYNQ_XADC) =20 struct ZynqXADCState { diff --git a/include/hw/register.h b/include/hw/register.h index 03c8926d27..b480e3882c 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -87,7 +87,7 @@ struct RegisterInfo { void *opaque; }; =20 -#define TYPE_REGISTER "qemu,register" +#define TYPE_REGISTER "qemu-register" DECLARE_INSTANCE_CHECKER(RegisterInfo, REGISTER, TYPE_REGISTER) =20 diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h index 2104f493f3..ef1946c7f8 100644 --- a/include/hw/sparc/grlib.h +++ b/include/hw/sparc/grlib.h @@ -32,14 +32,14 @@ */ =20 /* IRQMP */ -#define TYPE_GRLIB_IRQMP "grlib,irqmp" +#define TYPE_GRLIB_IRQMP "grlib-irqmp" =20 void grlib_irqmp_ack(DeviceState *dev, int intno); =20 /* GPTimer */ -#define TYPE_GRLIB_GPTIMER "grlib,gptimer" +#define TYPE_GRLIB_GPTIMER "grlib-gptimer" =20 /* APB UART */ -#define TYPE_GRLIB_APB_UART "grlib,apbuart" +#define TYPE_GRLIB_APB_UART "grlib-apbuart" =20 #endif /* GRLIB_H */ diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index b72772bc82..8db6cfd47f 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -231,7 +231,7 @@ static void zynq_init(MachineState *machine) clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY); =20 /* Create slcr, keep a pointer to connect clocks */ - slcr =3D qdev_new("xilinx,zynq_slcr"); + slcr =3D qdev_new("xilinx-zynq_slcr"); qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk); sysbus_realize_and_unref(SYS_BUS_DEVICE(slcr), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000); diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 209c05a0a0..aefc3edea1 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -37,7 +37,7 @@ #define CS_DREGS 32 #define CS_MAXDREG (CS_DREGS - 1) =20 -#define TYPE_CS4231 "SUNW,CS4231" +#define TYPE_CS4231 "sun-CS4231" typedef struct CSState CSState; DECLARE_INSTANCE_CHECKER(CSState, CS4231, TYPE_CS4231) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 32701c2bc5..82afda7f3a 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2537,7 +2537,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DeviceState *dev; FDCtrlSysBus *sys; =20 - dev =3D qdev_new("SUNW,fdtwo"); + dev =3D qdev_new("sun-fdtwo"); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sys =3D SYSBUS_FDC(dev); sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); @@ -2933,7 +2933,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo sun4m_fdc_info =3D { - .name =3D "SUNW,fdtwo", + .name =3D "sun-fdtwo", .parent =3D TYPE_SYSBUS_FDC, .instance_init =3D sun4m_fdc_initfn, .class_init =3D sun4m_fdc_class_init, diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 6bee3ee18e..e8c3017724 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -50,7 +50,7 @@ #define STAT_TR_IDLE 22 #define STAT_TR_RDY 24 =20 -#define TYPE_ETRAX_FS_SERIAL "etraxfs,serial" +#define TYPE_ETRAX_FS_SERIAL "etraxfs-serial" typedef struct ETRAXSerial ETRAXSerial; DECLARE_INSTANCE_CHECKER(ETRAXSerial, ETRAX_SERIAL, TYPE_ETRAX_FS_SERIAL) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index b0cb6d84af..af5a0e3517 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -289,7 +289,7 @@ void axisdev88_init(MachineState *machine) &gpio_state.iomem); =20 =20 - dev =3D qdev_new("etraxfs,pic"); + dev =3D qdev_new("etraxfs-pic"); s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); sysbus_mmio_map(s, 0, 0x3001c000); @@ -323,8 +323,8 @@ void axisdev88_init(MachineState *machine) } =20 /* 2 timers. */ - sysbus_create_varargs("etraxfs,timer", 0x3001e000, irq[0x1b], nmi[1], = NULL); - sysbus_create_varargs("etraxfs,timer", 0x3005e000, irq[0x1b], nmi[1], = NULL); + sysbus_create_varargs("etraxfs-timer", 0x3001e000, irq[0x1b], nmi[1], = NULL); + sysbus_create_varargs("etraxfs-timer", 0x3005e000, irq[0x1b], nmi[1], = NULL); =20 for (i =3D 0; i < 4; i++) { etraxfs_ser_create(0x30026000 + i * 0x2000, irq[0x14 + i], serial_= hd(i)); diff --git a/hw/display/tcx.c b/hw/display/tcx.c index d3db304657..d4d09d0df8 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -56,7 +56,7 @@ #define TCX_THC_CURSMASK 0x900 #define TCX_THC_CURSBITS 0x980 =20 -#define TYPE_TCX "SUNW,tcx" +#define TYPE_TCX "sun-tcx" OBJECT_DECLARE_SIMPLE_TYPE(TCXState, TCX) =20 struct TCXState { diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 54ed4c77f7..bd37d1cca0 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -38,7 +38,7 @@ #define R_R_GURU 4 #define R_MAX 5 =20 -#define TYPE_ETRAX_FS_PIC "etraxfs,pic" +#define TYPE_ETRAX_FS_PIC "etraxfs-pic" DECLARE_INSTANCE_CHECKER(struct etrax_pic, ETRAX_FS_PIC, TYPE_ETRAX_FS_PIC) =20 diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index 1d1b4b5c19..5a2016672a 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -28,7 +28,7 @@ =20 /* Define the PMU device */ =20 -#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc" +#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx-zynqmp-pmu-soc" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPPMUSoCState, XLNX_ZYNQMP_PMU_SOC) =20 #define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000 diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index c66d7db177..5086e6b7ed 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -182,7 +182,7 @@ REG32(DDRIOB, 0xb40) #define ZYNQ_SLCR_MMIO_SIZE 0x1000 #define ZYNQ_SLCR_NUM_REGS (ZYNQ_SLCR_MMIO_SIZE / 4) =20 -#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr" +#define TYPE_ZYNQ_SLCR "xilinx-zynq_slcr" OBJECT_DECLARE_SIMPLE_TYPE(ZynqSLCRState, ZYNQ_SLCR) =20 struct ZynqSLCRState { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 312e2afaf9..1a00816d9a 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -496,7 +496,7 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vra= m_size, int width, DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_new("SUNW,tcx"); + dev =3D qdev_new("sun-tcx"); qdev_prop_set_uint32(dev, "vram_size", vram_size); qdev_prop_set_uint16(dev, "width", width); qdev_prop_set_uint16(dev, "height", height); @@ -970,7 +970,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, } =20 if (hwdef->sx_base) { - create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); + create_unimplemented_device("sun-sx", hwdef->sx_base, 0x2000); } =20 dev =3D qdev_new("sysbus-m48t08"); @@ -1045,23 +1045,23 @@ static void sun4m_hw_init(const struct sun4m_hwdef = *hwdef, slavio_irq[30], fdc_tc); =20 if (hwdef->cs_base) { - sysbus_create_simple("SUNW,CS4231", hwdef->cs_base, + sysbus_create_simple("sun-CS4231", hwdef->cs_base, slavio_irq[5]); } =20 if (hwdef->dbri_base) { /* ISDN chip with attached CS4215 audio codec */ /* prom space */ - create_unimplemented_device("SUNW,DBRI.prom", + create_unimplemented_device("sun-DBRI.prom", hwdef->dbri_base + 0x1000, 0x30); /* reg space */ - create_unimplemented_device("SUNW,DBRI", + create_unimplemented_device("sun-DBRI", hwdef->dbri_base + 0x10000, 0x100); } =20 if (hwdef->bpp_base) { /* parallel port */ - create_unimplemented_device("SUNW,bpp", hwdef->bpp_base, 0x20); + create_unimplemented_device("sun-bpp", hwdef->bpp_base, 0x20); } =20 initrd_size =3D 0; diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 48f2e3ade2..5379006086 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -48,7 +48,7 @@ #define R_INTR 0x50 #define R_MASKED_INTR 0x54 =20 -#define TYPE_ETRAX_FS_TIMER "etraxfs,timer" +#define TYPE_ETRAX_FS_TIMER "etraxfs-timer" typedef struct ETRAXTimerState ETRAXTimerState; DECLARE_INSTANCE_CHECKER(ETRAXTimerState, ETRAX_TIMER, TYPE_ETRAX_FS_TIMER) diff --git a/softmmu/vl.c b/softmmu/vl.c index 1be618655b..2329f16571 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -918,7 +918,7 @@ static const VGAInterfaceInfo vga_interfaces[VGA_TYPE_M= AX] =3D { [VGA_TCX] =3D { .opt_name =3D "tcx", .name =3D "TCX framebuffer", - .class_names =3D { "SUNW,tcx" }, + .class_names =3D { "sun-tcx" }, }, [VGA_CG3] =3D { .opt_name =3D "cg3", diff --git a/tests/vmstate-static-checker-data/dump1.json b/tests/vmstate-s= tatic-checker-data/dump1.json index 786ca0b484..334ec07963 100644 --- a/tests/vmstate-static-checker-data/dump1.json +++ b/tests/vmstate-static-checker-data/dump1.json @@ -823,8 +823,8 @@ ] } }, - "SUNW,fdtwo": { - "Name": "SUNW,fdtwo", + "sun-fdtwo": { + "Name": "sun-fdtwo", "version_id": 2, "minimum_version_id": 2, "Description": { diff --git a/tests/vmstate-static-checker-data/dump2.json b/tests/vmstate-s= tatic-checker-data/dump2.json index 75719f5ec9..7184e9ccbb 100644 --- a/tests/vmstate-static-checker-data/dump2.json +++ b/tests/vmstate-static-checker-data/dump2.json @@ -628,8 +628,8 @@ ] } }, - "SUNW,fdtwo": { - "Name": "SUNW,fdtwo", + "sun-fdtwo": { + "Name": "sun-fdtwo", "version_id": 2, "minimum_version_id": 2, "Description": { --=20 2.26.2 From nobody Sun Feb 8 23:19:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615924600; cv=none; d=zohomail.com; s=zohoarc; b=KEwhAGCoMxBd66KABEseL8CNsRiYQ46AB6J/RjYSp3rUXo3kkpL6RhbIcLtHHslvv2Tmj2xusmQQ1dUeVD1PGBk12hPjFLetQGAbt+25DUWz+lhcc4ojgCtwDVoSSShYw+Rz7dUhaqknbtm22jPQMmZuYMWrux31Aoakvo1Bqjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615924600; 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=JE/tqTvZoOH/GVxHC51i4E32EYW5v/nu75RJpuw3R4o=; b=jCfK0iInThEiOk4KrMDzwJ2UcHANPSYlBn3oKt6NZZQaCx1OlUuaqcHbxJS4tc9lqaRC7f18lEkT6/ffJUbzlDGpPxvDCushcFTa45t66vlfC0rkmmBDfywIxoAEEA9dIYG4/uKaaXVO8LXHus2siRYHKZ4Iyo1g46+yYmRH5fc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615924600791490.2690237809246; Tue, 16 Mar 2021 12:56:40 -0700 (PDT) Received: from localhost ([::1]:36188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFnz-0005Ni-DH for importer@patchew.org; Tue, 16 Mar 2021 15:56:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIU-0000Fj-Sz for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIL-0002PZ-S8 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:06 -0400 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-244-PwoYSRqtObKII3xUN6XKtw-1; Tue, 16 Mar 2021 15:23:51 -0400 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 B64B8881276; Tue, 16 Mar 2021 19:23:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 797CB5D9D3; Tue, 16 Mar 2021 19:23:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4052B114423C; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922637; h=from:from: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; bh=JE/tqTvZoOH/GVxHC51i4E32EYW5v/nu75RJpuw3R4o=; b=a+O0/4ajZ7L6Vwil/+fm/F6TXGsBiT0geoGcjRszjan3y6c6npM9nuixuNxuZpJG/xY6u9 rHbhTnLoXjKXpWaVC0LRH7gnJtQxk+BvllvFVRMqsobBaqoFRtV+P5vE3uQevnTB5ajUDl I0F5oqjW+hkhk3gFX8WA2ShpM45Wjd0= X-MC-Unique: PwoYSRqtObKII3xUN6XKtw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 6/6] memory: Drop "qemu:" prefix from QOM memory region type names Date: Tue, 16 Mar 2021 20:23:47 +0100 Message-Id: <20210316192347.3918857-7-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Paolo Bonzini , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Almost all QOM type names consist only of letters, digits, '-', '_', and '.'. Just two contain ':': "qemu:memory-region" and "qemu:iommu-memory-region". Neither can be plugged with -object. Rename them to "memory-region" and "iommu-memory-region". Signed-off-by: Markus Armbruster Message-Id: <20210304140229.575481-3-armbru@redhat.com> Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini --- include/exec/memory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 54ccf1a5f0..260ddd8ade 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -33,11 +33,11 @@ #define MAX_PHYS_ADDR_SPACE_BITS 62 #define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) = - 1) =20 -#define TYPE_MEMORY_REGION "qemu:memory-region" +#define TYPE_MEMORY_REGION "memory-region" DECLARE_INSTANCE_CHECKER(MemoryRegion, MEMORY_REGION, TYPE_MEMORY_REGION) =20 -#define TYPE_IOMMU_MEMORY_REGION "qemu:iommu-memory-region" +#define TYPE_IOMMU_MEMORY_REGION "iommu-memory-region" typedef struct IOMMUMemoryRegionClass IOMMUMemoryRegionClass; DECLARE_OBJ_CHECKERS(IOMMUMemoryRegion, IOMMUMemoryRegionClass, IOMMU_MEMORY_REGION, TYPE_IOMMU_MEMORY_REGION) --=20 2.26.2