From nobody Sun Nov 16 04:16:11 2025 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=1598556814; cv=none; d=zohomail.com; s=zohoarc; b=KvfwCXrdNWHgNH5Ig3TRrdAxHilfBnqxtSeFn7iiMapfYj1nMr8MoB4ZbR1Mi4z6ehp91qXb6TGgrKyRELsK/e6ovbNAMsJ3Nbyj/93khygnurJE7s8GoxazRQE05P2sJXSuREQqzp1p2+PQ26LppYrOSlzC0DS4U/kU+jnOUBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556814; 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=Y2WCrKlLVKjdPQ5JEb97UgqOg47yB7G6CZC7w1sa5Hw=; b=dqYHyJaPVn8AO6RuuORdFsswhX8QI0wFurApAAHzD9zeEycew41JSYUChYQoSpw9+qSgHRAT3ceIFE4lUq31AAayaWdpH/ITe+E60m7PEbJiJE13UYtEOqm31S/vsoCjB/P7qU0AjCKwJHsFtV2Z0InzQnpjLHAON2vEb9dYKlM= 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 1598556814532324.3203411548991; Thu, 27 Aug 2020 12:33:34 -0700 (PDT) Received: from localhost ([::1]:58512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNeP-0002wY-AK for importer@patchew.org; Thu, 27 Aug 2020 15:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSq-0005y3-2j for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:36 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:22881 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSo-0000Lo-7F for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:35 -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-124-aig2shUHOWC-TKJnQTJOpw-1; Thu, 27 Aug 2020 15:21:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CBA61009636; Thu, 27 Aug 2020 19:21:29 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C351702FF; Thu, 27 Aug 2020 19:21:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556092; 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=Y2WCrKlLVKjdPQ5JEb97UgqOg47yB7G6CZC7w1sa5Hw=; b=hTAFGGk+3Nwj5+q2XN43k4jM5dfO2JL6WSbglvIx9IZcUPxtNz0X88lA0ZFVxrPv3uKC8x 2g5ahVpbyPKt094MSrhzGSWeCt9B1mSvPuSeCt5bUUWmK6k+HEH/J9lOP50Biqkkq4xunO zBwmT6ilRZBLUEbjIXMbtwux8vqJkYE= X-MC-Unique: aig2shUHOWC-TKJnQTJOpw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/53] numa: hmat: fix cache size check Date: Thu, 27 Aug 2020 15:20:30 -0400 Message-Id: <20200827192122.658035-2-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Igor Mammedov when QEMU is started like: qemu-system-x86_64 -smp 2 -machine hmat=3Don \ -m 2G \ -object memory-backend-ram,size=3D1G,id=3Dm0 \ -object memory-backend-ram,size=3D1G,id=3Dm1 \ -numa node,nodeid=3D0,memdev=3Dm0 \ -numa node,nodeid=3D1,memdev=3Dm1,initiator=3D0 \ -numa cpu,node-id=3D0,socket-id=3D0 \ -numa cpu,node-id=3D0,socket-id=3D1 \ -numa hmat-lb,initiator=3D0,target=3D0,hierarchy=3Dmemory,data-type=3Dacce= ss-latency,latency=3D5 \ -numa hmat-lb,initiator=3D0,target=3D0,hierarchy=3Dmemory,data-type=3Dacce= ss-bandwidth,bandwidth=3D200M \ -numa hmat-lb,initiator=3D0,target=3D1,hierarchy=3Dmemory,data-type=3Dacce= ss-latency,latency=3D10 \ -numa hmat-lb,initiator=3D0,target=3D1,hierarchy=3Dmemory,data-type=3Dacce= ss-bandwidth,bandwidth=3D100M \ -numa hmat-cache,node-id=3D0,size=3D8K,level=3D1,associativity=3Ddirect,po= licy=3Dwrite-back,line=3D5 \ -numa hmat-cache,node-id=3D0,size=3D16K,level=3D2,associativity=3Ddirect,p= olicy=3Dwrite-back,line=3D5 it errors out with: -numa hmat-cache,node-id=3D0,size=3D16K,level=3D2,associativity=3Ddirect,p= olicy=3Dwrite-back,line=3D5: Invalid size=3D16384, the size of level=3D2 should be less than the= size(8192) of level=3D1 which doesn't look right as one would expect that L1 < L2 < L3 ... Fix it by sawpping relevant size checks. Fixes: c412a48d4d91 (numa: Extend CLI to provide memory side cache informat= ion) Signed-off-by: Igor Mammedov Message-Id: <20200821100519.1325691-1-imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Eduardo Habkost --- hw/core/numa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index d1a94a14f8..f9593ec716 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -425,10 +425,10 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmat= CacheOptions *node, =20 if ((node->level > 1) && ms->numa_state->hmat_cache[node->node_id][node->level - 1] && - (node->size >=3D + (node->size <=3D ms->numa_state->hmat_cache[node->node_id][node->level - 1]->si= ze)) { error_setg(errp, "Invalid size=3D%" PRIu64 ", the size of level=3D= %" PRIu8 - " should be less than the size(%" PRIu64 ") of " + " should be larger than the size(%" PRIu64 ") of " "level=3D%u", node->size, node->level, ms->numa_state->hmat_cache[node->node_id] [node->level - 1]->size, @@ -438,10 +438,10 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmat= CacheOptions *node, =20 if ((node->level < HMAT_LB_LEVELS - 1) && ms->numa_state->hmat_cache[node->node_id][node->level + 1] && - (node->size <=3D + (node->size >=3D ms->numa_state->hmat_cache[node->node_id][node->level + 1]->si= ze)) { error_setg(errp, "Invalid size=3D%" PRIu64 ", the size of level=3D= %" PRIu8 - " should be larger than the size(%" PRIu64 ") of " + " should be less than the size(%" PRIu64 ") of " "level=3D%u", node->size, node->level, ms->numa_state->hmat_cache[node->node_id] [node->level + 1]->size, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556961; cv=none; d=zohomail.com; s=zohoarc; b=dJPkCzCI+eiwNBcnZrrQXY1vBLhjOrpLQ1NM6DHkLGGDiCMsRoVDY5SW1XdayYa0E6CckZ0ysab1OHl7S+tZvPo2A2HUX2CnRmhdsGH+kgx+Kuvmd0QwOLTS35/2UqfvSlqEMFP8hPklQa/hEseqIlBewbyQ8fAUSmmR68Y26Ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556961; 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=vZ19hG2ss9WIeWKCsX6AGJ0Oedd8u71zzCoJoHZ3RK8=; b=GQeT0utTbGE2mSqdhCAWbj0akdqFftokvnaIkPLD4aVOuxiP2gu9/x7PdvjnYZBM+7BhwBNNrahoPrJkXqxZFkvredArii9dc4bQ5ubghB7R+oYSYwgeDlmAzz4DdiS9IYLgRzDg95eb/Mm6Bm7YuWLpU48mW9scvGECdEVuEsk= 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 1598556961112736.5550003127175; Thu, 27 Aug 2020 12:36:01 -0700 (PDT) Received: from localhost ([::1]:43052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNgl-0008FG-Qv for importer@patchew.org; Thu, 27 Aug 2020 15:35:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSq-0005zG-Eg for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSo-0000Ls-PO for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:36 -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-63-1VsRYjSoOzWoF_UqloDw0w-1; Thu, 27 Aug 2020 15:21:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 538E9185FD95; Thu, 27 Aug 2020 19:21:30 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CBAA78392; Thu, 27 Aug 2020 19:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556093; 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=vZ19hG2ss9WIeWKCsX6AGJ0Oedd8u71zzCoJoHZ3RK8=; b=Eh8FYfiqUMn6UsfdxPosJsQ507XURSUvSyG3RxGqWFCxy/6qR+CWL0l8hkkC0A7dFrtBL2 3eCJrxdME5Mtj7xhHtvgacIWQ+/QsRCROXbAXCwT+Hqj2gJu4bguz+Krx8z4u75BVOKupe iatI+kYViVFnEzZkeGHoc9qEHSW9gCk= X-MC-Unique: 1VsRYjSoOzWoF_UqloDw0w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 02/53] e1000: Rename QOM class cast macros Date: Thu, 27 Aug 2020 15:20:31 -0400 Message-Id: <20200827192122.658035-3-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the E1000_DEVICE_CLASS() and E1000_DEVICE_GET_CLASS() macros to be consistent with the E1000() instance cast macro. This will allow us to register the type cast macros using OBJECT_DECLARE_TYPE later. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-2-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/net/e1000.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index a18f80e369..c4d896a9e6 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -151,9 +151,9 @@ typedef struct E1000BaseClass { #define E1000(obj) \ OBJECT_CHECK(E1000State, (obj), TYPE_E1000_BASE) =20 -#define E1000_DEVICE_CLASS(klass) \ +#define E1000_CLASS(klass) \ OBJECT_CLASS_CHECK(E1000BaseClass, (klass), TYPE_E1000_BASE) -#define E1000_DEVICE_GET_CLASS(obj) \ +#define E1000_GET_CLASS(obj) \ OBJECT_GET_CLASS(E1000BaseClass, (obj), TYPE_E1000_BASE) =20 static void @@ -365,7 +365,7 @@ e1000_autoneg_timer(void *opaque) static void e1000_reset(void *opaque) { E1000State *d =3D opaque; - E1000BaseClass *edc =3D E1000_DEVICE_GET_CLASS(d); + E1000BaseClass *edc =3D E1000_GET_CLASS(d); uint8_t *macaddr =3D d->conf.macaddr.a; =20 timer_del(d->autoneg_timer); @@ -1751,7 +1751,7 @@ static void e1000_class_init(ObjectClass *klass, void= *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - E1000BaseClass *e =3D E1000_DEVICE_CLASS(klass); + E1000BaseClass *e =3D E1000_CLASS(klass); const E1000Info *info =3D data; =20 k->realize =3D pci_e1000_realize; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556907; cv=none; d=zohomail.com; s=zohoarc; b=b7NPlWeq4Y2ZmnArD4x/hOOpsnS2DL7P7EZRLBsQz6xjbu/R7idY49C+eMjozNzmWu2YlQWHfGbKiZfdqQ5clJ3WaGdgpRe0M1+Jj3ZvVDc1AFx62mb+u+vp2D5s2Zy1iGIV3Ga5+5V2lTBkfxd9gHaiKpxgo64JShrNToy9dVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556907; 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=XORl44+j8TFh3b0H7QYnOfMrVv/VIn1njDV+WEZfPMU=; b=h2QtYjcAaenfOj/HV/v5OifwQRjA8zVpeKJs6YV+WLLQ4d/10AxPtQelH9NCRx+0VzL3L+gMq9l3KDacjpF5A0XfLWylBrKcf8lwqJ2l0h3nAIu7K1q94aZVnDBXWYscs9oPWaN/uL/2tNgL4zUfr2j4IPd5/g4ObdaJYXGYJzw= 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 1598556907018745.8816284651265; Thu, 27 Aug 2020 12:35:07 -0700 (PDT) Received: from localhost ([::1]:38336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNft-0006Ep-O9 for importer@patchew.org; Thu, 27 Aug 2020 15:35:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSr-00061p-FX for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSp-0000Ly-HY for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:37 -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-35-fbT4B-PYMoKZ4obuBVp8Qg-1; Thu, 27 Aug 2020 15:21:32 -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 594C21DE08; Thu, 27 Aug 2020 19:21:31 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18F4F10013C1; Thu, 27 Aug 2020 19:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556094; 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=XORl44+j8TFh3b0H7QYnOfMrVv/VIn1njDV+WEZfPMU=; b=RPY3k8evjBLXz6fLeLcVLZafyHo7YFhbp09OR18Y4k+JPC3jB0hNWdKrOve6N1CSGQSiZd un8dMAQboCNFfwVi+WREKu0ZLYDAePk3B5lY4eqzhjZ2B5VH5RPn4AIpTj8nSScQBDDhPy 3+a4Tjkoi3TYqKfwLZCctfZ88T18zUo= X-MC-Unique: fbT4B-PYMoKZ4obuBVp8Qg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/53] megasas: Rename QOM class cast macros Date: Thu, 27 Aug 2020 15:20:32 -0400 Message-Id: <20200827192122.658035-4-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the MEGASAS_DEVICE_CLASS() and MEGASAS_DEVICE_GET_CLASS() macros to be consistent with the MEGASAS() instance cast macro. This will allow us to register the type cast macros using OBJECT_DECLARE_TYPE later. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-3-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/scsi/megasas.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 5cfd1bf22e..390c2f2edb 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -134,9 +134,9 @@ typedef struct MegasasBaseClass { #define MEGASAS(obj) \ OBJECT_CHECK(MegasasState, (obj), TYPE_MEGASAS_BASE) =20 -#define MEGASAS_DEVICE_CLASS(oc) \ +#define MEGASAS_CLASS(oc) \ OBJECT_CLASS_CHECK(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE) -#define MEGASAS_DEVICE_GET_CLASS(oc) \ +#define MEGASAS_GET_CLASS(oc) \ OBJECT_GET_CLASS(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE) =20 #define MEGASAS_INTR_DISABLED_MASK 0xFFFFFFFF @@ -733,7 +733,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) { PCIDevice *pci_dev =3D PCI_DEVICE(s); PCIDeviceClass *pci_class =3D PCI_DEVICE_GET_CLASS(pci_dev); - MegasasBaseClass *base_class =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *base_class =3D MEGASAS_GET_CLASS(s); struct mfi_ctrl_info info; size_t dcmd_size =3D sizeof(info); BusChild *kid; @@ -1999,7 +1999,7 @@ static uint64_t megasas_mmio_read(void *opaque, hwadd= r addr, { MegasasState *s =3D opaque; PCIDevice *pci_dev =3D PCI_DEVICE(s); - MegasasBaseClass *base_class =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *base_class =3D MEGASAS_GET_CLASS(s); uint32_t retval =3D 0; =20 switch (addr) { @@ -2322,7 +2322,7 @@ static const struct SCSIBusInfo megasas_scsi_info =3D= { static void megasas_scsi_realize(PCIDevice *dev, Error **errp) { MegasasState *s =3D MEGASAS(dev); - MegasasBaseClass *b =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *b =3D MEGASAS_GET_CLASS(s); uint8_t *pci_conf; int i, bar_type; Error *err =3D NULL; @@ -2506,7 +2506,7 @@ static void megasas_class_init(ObjectClass *oc, void = *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PCIDeviceClass *pc =3D PCI_DEVICE_CLASS(oc); - MegasasBaseClass *e =3D MEGASAS_DEVICE_CLASS(oc); + MegasasBaseClass *e =3D MEGASAS_CLASS(oc); const MegasasInfo *info =3D data; =20 pc->realize =3D megasas_scsi_realize; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556993; cv=none; d=zohomail.com; s=zohoarc; b=Id1td3yOkkzhl7fbQeUHtDxXXpXNPL7KLyd9UGe1gVXiZiBb7hIHchnyzCU40ud2hiMOpmpkGVor3qpQCjW3Mm8lWW6RgTbqMyk/tDWn60fQ9lsx+xSQKxu2WrP0U26SNJQalHPnvS3ku8rYqPCwRLWNmAHB5xEQo9R8/MFvYrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556993; 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=NKrhlV39LZnviuO/8IjQU4zPzT5wqREhp+X6A+kaeDI=; b=OheWeqlbo6Vig2yoqUCaMMCxTRoUzRTLMfv4NZ6pb/lBJyMLlT3o041UO0ARlxNPv/YD7Ifr8bP63W/wRxFJZ/7mOSmYNx2oOuEYDvPCXwY/cgcAHURPjuFKHnePCIb8VxadPkEJycRyrheu8qYx1VpLGDq7Up8KL++u1Ilj8fk= 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 1598556993136894.9592111321901; Thu, 27 Aug 2020 12:36:33 -0700 (PDT) Received: from localhost ([::1]:46472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNhH-0001DQ-Oi for importer@patchew.org; Thu, 27 Aug 2020 15:36:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSy-0006DC-0L for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35759 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSw-0000MO-Af for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:43 -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-193-USZdZcBcN-OlGIBihDGNXA-1; Thu, 27 Aug 2020 15:21:38 -0400 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 88A971DDFF; Thu, 27 Aug 2020 19:21:37 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C91919D61; Thu, 27 Aug 2020 19:21:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556101; 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=NKrhlV39LZnviuO/8IjQU4zPzT5wqREhp+X6A+kaeDI=; b=QWvugzzvXmz8LSWqWg3mSFqIW6evJp2lM7PVCDhPk0NN0FiNXoEXQUYNx6F5kTmlgW8TOx POrWZ+wgFhfklUjANPaXWhrIjknISklh7WU+I1P1D5zMcUw+PRFOIF54h2i/hm5TX+NGWW ZuLUmKHgq1kmIZi9328vElOa2/rknIo= X-MC-Unique: USZdZcBcN-OlGIBihDGNXA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/53] vmw_pvscsi: Rename QOM class cast macros Date: Thu, 27 Aug 2020 15:20:33 -0400 Message-Id: <20200827192122.658035-5-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the PVSCSI_DEVICE_CLASS() and PVSCSI_DEVICE_GET_CLASS() macros to be consistent with the PVSCSI() instance cast macro. This will allow us to register the type cast macros using OBJECT_DECLARE_TYPE later. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-4-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/scsi/vmw_pvscsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index df07ab6bfb..c071e0c7aa 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -64,9 +64,9 @@ typedef struct PVSCSIClass { #define TYPE_PVSCSI "pvscsi" #define PVSCSI(obj) OBJECT_CHECK(PVSCSIState, (obj), TYPE_PVSCSI) =20 -#define PVSCSI_DEVICE_CLASS(klass) \ +#define PVSCSI_CLASS(klass) \ OBJECT_CLASS_CHECK(PVSCSIClass, (klass), TYPE_PVSCSI) -#define PVSCSI_DEVICE_GET_CLASS(obj) \ +#define PVSCSI_GET_CLASS(obj) \ OBJECT_GET_CLASS(PVSCSIClass, (obj), TYPE_PVSCSI) =20 /* Compatibility flags for migration */ @@ -1265,7 +1265,7 @@ static Property pvscsi_properties[] =3D { =20 static void pvscsi_realize(DeviceState *qdev, Error **errp) { - PVSCSIClass *pvs_c =3D PVSCSI_DEVICE_GET_CLASS(qdev); + PVSCSIClass *pvs_c =3D PVSCSI_GET_CLASS(qdev); PCIDevice *pci_dev =3D PCI_DEVICE(qdev); PVSCSIState *s =3D PVSCSI(qdev); =20 @@ -1280,7 +1280,7 @@ static void pvscsi_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - PVSCSIClass *pvs_k =3D PVSCSI_DEVICE_CLASS(klass); + PVSCSIClass *pvs_k =3D PVSCSI_CLASS(klass); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 k->realize =3D pvscsi_realizefn; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557092; cv=none; d=zohomail.com; s=zohoarc; b=SUbeajKSMZy5BFHGbOe728S7KtGyy+fd38B/cREe4WgUQNV0LVhxQGPNCqTrGz8BUdLY05JrV2mv7vpQGWMqkC+2o37Bk+/YKysZf0Y2/X42cUEqRRjfxi4NOdLoVYuwxjioHNhbyCC0/xh8VZeti7jLkySqC4SbqEF45nqxRcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557092; 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=16ROf7HSKknAmLIGZmXlrYE3iR7OO+JG34+R2pn1wxE=; b=KghpnzZH37XVS4JPHgk6WOynio/Z43UI0EC2DHX1FnSsmcBdojqjVAOOo/k0z806E35vKP3/7wYWyERGmezsFB0XZopiGr+tBEE6YQiB9Z2YTN4aSZ3eTXfzMt00jzneGjJODyKEUHHQpPkflnIqsYw/rmYARzZNhoWTvMwQ0cs= 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 1598557092898329.03408794723646; Thu, 27 Aug 2020 12:38:12 -0700 (PDT) Received: from localhost ([::1]:54568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNit-0004Wb-N3 for importer@patchew.org; Thu, 27 Aug 2020 15:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSz-0006F4-EW for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:45 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46274 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSx-0000MT-Qd for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:45 -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-350-eDn5tIS6NxS8s8gGIueK9g-1; Thu, 27 Aug 2020 15:21:40 -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 9B0268018A4; Thu, 27 Aug 2020 19:21:38 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 575F2747BD; Thu, 27 Aug 2020 19:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556103; 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=16ROf7HSKknAmLIGZmXlrYE3iR7OO+JG34+R2pn1wxE=; b=UxFQ9FbVFLrI/LuWsmTOSiT7Z1gDhuWQBUIO7Jb91W8KdQHvqAVaX0nz9SbHuapv77dNik ChLB0dEK8fAmAx35Ig4es+XkxHs1po/PpcAh4q0duA4Ip/AwH9wwO4vmA37D8aqyv6gWdL 68Ol7MjPEs8BKQTDl5Rm4EMnMD5Ac4s= X-MC-Unique: eDn5tIS6NxS8s8gGIueK9g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/53] pl110: Rename pl110_version enum values Date: Thu, 27 Aug 2020 15:20:34 -0400 Message-Id: <20200827192122.658035-6-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The PL110 enum value name will conflict with the PL110 type cast checker, when we replace the existing macro with an inline function. Add a VERSION_ prefix to all pl110_version enum values, to avoid conflicts. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-5-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/display/pl110.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/display/pl110.c b/hw/display/pl110.c index c2991a28d2..61fefbffb3 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -42,9 +42,9 @@ enum pl110_bppmode /* The Versatile/PB uses a slightly modified PL110 controller. */ enum pl110_version { - PL110, - PL110_VERSATILE, - PL111 + VERSION_PL110, + VERSION_PL110_VERSATILE, + VERSION_PL111 }; =20 #define TYPE_PL110 "pl110" @@ -189,7 +189,7 @@ static void pl110_update_display(void *opaque) else bpp_offset =3D 24; =20 - if ((s->version !=3D PL111) && (s->bpp =3D=3D BPP_16)) { + if ((s->version !=3D VERSION_PL111) && (s->bpp =3D=3D BPP_16)) { /* The PL110's native 16 bit mode is 5551; however * most boards with a PL110 implement an external * mux which allows bits to be reshuffled to give @@ -372,12 +372,12 @@ static uint64_t pl110_read(void *opaque, hwaddr offse= t, case 5: /* LCDLPBASE */ return s->lpbase; case 6: /* LCDIMSC */ - if (s->version !=3D PL110) { + if (s->version !=3D VERSION_PL110) { return s->cr; } return s->int_mask; case 7: /* LCDControl */ - if (s->version !=3D PL110) { + if (s->version !=3D VERSION_PL110) { return s->int_mask; } return s->cr; @@ -437,7 +437,7 @@ static void pl110_write(void *opaque, hwaddr offset, s->lpbase =3D val; break; case 6: /* LCDIMSC */ - if (s->version !=3D PL110) { + if (s->version !=3D VERSION_PL110) { goto control; } imsc: @@ -445,7 +445,7 @@ static void pl110_write(void *opaque, hwaddr offset, pl110_update(s); break; case 7: /* LCDControl */ - if (s->version !=3D PL110) { + if (s->version !=3D VERSION_PL110) { goto imsc; } control: @@ -513,21 +513,21 @@ static void pl110_init(Object *obj) { PL110State *s =3D PL110(obj); =20 - s->version =3D PL110; + s->version =3D VERSION_PL110; } =20 static void pl110_versatile_init(Object *obj) { PL110State *s =3D PL110(obj); =20 - s->version =3D PL110_VERSATILE; + s->version =3D VERSION_PL110_VERSATILE; } =20 static void pl111_init(Object *obj) { PL110State *s =3D PL110(obj); =20 - s->version =3D PL111; + s->version =3D VERSION_PL111; } =20 static void pl110_class_init(ObjectClass *klass, void *data) --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557058; cv=none; d=zohomail.com; s=zohoarc; b=Wlp+BO/FGfgcfpojSEK3ztESniMReotAypDqQRp1hCK97xxaV2DEbtyn/4hi6ggLUfKYgHpHa0WRPRfpYW5dd2TY23vav1jUgxiOyThTgosN8S2sfSKR0sDIfxN27kgNOX0J+RxZf5U3y9+Yjry9lt7b/rNLQ5ED+pzS28hOpbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557058; 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=DRgeoThWkAZw6WpV9MzoBoiAbKCOmZ++J2i5cJ2feVM=; b=mBgQqL0ji0A2Hd7HN5VEXczB8UIGKikQF0ryUewVUuuRCFlJigePCWorYUsnQL3NKFq7mClP6J0ovUB3MCJGDZm/L9Akmgtl6K9FgBeCxensF2NjWtaxt7yz65VieaQv7p6h1e16m8EnQz/I0By9T+ypNb+R+aIXcbZZBHoA46c= 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 1598557058285484.0314869579123; Thu, 27 Aug 2020 12:37:38 -0700 (PDT) Received: from localhost ([::1]:51244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNiK-0003AD-Ob for importer@patchew.org; Thu, 27 Aug 2020 15:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNT3-0006Os-Vd for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNT1-0000Mf-3K for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:49 -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-536-BdFSftlTNBCSXJAq8-p5ag-1; Thu, 27 Aug 2020 15:21:41 -0400 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 1B5CD801FD4; Thu, 27 Aug 2020 19:21:40 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC0EA19D61; Thu, 27 Aug 2020 19:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556106; 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=DRgeoThWkAZw6WpV9MzoBoiAbKCOmZ++J2i5cJ2feVM=; b=WmTxGjU8S3oLNw0nYcZqPnBL6A/PaptVz00fj2hCFcttcnaA5jOn4pl3vEhSB6yHBEf6H0 WZu+Nh5Y7XN21fMFtzhQXjmucg7q22YglnT4UahNC77QbxlAXsPuNFmATtollFprANObCJ H0QANlB+4QjIDRcOthCC21nIQJsfB4E= X-MC-Unique: BdFSftlTNBCSXJAq8-p5ag-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/53] allwinner-h3: Rename memmap enum constants Date: Thu, 27 Aug 2020 15:20:35 -0400 Message-Id: <20200827192122.658035-7-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Niek Linnenbank , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some of the enum constant names conflict with the QOM type check macros (AW_H3_CCU, AW_H3_SYSCTRL). This needs to be addressed to allow us to transform the QOM type check macros into functions generated by OBJECT_DECLARE_TYPE(). Rename all the constants to AW_H3_DEV_*, to avoid conflicts. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Niek Linnenbank Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-6-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/arm/allwinner-h3.h | 62 ++++++++--------- hw/arm/allwinner-h3.c | 124 +++++++++++++++++----------------- hw/arm/orangepi.c | 6 +- 3 files changed, 96 insertions(+), 96 deletions(-) diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 82e4e59216..626139dcb3 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -61,37 +61,37 @@ * @see AwH3State */ enum { - AW_H3_SRAM_A1, - AW_H3_SRAM_A2, - AW_H3_SRAM_C, - AW_H3_SYSCTRL, - AW_H3_MMC0, - AW_H3_SID, - AW_H3_EHCI0, - AW_H3_OHCI0, - AW_H3_EHCI1, - AW_H3_OHCI1, - AW_H3_EHCI2, - AW_H3_OHCI2, - AW_H3_EHCI3, - AW_H3_OHCI3, - AW_H3_CCU, - AW_H3_PIT, - AW_H3_UART0, - AW_H3_UART1, - AW_H3_UART2, - AW_H3_UART3, - AW_H3_EMAC, - AW_H3_DRAMCOM, - AW_H3_DRAMCTL, - AW_H3_DRAMPHY, - AW_H3_GIC_DIST, - AW_H3_GIC_CPU, - AW_H3_GIC_HYP, - AW_H3_GIC_VCPU, - AW_H3_RTC, - AW_H3_CPUCFG, - AW_H3_SDRAM + AW_H3_DEV_SRAM_A1, + AW_H3_DEV_SRAM_A2, + AW_H3_DEV_SRAM_C, + AW_H3_DEV_SYSCTRL, + AW_H3_DEV_MMC0, + AW_H3_DEV_SID, + AW_H3_DEV_EHCI0, + AW_H3_DEV_OHCI0, + AW_H3_DEV_EHCI1, + AW_H3_DEV_OHCI1, + AW_H3_DEV_EHCI2, + AW_H3_DEV_OHCI2, + AW_H3_DEV_EHCI3, + AW_H3_DEV_OHCI3, + AW_H3_DEV_CCU, + AW_H3_DEV_PIT, + AW_H3_DEV_UART0, + AW_H3_DEV_UART1, + AW_H3_DEV_UART2, + AW_H3_DEV_UART3, + AW_H3_DEV_EMAC, + AW_H3_DEV_DRAMCOM, + AW_H3_DEV_DRAMCTL, + AW_H3_DEV_DRAMPHY, + AW_H3_DEV_GIC_DIST, + AW_H3_DEV_GIC_CPU, + AW_H3_DEV_GIC_HYP, + AW_H3_DEV_GIC_VCPU, + AW_H3_DEV_RTC, + AW_H3_DEV_CPUCFG, + AW_H3_DEV_SDRAM }; =20 /** Total number of CPU cores in the H3 SoC */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index ff92ded82c..341abe6718 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -35,37 +35,37 @@ =20 /* Memory map */ const hwaddr allwinner_h3_memmap[] =3D { - [AW_H3_SRAM_A1] =3D 0x00000000, - [AW_H3_SRAM_A2] =3D 0x00044000, - [AW_H3_SRAM_C] =3D 0x00010000, - [AW_H3_SYSCTRL] =3D 0x01c00000, - [AW_H3_MMC0] =3D 0x01c0f000, - [AW_H3_SID] =3D 0x01c14000, - [AW_H3_EHCI0] =3D 0x01c1a000, - [AW_H3_OHCI0] =3D 0x01c1a400, - [AW_H3_EHCI1] =3D 0x01c1b000, - [AW_H3_OHCI1] =3D 0x01c1b400, - [AW_H3_EHCI2] =3D 0x01c1c000, - [AW_H3_OHCI2] =3D 0x01c1c400, - [AW_H3_EHCI3] =3D 0x01c1d000, - [AW_H3_OHCI3] =3D 0x01c1d400, - [AW_H3_CCU] =3D 0x01c20000, - [AW_H3_PIT] =3D 0x01c20c00, - [AW_H3_UART0] =3D 0x01c28000, - [AW_H3_UART1] =3D 0x01c28400, - [AW_H3_UART2] =3D 0x01c28800, - [AW_H3_UART3] =3D 0x01c28c00, - [AW_H3_EMAC] =3D 0x01c30000, - [AW_H3_DRAMCOM] =3D 0x01c62000, - [AW_H3_DRAMCTL] =3D 0x01c63000, - [AW_H3_DRAMPHY] =3D 0x01c65000, - [AW_H3_GIC_DIST] =3D 0x01c81000, - [AW_H3_GIC_CPU] =3D 0x01c82000, - [AW_H3_GIC_HYP] =3D 0x01c84000, - [AW_H3_GIC_VCPU] =3D 0x01c86000, - [AW_H3_RTC] =3D 0x01f00000, - [AW_H3_CPUCFG] =3D 0x01f01c00, - [AW_H3_SDRAM] =3D 0x40000000 + [AW_H3_DEV_SRAM_A1] =3D 0x00000000, + [AW_H3_DEV_SRAM_A2] =3D 0x00044000, + [AW_H3_DEV_SRAM_C] =3D 0x00010000, + [AW_H3_DEV_SYSCTRL] =3D 0x01c00000, + [AW_H3_DEV_MMC0] =3D 0x01c0f000, + [AW_H3_DEV_SID] =3D 0x01c14000, + [AW_H3_DEV_EHCI0] =3D 0x01c1a000, + [AW_H3_DEV_OHCI0] =3D 0x01c1a400, + [AW_H3_DEV_EHCI1] =3D 0x01c1b000, + [AW_H3_DEV_OHCI1] =3D 0x01c1b400, + [AW_H3_DEV_EHCI2] =3D 0x01c1c000, + [AW_H3_DEV_OHCI2] =3D 0x01c1c400, + [AW_H3_DEV_EHCI3] =3D 0x01c1d000, + [AW_H3_DEV_OHCI3] =3D 0x01c1d400, + [AW_H3_DEV_CCU] =3D 0x01c20000, + [AW_H3_DEV_PIT] =3D 0x01c20c00, + [AW_H3_DEV_UART0] =3D 0x01c28000, + [AW_H3_DEV_UART1] =3D 0x01c28400, + [AW_H3_DEV_UART2] =3D 0x01c28800, + [AW_H3_DEV_UART3] =3D 0x01c28c00, + [AW_H3_DEV_EMAC] =3D 0x01c30000, + [AW_H3_DEV_DRAMCOM] =3D 0x01c62000, + [AW_H3_DEV_DRAMCTL] =3D 0x01c63000, + [AW_H3_DEV_DRAMPHY] =3D 0x01c65000, + [AW_H3_DEV_GIC_DIST] =3D 0x01c81000, + [AW_H3_DEV_GIC_CPU] =3D 0x01c82000, + [AW_H3_DEV_GIC_HYP] =3D 0x01c84000, + [AW_H3_DEV_GIC_VCPU] =3D 0x01c86000, + [AW_H3_DEV_RTC] =3D 0x01f00000, + [AW_H3_DEV_CPUCFG] =3D 0x01f01c00, + [AW_H3_DEV_SDRAM] =3D 0x40000000 }; =20 /* List of unimplemented devices */ @@ -183,7 +183,7 @@ void allwinner_h3_bootrom_setup(AwH3State *s, BlockBack= end *blk) } =20 rom_add_blob("allwinner-h3.bootrom", buffer, rom_size, - rom_size, s->memmap[AW_H3_SRAM_A1], + rom_size, s->memmap[AW_H3_DEV_SRAM_A1], NULL, NULL, NULL, NULL, false); } =20 @@ -262,10 +262,10 @@ static void allwinner_h3_realize(DeviceState *dev, Er= ror **errp) qdev_prop_set_bit(DEVICE(&s->gic), "has-virtualization-extensions", tr= ue); sysbus_realize(SYS_BUS_DEVICE(&s->gic), &error_fatal); =20 - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 0, s->memmap[AW_H3_GIC_DIST]); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 1, s->memmap[AW_H3_GIC_CPU]); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 2, s->memmap[AW_H3_GIC_HYP]); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 3, s->memmap[AW_H3_GIC_VCPU]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 0, s->memmap[AW_H3_DEV_GIC_DI= ST]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 1, s->memmap[AW_H3_DEV_GIC_CP= U]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 2, s->memmap[AW_H3_DEV_GIC_HY= P]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 3, s->memmap[AW_H3_DEV_GIC_VC= PU]); =20 /* * Wire the outputs from each CPU's generic timer and the GICv3 @@ -312,7 +312,7 @@ static void allwinner_h3_realize(DeviceState *dev, Erro= r **errp) =20 /* Timer */ sysbus_realize(SYS_BUS_DEVICE(&s->timer), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer), 0, s->memmap[AW_H3_PIT]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer), 0, s->memmap[AW_H3_DEV_PIT]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_TIM= ER0)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer), 1, @@ -325,32 +325,32 @@ static void allwinner_h3_realize(DeviceState *dev, Er= ror **errp) 32 * KiB, &error_abort); memory_region_init_ram(&s->sram_c, OBJECT(dev), "sram C", 44 * KiB, &error_abort); - memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= A1], + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_DEV_S= RAM_A1], &s->sram_a1); - memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= A2], + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_DEV_S= RAM_A2], &s->sram_a2); - memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= C], + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_DEV_S= RAM_C], &s->sram_c); =20 /* Clock Control Unit */ sysbus_realize(SYS_BUS_DEVICE(&s->ccu), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_DEV_CCU]); =20 /* System Control */ sysbus_realize(SYS_BUS_DEVICE(&s->sysctrl), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctrl), 0, s->memmap[AW_H3_SYSCTR= L]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctrl), 0, s->memmap[AW_H3_DEV_SY= SCTRL]); =20 /* CPU Configuration */ sysbus_realize(SYS_BUS_DEVICE(&s->cpucfg), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_CPUCFG]= ); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_DEV_CPU= CFG]); =20 /* Security Identifier */ sysbus_realize(SYS_BUS_DEVICE(&s->sid), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_DEV_SID]); =20 /* SD/MMC */ sysbus_realize(SYS_BUS_DEVICE(&s->mmc0), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, s->memmap[AW_H3_MMC0]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, s->memmap[AW_H3_DEV_MMC0]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_MMC= 0)); =20 @@ -364,63 +364,63 @@ static void allwinner_h3_realize(DeviceState *dev, Er= ror **errp) qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); } sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_EMAC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_DEV_EMAC]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EMA= C)); =20 /* Universal Serial Bus */ - sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_DEV_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EHCI0)); - sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI1], + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_DEV_EHCI1], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EHCI1)); - sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI2], + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_DEV_EHCI2], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EHCI2)); - sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI3], + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_DEV_EHCI3], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EHCI3)); =20 - sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI0], + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_DEV_OHCI0], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_OHCI0)); - sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI1], + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_DEV_OHCI1], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_OHCI1)); - sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI2], + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_DEV_OHCI2], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_OHCI2)); - sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI3], + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_DEV_OHCI3], qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_OHCI3)); =20 /* UART0. For future clocktree API: All UARTS are connected to APB2_CL= K. */ - serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART0], 2, + serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART0], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0), 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); /* UART1 */ - serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART1], 2, + serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART1], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART1), 115200, serial_hd(1), DEVICE_NATIVE_ENDIAN); /* UART2 */ - serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART2], 2, + serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART2], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART2), 115200, serial_hd(2), DEVICE_NATIVE_ENDIAN); /* UART3 */ - serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART3], 2, + serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART3], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART3), 115200, serial_hd(3), DEVICE_NATIVE_ENDIAN); =20 /* DRAMC */ sysbus_realize(SYS_BUS_DEVICE(&s->dramc), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, s->memmap[AW_H3_DRAMCOM]= ); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 1, s->memmap[AW_H3_DRAMCTL]= ); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, s->memmap[AW_H3_DRAMPHY]= ); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, s->memmap[AW_H3_DEV_DRAM= COM]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 1, s->memmap[AW_H3_DEV_DRAM= CTL]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, s->memmap[AW_H3_DEV_DRAM= PHY]); =20 /* RTC */ sysbus_realize(SYS_BUS_DEVICE(&s->rtc), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, s->memmap[AW_H3_RTC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, s->memmap[AW_H3_DEV_RTC]); =20 /* Unimplemented devices */ for (i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 1679468232..17a568a2b4 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -79,7 +79,7 @@ static void orangepi_init(MachineState *machine) object_property_set_int(OBJECT(&h3->emac), "phy-addr", 1, &error_abort= ); =20 /* DRAMC */ - object_property_set_uint(OBJECT(h3), "ram-addr", h3->memmap[AW_H3_SDRA= M], + object_property_set_uint(OBJECT(h3), "ram-addr", h3->memmap[AW_H3_DEV_= SDRAM], &error_abort); object_property_set_int(OBJECT(h3), "ram-size", machine->ram_size / Mi= B, &error_abort); @@ -98,7 +98,7 @@ static void orangepi_init(MachineState *machine) qdev_realize_and_unref(carddev, bus, &error_fatal); =20 /* SDRAM */ - memory_region_add_subregion(get_system_memory(), h3->memmap[AW_H3_SDRA= M], + memory_region_add_subregion(get_system_memory(), h3->memmap[AW_H3_DEV_= SDRAM], machine->ram); =20 /* Load target kernel or start using BootROM */ @@ -106,7 +106,7 @@ static void orangepi_init(MachineState *machine) /* Use Boot ROM to copy data from SD card to SRAM */ allwinner_h3_bootrom_setup(h3, blk); } - orangepi_binfo.loader_start =3D h3->memmap[AW_H3_SDRAM]; + orangepi_binfo.loader_start =3D h3->memmap[AW_H3_DEV_SDRAM]; orangepi_binfo.ram_size =3D machine->ram_size; arm_load_kernel(ARM_CPU(first_cpu), machine, &orangepi_binfo); } --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556416; cv=none; d=zohomail.com; s=zohoarc; b=cuU7+CW7/cRRNInRbbSPEEA/SSLgsMtsuPQ0hg7cYPyGdjHxiYxqecWYvXEJVnjTkiTOpABernS6l40I6nZpKn6tC2a9E94c8Jv7/hKeJy+S39fxbvL6QW3V6EP7sZdxBJJw2wvOuc9wUfDCm5fhaFSZ2xmCHtXKFHKVQzx44UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556416; 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=vMdcVRwhQd9CouGEQ6Nwb6Zou1IpZmtonS7yQKdyIqI=; b=NCC7uVxNcv/YD58/6dc88+5ovzKsmDuFZXC0J7ci6J8pp0CbsG+lGg8OzDOl2/1gRxGvVNiRCVxxwMZclXITpXFSUCHMFJcrUFNPVLoUv49BifqUDEVm4/47AjrPMnxORIwrDg0rhdZaFNgu4qXqfNNLBmb785raothC0yIYf8s= 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 1598556416819831.1523420517249; Thu, 27 Aug 2020 12:26:56 -0700 (PDT) Received: from localhost ([::1]:57758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNXy-0007la-GG for importer@patchew.org; Thu, 27 Aug 2020 15:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTF-0006ev-19 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:01 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22499 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTA-0000NT-Lw for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:00 -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-299-PxMRfwl-Oam7upEgykw6Xw-1; Thu, 27 Aug 2020 15:21:43 -0400 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 24D748018A4; Thu, 27 Aug 2020 19:21:42 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18A2519D61; Thu, 27 Aug 2020 19:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556115; 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=vMdcVRwhQd9CouGEQ6Nwb6Zou1IpZmtonS7yQKdyIqI=; b=QJYR3jzZwbbXb29OFdocAWMZ9u2Qj8wtUEiPdQbj0k+Gu1ZGZEJcUXAT5pNFiU+BVkCnRg uYDlSXMhYd/An6XbmXACVd/zQ1JXEZuGwiIin+AtnTkRnkTkxpLaphOcFTmXxJ+gsnnMRh ka9107j7NnidypWv1kc2e8go7WC6q2A= X-MC-Unique: PxMRfwl-Oam7upEgykw6Xw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/53] aspeed_soc: Rename memmap/irqmap enum constants Date: Thu, 27 Aug 2020 15:20:36 -0400 Message-Id: <20200827192122.658035-8-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some of the enum constant names conflict with the QOM type check macros: ASPEED_GPIO ASPEED_I2C ASPEED_RTC ASPEED_SCU ASPEED_SDHCI ASPEED_SDMC ASPEED_VIC ASPEED_WDT ASPEED_XDMA This needs to be addressed to allow us to transform the QOM type check macros into functions generated by OBJECT_DECLARE_TYPE(). Rename all the constants to ASPEED_DEV_*, to avoid conflicts. Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-7-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/arm/aspeed_soc.h | 92 +++++++-------- hw/arm/aspeed.c | 4 +- hw/arm/aspeed_ast2600.c | 208 ++++++++++++++++---------------- hw/arm/aspeed_soc.c | 228 ++++++++++++++++++------------------ 4 files changed, 266 insertions(+), 266 deletions(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 914115f3ef..d46f197cbe 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -87,52 +87,52 @@ typedef struct AspeedSoCClass { OBJECT_GET_CLASS(AspeedSoCClass, (obj), TYPE_ASPEED_SOC) =20 enum { - ASPEED_IOMEM, - ASPEED_UART1, - ASPEED_UART2, - ASPEED_UART3, - ASPEED_UART4, - ASPEED_UART5, - ASPEED_VUART, - ASPEED_FMC, - ASPEED_SPI1, - ASPEED_SPI2, - ASPEED_EHCI1, - ASPEED_EHCI2, - ASPEED_VIC, - ASPEED_SDMC, - ASPEED_SCU, - ASPEED_ADC, - ASPEED_VIDEO, - ASPEED_SRAM, - ASPEED_SDHCI, - ASPEED_GPIO, - ASPEED_GPIO_1_8V, - ASPEED_RTC, - ASPEED_TIMER1, - ASPEED_TIMER2, - ASPEED_TIMER3, - ASPEED_TIMER4, - ASPEED_TIMER5, - ASPEED_TIMER6, - ASPEED_TIMER7, - ASPEED_TIMER8, - ASPEED_WDT, - ASPEED_PWM, - ASPEED_LPC, - ASPEED_IBT, - ASPEED_I2C, - ASPEED_ETH1, - ASPEED_ETH2, - ASPEED_ETH3, - ASPEED_ETH4, - ASPEED_MII1, - ASPEED_MII2, - ASPEED_MII3, - ASPEED_MII4, - ASPEED_SDRAM, - ASPEED_XDMA, - ASPEED_EMMC, + ASPEED_DEV_IOMEM, + ASPEED_DEV_UART1, + ASPEED_DEV_UART2, + ASPEED_DEV_UART3, + ASPEED_DEV_UART4, + ASPEED_DEV_UART5, + ASPEED_DEV_VUART, + ASPEED_DEV_FMC, + ASPEED_DEV_SPI1, + ASPEED_DEV_SPI2, + ASPEED_DEV_EHCI1, + ASPEED_DEV_EHCI2, + ASPEED_DEV_VIC, + ASPEED_DEV_SDMC, + ASPEED_DEV_SCU, + ASPEED_DEV_ADC, + ASPEED_DEV_VIDEO, + ASPEED_DEV_SRAM, + ASPEED_DEV_SDHCI, + ASPEED_DEV_GPIO, + ASPEED_DEV_GPIO_1_8V, + ASPEED_DEV_RTC, + ASPEED_DEV_TIMER1, + ASPEED_DEV_TIMER2, + ASPEED_DEV_TIMER3, + ASPEED_DEV_TIMER4, + ASPEED_DEV_TIMER5, + ASPEED_DEV_TIMER6, + ASPEED_DEV_TIMER7, + ASPEED_DEV_TIMER8, + ASPEED_DEV_WDT, + ASPEED_DEV_PWM, + ASPEED_DEV_LPC, + ASPEED_DEV_IBT, + ASPEED_DEV_I2C, + ASPEED_DEV_ETH1, + ASPEED_DEV_ETH2, + ASPEED_DEV_ETH3, + ASPEED_DEV_ETH4, + ASPEED_DEV_MII1, + ASPEED_DEV_MII2, + ASPEED_DEV_MII3, + ASPEED_DEV_MII4, + ASPEED_DEV_SDRAM, + ASPEED_DEV_XDMA, + ASPEED_DEV_EMMC, }; =20 #endif /* ASPEED_SOC_H */ diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index fcb1a7cd87..8109cc6d2d 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -309,7 +309,7 @@ static void aspeed_machine_init(MachineState *machine) qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort); =20 memory_region_add_subregion(get_system_memory(), - sc->memmap[ASPEED_SDRAM], + sc->memmap[ASPEED_DEV_SDRAM], &bmc->ram_container); =20 max_ram_size =3D object_property_get_uint(OBJECT(&bmc->soc), "max-ram-= size", @@ -360,7 +360,7 @@ static void aspeed_machine_init(MachineState *machine) } =20 aspeed_board_binfo.ram_size =3D ram_size; - aspeed_board_binfo.loader_start =3D sc->memmap[ASPEED_SDRAM]; + aspeed_board_binfo.loader_start =3D sc->memmap[ASPEED_DEV_SDRAM]; aspeed_board_binfo.nb_cpus =3D sc->num_cpus; =20 if (amc->i2c_init) { diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index 3767f7d8d0..9d95e42143 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -24,43 +24,43 @@ #define ASPEED_SOC_IOMEM_SIZE 0x00200000 =20 static const hwaddr aspeed_soc_ast2600_memmap[] =3D { - [ASPEED_SRAM] =3D 0x10000000, + [ASPEED_DEV_SRAM] =3D 0x10000000, /* 0x16000000 0x17FFFFFF : AHB BUS do LPC Bus bridge */ - [ASPEED_IOMEM] =3D 0x1E600000, - [ASPEED_PWM] =3D 0x1E610000, - [ASPEED_FMC] =3D 0x1E620000, - [ASPEED_SPI1] =3D 0x1E630000, - [ASPEED_SPI2] =3D 0x1E641000, - [ASPEED_EHCI1] =3D 0x1E6A1000, - [ASPEED_EHCI2] =3D 0x1E6A3000, - [ASPEED_MII1] =3D 0x1E650000, - [ASPEED_MII2] =3D 0x1E650008, - [ASPEED_MII3] =3D 0x1E650010, - [ASPEED_MII4] =3D 0x1E650018, - [ASPEED_ETH1] =3D 0x1E660000, - [ASPEED_ETH3] =3D 0x1E670000, - [ASPEED_ETH2] =3D 0x1E680000, - [ASPEED_ETH4] =3D 0x1E690000, - [ASPEED_VIC] =3D 0x1E6C0000, - [ASPEED_SDMC] =3D 0x1E6E0000, - [ASPEED_SCU] =3D 0x1E6E2000, - [ASPEED_XDMA] =3D 0x1E6E7000, - [ASPEED_ADC] =3D 0x1E6E9000, - [ASPEED_VIDEO] =3D 0x1E700000, - [ASPEED_SDHCI] =3D 0x1E740000, - [ASPEED_EMMC] =3D 0x1E750000, - [ASPEED_GPIO] =3D 0x1E780000, - [ASPEED_GPIO_1_8V] =3D 0x1E780800, - [ASPEED_RTC] =3D 0x1E781000, - [ASPEED_TIMER1] =3D 0x1E782000, - [ASPEED_WDT] =3D 0x1E785000, - [ASPEED_LPC] =3D 0x1E789000, - [ASPEED_IBT] =3D 0x1E789140, - [ASPEED_I2C] =3D 0x1E78A000, - [ASPEED_UART1] =3D 0x1E783000, - [ASPEED_UART5] =3D 0x1E784000, - [ASPEED_VUART] =3D 0x1E787000, - [ASPEED_SDRAM] =3D 0x80000000, + [ASPEED_DEV_IOMEM] =3D 0x1E600000, + [ASPEED_DEV_PWM] =3D 0x1E610000, + [ASPEED_DEV_FMC] =3D 0x1E620000, + [ASPEED_DEV_SPI1] =3D 0x1E630000, + [ASPEED_DEV_SPI2] =3D 0x1E641000, + [ASPEED_DEV_EHCI1] =3D 0x1E6A1000, + [ASPEED_DEV_EHCI2] =3D 0x1E6A3000, + [ASPEED_DEV_MII1] =3D 0x1E650000, + [ASPEED_DEV_MII2] =3D 0x1E650008, + [ASPEED_DEV_MII3] =3D 0x1E650010, + [ASPEED_DEV_MII4] =3D 0x1E650018, + [ASPEED_DEV_ETH1] =3D 0x1E660000, + [ASPEED_DEV_ETH3] =3D 0x1E670000, + [ASPEED_DEV_ETH2] =3D 0x1E680000, + [ASPEED_DEV_ETH4] =3D 0x1E690000, + [ASPEED_DEV_VIC] =3D 0x1E6C0000, + [ASPEED_DEV_SDMC] =3D 0x1E6E0000, + [ASPEED_DEV_SCU] =3D 0x1E6E2000, + [ASPEED_DEV_XDMA] =3D 0x1E6E7000, + [ASPEED_DEV_ADC] =3D 0x1E6E9000, + [ASPEED_DEV_VIDEO] =3D 0x1E700000, + [ASPEED_DEV_SDHCI] =3D 0x1E740000, + [ASPEED_DEV_EMMC] =3D 0x1E750000, + [ASPEED_DEV_GPIO] =3D 0x1E780000, + [ASPEED_DEV_GPIO_1_8V] =3D 0x1E780800, + [ASPEED_DEV_RTC] =3D 0x1E781000, + [ASPEED_DEV_TIMER1] =3D 0x1E782000, + [ASPEED_DEV_WDT] =3D 0x1E785000, + [ASPEED_DEV_LPC] =3D 0x1E789000, + [ASPEED_DEV_IBT] =3D 0x1E789140, + [ASPEED_DEV_I2C] =3D 0x1E78A000, + [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART5] =3D 0x1E784000, + [ASPEED_DEV_VUART] =3D 0x1E787000, + [ASPEED_DEV_SDRAM] =3D 0x80000000, }; =20 #define ASPEED_A7MPCORE_ADDR 0x40460000 @@ -69,41 +69,41 @@ static const hwaddr aspeed_soc_ast2600_memmap[] =3D { =20 /* Shared Peripheral Interrupt values below are offset by -32 from datashe= et */ static const int aspeed_soc_ast2600_irqmap[] =3D { - [ASPEED_UART1] =3D 47, - [ASPEED_UART2] =3D 48, - [ASPEED_UART3] =3D 49, - [ASPEED_UART4] =3D 50, - [ASPEED_UART5] =3D 8, - [ASPEED_VUART] =3D 8, - [ASPEED_FMC] =3D 39, - [ASPEED_SDMC] =3D 0, - [ASPEED_SCU] =3D 12, - [ASPEED_ADC] =3D 78, - [ASPEED_XDMA] =3D 6, - [ASPEED_SDHCI] =3D 43, - [ASPEED_EHCI1] =3D 5, - [ASPEED_EHCI2] =3D 9, - [ASPEED_EMMC] =3D 15, - [ASPEED_GPIO] =3D 40, - [ASPEED_GPIO_1_8V] =3D 11, - [ASPEED_RTC] =3D 13, - [ASPEED_TIMER1] =3D 16, - [ASPEED_TIMER2] =3D 17, - [ASPEED_TIMER3] =3D 18, - [ASPEED_TIMER4] =3D 19, - [ASPEED_TIMER5] =3D 20, - [ASPEED_TIMER6] =3D 21, - [ASPEED_TIMER7] =3D 22, - [ASPEED_TIMER8] =3D 23, - [ASPEED_WDT] =3D 24, - [ASPEED_PWM] =3D 44, - [ASPEED_LPC] =3D 35, - [ASPEED_IBT] =3D 35, /* LPC */ - [ASPEED_I2C] =3D 110, /* 110 -> 125 */ - [ASPEED_ETH1] =3D 2, - [ASPEED_ETH2] =3D 3, - [ASPEED_ETH3] =3D 32, - [ASPEED_ETH4] =3D 33, + [ASPEED_DEV_UART1] =3D 47, + [ASPEED_DEV_UART2] =3D 48, + [ASPEED_DEV_UART3] =3D 49, + [ASPEED_DEV_UART4] =3D 50, + [ASPEED_DEV_UART5] =3D 8, + [ASPEED_DEV_VUART] =3D 8, + [ASPEED_DEV_FMC] =3D 39, + [ASPEED_DEV_SDMC] =3D 0, + [ASPEED_DEV_SCU] =3D 12, + [ASPEED_DEV_ADC] =3D 78, + [ASPEED_DEV_XDMA] =3D 6, + [ASPEED_DEV_SDHCI] =3D 43, + [ASPEED_DEV_EHCI1] =3D 5, + [ASPEED_DEV_EHCI2] =3D 9, + [ASPEED_DEV_EMMC] =3D 15, + [ASPEED_DEV_GPIO] =3D 40, + [ASPEED_DEV_GPIO_1_8V] =3D 11, + [ASPEED_DEV_RTC] =3D 13, + [ASPEED_DEV_TIMER1] =3D 16, + [ASPEED_DEV_TIMER2] =3D 17, + [ASPEED_DEV_TIMER3] =3D 18, + [ASPEED_DEV_TIMER4] =3D 19, + [ASPEED_DEV_TIMER5] =3D 20, + [ASPEED_DEV_TIMER6] =3D 21, + [ASPEED_DEV_TIMER7] =3D 22, + [ASPEED_DEV_TIMER8] =3D 23, + [ASPEED_DEV_WDT] =3D 24, + [ASPEED_DEV_PWM] =3D 44, + [ASPEED_DEV_LPC] =3D 35, + [ASPEED_DEV_IBT] =3D 35, /* LPC */ + [ASPEED_DEV_I2C] =3D 110, /* 110 -> 125 */ + [ASPEED_DEV_ETH1] =3D 2, + [ASPEED_DEV_ETH2] =3D 3, + [ASPEED_DEV_ETH3] =3D 32, + [ASPEED_DEV_ETH4] =3D 33, =20 }; =20 @@ -232,11 +232,11 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) qemu_irq irq; =20 /* IO space */ - create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], + create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_DEV_IOM= EM], ASPEED_SOC_IOMEM_SIZE); =20 /* Video engine stub */ - create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO], + create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_DEV_VIDE= O], 0x1000); =20 /* CPU */ @@ -295,21 +295,21 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) return; } memory_region_add_subregion(get_system_memory(), - sc->memmap[ASPEED_SRAM], &s->sram); + sc->memmap[ASPEED_DEV_SRAM], &s->sram); =20 /* SCU */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_SCU]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]= ); =20 /* RTC */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->rtc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->memmap[ASPEED_RTC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->memmap[ASPEED_DEV_RTC]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, - aspeed_soc_get_irq(s, ASPEED_RTC)); + aspeed_soc_get_irq(s, ASPEED_DEV_RTC)); =20 /* Timer */ object_property_set_link(OBJECT(&s->timerctrl), "scu", OBJECT(&s->scu), @@ -318,16 +318,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->timerctrl), 0, - sc->memmap[ASPEED_TIMER1]); + sc->memmap[ASPEED_DEV_TIMER1]); for (i =3D 0; i < ASPEED_TIMER_NR_TIMERS; i++) { - qemu_irq irq =3D aspeed_soc_get_irq(s, ASPEED_TIMER1 + i); + qemu_irq irq =3D aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq); } =20 /* UART - attach an 8250 to the IO space as our UART5 */ if (serial_hd(0)) { - qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_UART5); - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_UART5], 2, + qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_DEV_UART5); + serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], = 2, uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); } =20 @@ -337,10 +337,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_I2C]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_DEV_I2C]= ); for (i =3D 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) { qemu_irq irq =3D qdev_get_gpio_in(DEVICE(&s->a7mpcore), - sc->irqmap[ASPEED_I2C] + i); + sc->irqmap[ASPEED_DEV_I2C] + i); /* * The AST2600 SoC has one IRQ per I2C bus. Skip the common * IRQ (AST2400 and AST2500) and connect all bussses. @@ -352,17 +352,17 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr), &error_abort); if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base", - sc->memmap[ASPEED_SDRAM], errp)) { + sc->memmap[ASPEED_DEV_SDRAM], errp)) { return; } if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_FMC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]= ); sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 1, s->fmc.ctrl->flash_window_base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, - aspeed_soc_get_irq(s, ASPEED_FMC)); + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); =20 /* SPI */ for (i =3D 0; i < sc->spis_num; i++) { @@ -373,7 +373,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev= , Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, - sc->memmap[ASPEED_SPI1 + i]); + sc->memmap[ASPEED_DEV_SPI1 + i]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 1, s->spi[i].ctrl->flash_window_base); } @@ -384,16 +384,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, - sc->memmap[ASPEED_EHCI1 + i]); + sc->memmap[ASPEED_DEV_EHCI1 + i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, - aspeed_soc_get_irq(s, ASPEED_EHCI1 + i)); + aspeed_soc_get_irq(s, ASPEED_DEV_EHCI1 + i)); } =20 /* SDMC - SDRAM Memory Controller */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, sc->memmap[ASPEED_SDMC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, sc->memmap[ASPEED_DEV_SDM= C]); =20 /* Watch dog */ for (i =3D 0; i < sc->wdts_num; i++) { @@ -405,7 +405,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev= , Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, - sc->memmap[ASPEED_WDT] + i * awc->offset); + sc->memmap[ASPEED_DEV_WDT] + i * awc->offset); } =20 /* Net */ @@ -416,9 +416,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev= , Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, - sc->memmap[ASPEED_ETH1 + i]); + sc->memmap[ASPEED_DEV_ETH1 + i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, - aspeed_soc_get_irq(s, ASPEED_ETH1 + i)); + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 + i)); =20 object_property_set_link(OBJECT(&s->mii[i]), "nic", OBJECT(&s->ftgmac100[i]), &error_abort); @@ -427,7 +427,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev= , Error **errp) } =20 sysbus_mmio_map(SYS_BUS_DEVICE(&s->mii[i]), 0, - sc->memmap[ASPEED_MII1 + i]); + sc->memmap[ASPEED_DEV_MII1 + i]); } =20 /* XDMA */ @@ -435,42 +435,42 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->xdma), 0, - sc->memmap[ASPEED_XDMA]); + sc->memmap[ASPEED_DEV_XDMA]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0, - aspeed_soc_get_irq(s, ASPEED_XDMA)); + aspeed_soc_get_irq(s, ASPEED_DEV_XDMA)); =20 /* GPIO */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_GPIO]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_DEV_GPI= O]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0, - aspeed_soc_get_irq(s, ASPEED_GPIO)); + aspeed_soc_get_irq(s, ASPEED_DEV_GPIO)); =20 if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio_1_8v), errp)) { return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio_1_8v), 0, - sc->memmap[ASPEED_GPIO_1_8V]); + sc->memmap[ASPEED_DEV_GPIO_1_8V]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio_1_8v), 0, - aspeed_soc_get_irq(s, ASPEED_GPIO_1_8V)); + aspeed_soc_get_irq(s, ASPEED_DEV_GPIO_1_8V)); =20 /* SDHCI */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdhci), errp)) { return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci), 0, - sc->memmap[ASPEED_SDHCI]); + sc->memmap[ASPEED_DEV_SDHCI]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0, - aspeed_soc_get_irq(s, ASPEED_SDHCI)); + aspeed_soc_get_irq(s, ASPEED_DEV_SDHCI)); =20 /* eMMC */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->emmc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->emmc), 0, sc->memmap[ASPEED_EMMC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->emmc), 0, sc->memmap[ASPEED_DEV_EMM= C]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->emmc), 0, - aspeed_soc_get_irq(s, ASPEED_EMMC)); + aspeed_soc_get_irq(s, ASPEED_DEV_EMMC)); } =20 static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index a1a8684216..35be126db6 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -27,97 +27,97 @@ #define ASPEED_SOC_IOMEM_SIZE 0x00200000 =20 static const hwaddr aspeed_soc_ast2400_memmap[] =3D { - [ASPEED_IOMEM] =3D 0x1E600000, - [ASPEED_FMC] =3D 0x1E620000, - [ASPEED_SPI1] =3D 0x1E630000, - [ASPEED_EHCI1] =3D 0x1E6A1000, - [ASPEED_VIC] =3D 0x1E6C0000, - [ASPEED_SDMC] =3D 0x1E6E0000, - [ASPEED_SCU] =3D 0x1E6E2000, - [ASPEED_XDMA] =3D 0x1E6E7000, - [ASPEED_VIDEO] =3D 0x1E700000, - [ASPEED_ADC] =3D 0x1E6E9000, - [ASPEED_SRAM] =3D 0x1E720000, - [ASPEED_SDHCI] =3D 0x1E740000, - [ASPEED_GPIO] =3D 0x1E780000, - [ASPEED_RTC] =3D 0x1E781000, - [ASPEED_TIMER1] =3D 0x1E782000, - [ASPEED_WDT] =3D 0x1E785000, - [ASPEED_PWM] =3D 0x1E786000, - [ASPEED_LPC] =3D 0x1E789000, - [ASPEED_IBT] =3D 0x1E789140, - [ASPEED_I2C] =3D 0x1E78A000, - [ASPEED_ETH1] =3D 0x1E660000, - [ASPEED_ETH2] =3D 0x1E680000, - [ASPEED_UART1] =3D 0x1E783000, - [ASPEED_UART5] =3D 0x1E784000, - [ASPEED_VUART] =3D 0x1E787000, - [ASPEED_SDRAM] =3D 0x40000000, + [ASPEED_DEV_IOMEM] =3D 0x1E600000, + [ASPEED_DEV_FMC] =3D 0x1E620000, + [ASPEED_DEV_SPI1] =3D 0x1E630000, + [ASPEED_DEV_EHCI1] =3D 0x1E6A1000, + [ASPEED_DEV_VIC] =3D 0x1E6C0000, + [ASPEED_DEV_SDMC] =3D 0x1E6E0000, + [ASPEED_DEV_SCU] =3D 0x1E6E2000, + [ASPEED_DEV_XDMA] =3D 0x1E6E7000, + [ASPEED_DEV_VIDEO] =3D 0x1E700000, + [ASPEED_DEV_ADC] =3D 0x1E6E9000, + [ASPEED_DEV_SRAM] =3D 0x1E720000, + [ASPEED_DEV_SDHCI] =3D 0x1E740000, + [ASPEED_DEV_GPIO] =3D 0x1E780000, + [ASPEED_DEV_RTC] =3D 0x1E781000, + [ASPEED_DEV_TIMER1] =3D 0x1E782000, + [ASPEED_DEV_WDT] =3D 0x1E785000, + [ASPEED_DEV_PWM] =3D 0x1E786000, + [ASPEED_DEV_LPC] =3D 0x1E789000, + [ASPEED_DEV_IBT] =3D 0x1E789140, + [ASPEED_DEV_I2C] =3D 0x1E78A000, + [ASPEED_DEV_ETH1] =3D 0x1E660000, + [ASPEED_DEV_ETH2] =3D 0x1E680000, + [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART5] =3D 0x1E784000, + [ASPEED_DEV_VUART] =3D 0x1E787000, + [ASPEED_DEV_SDRAM] =3D 0x40000000, }; =20 static const hwaddr aspeed_soc_ast2500_memmap[] =3D { - [ASPEED_IOMEM] =3D 0x1E600000, - [ASPEED_FMC] =3D 0x1E620000, - [ASPEED_SPI1] =3D 0x1E630000, - [ASPEED_SPI2] =3D 0x1E631000, - [ASPEED_EHCI1] =3D 0x1E6A1000, - [ASPEED_EHCI2] =3D 0x1E6A3000, - [ASPEED_VIC] =3D 0x1E6C0000, - [ASPEED_SDMC] =3D 0x1E6E0000, - [ASPEED_SCU] =3D 0x1E6E2000, - [ASPEED_XDMA] =3D 0x1E6E7000, - [ASPEED_ADC] =3D 0x1E6E9000, - [ASPEED_VIDEO] =3D 0x1E700000, - [ASPEED_SRAM] =3D 0x1E720000, - [ASPEED_SDHCI] =3D 0x1E740000, - [ASPEED_GPIO] =3D 0x1E780000, - [ASPEED_RTC] =3D 0x1E781000, - [ASPEED_TIMER1] =3D 0x1E782000, - [ASPEED_WDT] =3D 0x1E785000, - [ASPEED_PWM] =3D 0x1E786000, - [ASPEED_LPC] =3D 0x1E789000, - [ASPEED_IBT] =3D 0x1E789140, - [ASPEED_I2C] =3D 0x1E78A000, - [ASPEED_ETH1] =3D 0x1E660000, - [ASPEED_ETH2] =3D 0x1E680000, - [ASPEED_UART1] =3D 0x1E783000, - [ASPEED_UART5] =3D 0x1E784000, - [ASPEED_VUART] =3D 0x1E787000, - [ASPEED_SDRAM] =3D 0x80000000, + [ASPEED_DEV_IOMEM] =3D 0x1E600000, + [ASPEED_DEV_FMC] =3D 0x1E620000, + [ASPEED_DEV_SPI1] =3D 0x1E630000, + [ASPEED_DEV_SPI2] =3D 0x1E631000, + [ASPEED_DEV_EHCI1] =3D 0x1E6A1000, + [ASPEED_DEV_EHCI2] =3D 0x1E6A3000, + [ASPEED_DEV_VIC] =3D 0x1E6C0000, + [ASPEED_DEV_SDMC] =3D 0x1E6E0000, + [ASPEED_DEV_SCU] =3D 0x1E6E2000, + [ASPEED_DEV_XDMA] =3D 0x1E6E7000, + [ASPEED_DEV_ADC] =3D 0x1E6E9000, + [ASPEED_DEV_VIDEO] =3D 0x1E700000, + [ASPEED_DEV_SRAM] =3D 0x1E720000, + [ASPEED_DEV_SDHCI] =3D 0x1E740000, + [ASPEED_DEV_GPIO] =3D 0x1E780000, + [ASPEED_DEV_RTC] =3D 0x1E781000, + [ASPEED_DEV_TIMER1] =3D 0x1E782000, + [ASPEED_DEV_WDT] =3D 0x1E785000, + [ASPEED_DEV_PWM] =3D 0x1E786000, + [ASPEED_DEV_LPC] =3D 0x1E789000, + [ASPEED_DEV_IBT] =3D 0x1E789140, + [ASPEED_DEV_I2C] =3D 0x1E78A000, + [ASPEED_DEV_ETH1] =3D 0x1E660000, + [ASPEED_DEV_ETH2] =3D 0x1E680000, + [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART5] =3D 0x1E784000, + [ASPEED_DEV_VUART] =3D 0x1E787000, + [ASPEED_DEV_SDRAM] =3D 0x80000000, }; =20 static const int aspeed_soc_ast2400_irqmap[] =3D { - [ASPEED_UART1] =3D 9, - [ASPEED_UART2] =3D 32, - [ASPEED_UART3] =3D 33, - [ASPEED_UART4] =3D 34, - [ASPEED_UART5] =3D 10, - [ASPEED_VUART] =3D 8, - [ASPEED_FMC] =3D 19, - [ASPEED_EHCI1] =3D 5, - [ASPEED_EHCI2] =3D 13, - [ASPEED_SDMC] =3D 0, - [ASPEED_SCU] =3D 21, - [ASPEED_ADC] =3D 31, - [ASPEED_GPIO] =3D 20, - [ASPEED_RTC] =3D 22, - [ASPEED_TIMER1] =3D 16, - [ASPEED_TIMER2] =3D 17, - [ASPEED_TIMER3] =3D 18, - [ASPEED_TIMER4] =3D 35, - [ASPEED_TIMER5] =3D 36, - [ASPEED_TIMER6] =3D 37, - [ASPEED_TIMER7] =3D 38, - [ASPEED_TIMER8] =3D 39, - [ASPEED_WDT] =3D 27, - [ASPEED_PWM] =3D 28, - [ASPEED_LPC] =3D 8, - [ASPEED_IBT] =3D 8, /* LPC */ - [ASPEED_I2C] =3D 12, - [ASPEED_ETH1] =3D 2, - [ASPEED_ETH2] =3D 3, - [ASPEED_XDMA] =3D 6, - [ASPEED_SDHCI] =3D 26, + [ASPEED_DEV_UART1] =3D 9, + [ASPEED_DEV_UART2] =3D 32, + [ASPEED_DEV_UART3] =3D 33, + [ASPEED_DEV_UART4] =3D 34, + [ASPEED_DEV_UART5] =3D 10, + [ASPEED_DEV_VUART] =3D 8, + [ASPEED_DEV_FMC] =3D 19, + [ASPEED_DEV_EHCI1] =3D 5, + [ASPEED_DEV_EHCI2] =3D 13, + [ASPEED_DEV_SDMC] =3D 0, + [ASPEED_DEV_SCU] =3D 21, + [ASPEED_DEV_ADC] =3D 31, + [ASPEED_DEV_GPIO] =3D 20, + [ASPEED_DEV_RTC] =3D 22, + [ASPEED_DEV_TIMER1] =3D 16, + [ASPEED_DEV_TIMER2] =3D 17, + [ASPEED_DEV_TIMER3] =3D 18, + [ASPEED_DEV_TIMER4] =3D 35, + [ASPEED_DEV_TIMER5] =3D 36, + [ASPEED_DEV_TIMER6] =3D 37, + [ASPEED_DEV_TIMER7] =3D 38, + [ASPEED_DEV_TIMER8] =3D 39, + [ASPEED_DEV_WDT] =3D 27, + [ASPEED_DEV_PWM] =3D 28, + [ASPEED_DEV_LPC] =3D 8, + [ASPEED_DEV_IBT] =3D 8, /* LPC */ + [ASPEED_DEV_I2C] =3D 12, + [ASPEED_DEV_ETH1] =3D 2, + [ASPEED_DEV_ETH2] =3D 3, + [ASPEED_DEV_XDMA] =3D 6, + [ASPEED_DEV_SDHCI] =3D 26, }; =20 #define aspeed_soc_ast2500_irqmap aspeed_soc_ast2400_irqmap @@ -221,11 +221,11 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) Error *err =3D NULL; =20 /* IO space */ - create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], + create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_DEV_IOM= EM], ASPEED_SOC_IOMEM_SIZE); =20 /* Video engine stub */ - create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO], + create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_DEV_VIDE= O], 0x1000); =20 /* CPU */ @@ -243,19 +243,19 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) return; } memory_region_add_subregion(get_system_memory(), - sc->memmap[ASPEED_SRAM], &s->sram); + sc->memmap[ASPEED_DEV_SRAM], &s->sram); =20 /* SCU */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_SCU]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]= ); =20 /* VIC */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->vic), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->vic), 0, sc->memmap[ASPEED_VIC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->vic), 0, sc->memmap[ASPEED_DEV_VIC]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 0, qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 1, @@ -265,9 +265,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error = **errp) if (!sysbus_realize(SYS_BUS_DEVICE(&s->rtc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->memmap[ASPEED_RTC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->memmap[ASPEED_DEV_RTC]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, - aspeed_soc_get_irq(s, ASPEED_RTC)); + aspeed_soc_get_irq(s, ASPEED_DEV_RTC)); =20 /* Timer */ object_property_set_link(OBJECT(&s->timerctrl), "scu", OBJECT(&s->scu), @@ -276,16 +276,16 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->timerctrl), 0, - sc->memmap[ASPEED_TIMER1]); + sc->memmap[ASPEED_DEV_TIMER1]); for (i =3D 0; i < ASPEED_TIMER_NR_TIMERS; i++) { - qemu_irq irq =3D aspeed_soc_get_irq(s, ASPEED_TIMER1 + i); + qemu_irq irq =3D aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq); } =20 /* UART - attach an 8250 to the IO space as our UART5 */ if (serial_hd(0)) { - qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_UART5); - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_UART5], 2, + qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_DEV_UART5); + serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], = 2, uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); } =20 @@ -295,25 +295,25 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_I2C]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_DEV_I2C]= ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c), 0, - aspeed_soc_get_irq(s, ASPEED_I2C)); + aspeed_soc_get_irq(s, ASPEED_DEV_I2C)); =20 /* FMC, The number of CS is set at the board level */ object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr), &error_abort); if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base", - sc->memmap[ASPEED_SDRAM], errp)) { + sc->memmap[ASPEED_DEV_SDRAM], errp)) { return; } if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_FMC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]= ); sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 1, s->fmc.ctrl->flash_window_base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, - aspeed_soc_get_irq(s, ASPEED_FMC)); + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); =20 /* SPI */ for (i =3D 0; i < sc->spis_num; i++) { @@ -322,7 +322,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error = **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, - sc->memmap[ASPEED_SPI1 + i]); + sc->memmap[ASPEED_DEV_SPI1 + i]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 1, s->spi[i].ctrl->flash_window_base); } @@ -333,16 +333,16 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, - sc->memmap[ASPEED_EHCI1 + i]); + sc->memmap[ASPEED_DEV_EHCI1 + i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, - aspeed_soc_get_irq(s, ASPEED_EHCI1 + i)); + aspeed_soc_get_irq(s, ASPEED_DEV_EHCI1 + i)); } =20 /* SDMC - SDRAM Memory Controller */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, sc->memmap[ASPEED_SDMC]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, sc->memmap[ASPEED_DEV_SDM= C]); =20 /* Watch dog */ for (i =3D 0; i < sc->wdts_num; i++) { @@ -354,7 +354,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error = **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, - sc->memmap[ASPEED_WDT] + i * awc->offset); + sc->memmap[ASPEED_DEV_WDT] + i * awc->offset); } =20 /* Net */ @@ -365,9 +365,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error = **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, - sc->memmap[ASPEED_ETH1 + i]); + sc->memmap[ASPEED_DEV_ETH1 + i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, - aspeed_soc_get_irq(s, ASPEED_ETH1 + i)); + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 + i)); } =20 /* XDMA */ @@ -375,26 +375,26 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->xdma), 0, - sc->memmap[ASPEED_XDMA]); + sc->memmap[ASPEED_DEV_XDMA]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0, - aspeed_soc_get_irq(s, ASPEED_XDMA)); + aspeed_soc_get_irq(s, ASPEED_DEV_XDMA)); =20 /* GPIO */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_GPIO]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_DEV_GPI= O]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0, - aspeed_soc_get_irq(s, ASPEED_GPIO)); + aspeed_soc_get_irq(s, ASPEED_DEV_GPIO)); =20 /* SDHCI */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdhci), errp)) { return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci), 0, - sc->memmap[ASPEED_SDHCI]); + sc->memmap[ASPEED_DEV_SDHCI]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0, - aspeed_soc_get_irq(s, ASPEED_SDHCI)); + aspeed_soc_get_irq(s, ASPEED_DEV_SDHCI)); } static Property aspeed_soc_properties[] =3D { DEFINE_PROP_LINK("dram", AspeedSoCState, dram_mr, TYPE_MEMORY_REGION, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556495; cv=none; d=zohomail.com; s=zohoarc; b=G3EgC2ovKllitF8S9Ol4Fqg0yDXA13y7pTNTQcdOzRWLqSjZK0VMfbSUBopPbYtSGdapk3BWypckXrQZqmX7PJh6svceQHxPp+UB//yRajIKHEQQuNNFgEZn/Z+6PNfCahLGWqex12pgrA9F/R+q6KMEu6cpGr0lZ19cdceI/Fs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556495; 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=lNzykSHfQCEIpFJ5XM0092y7W6KXjPRMMDAtUoYUgf4=; b=hKiAx1sNy46feqtPA1TTp+wVE7+oyay69U8I6CixJ4+EDQ1mS3fVsIjKVHyHer7Y1lp5LtD5AwMOUJLsS+WfJ6lkzXvAlPE3Ucnsk7wL+yhnjPujpyGWlVg97a4ck/CjQTjeaX126180NUM8hfU8r9iaN1Ma6fy+JBePgj4ptfo= 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 1598556495238887.379383100222; Thu, 27 Aug 2020 12:28:15 -0700 (PDT) Received: from localhost ([::1]:36448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNZF-0002Dc-RM for importer@patchew.org; Thu, 27 Aug 2020 15:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNT9-0006Tc-QH for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38984 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNT1-0000Mh-8J for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:55 -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-152-wSMRzwu7O8iWm1Q9aYmmKg-1; Thu, 27 Aug 2020 15:21:44 -0400 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 4154A802B6B; Thu, 27 Aug 2020 19:21:43 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC820196F3; Thu, 27 Aug 2020 19:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556106; 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=lNzykSHfQCEIpFJ5XM0092y7W6KXjPRMMDAtUoYUgf4=; b=EID4PErtMaqb2Tln0RSD9gK65bSY89YpHU2b8uDz6p1hNrheuCQIufTb6etIx8ItYCW8ki Jo6OcIZZN09TjeN5bD+v65uxDBLlKxealf+f0qLNq9qvBgfjYXepzbnRCZOQ9P+zmEKkF9 tJxQ2zrRJdMjhIDM4mifkPkj1NxPQRg= X-MC-Unique: wSMRzwu7O8iWm1Q9aYmmKg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/53] opentitan: Rename memmap enum constants Date: Thu, 27 Aug 2020 15:20:37 -0400 Message-Id: <20200827192122.658035-9-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Alistair Francis , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some of the enum constant names conflict with the QOM type check macros (IBEX_PLIC, IBEX_UART). This needs to be addressed to allow us to transform the QOM type check macros into functions generated by OBJECT_DECLARE_TYPE(). Rename all the constants to IBEX_DEV_*, to avoid conflicts. Reviewed-by: Alistair Francis Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-8-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/riscv/opentitan.h | 38 ++++++++-------- hw/riscv/opentitan.c | 84 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h index 8f29b9cbbf..835a80f896 100644 --- a/include/hw/riscv/opentitan.h +++ b/include/hw/riscv/opentitan.h @@ -49,25 +49,25 @@ typedef struct OpenTitanState { } OpenTitanState; =20 enum { - IBEX_ROM, - IBEX_RAM, - IBEX_FLASH, - IBEX_UART, - IBEX_GPIO, - IBEX_SPI, - IBEX_FLASH_CTRL, - IBEX_RV_TIMER, - IBEX_AES, - IBEX_HMAC, - IBEX_PLIC, - IBEX_PWRMGR, - IBEX_RSTMGR, - IBEX_CLKMGR, - IBEX_PINMUX, - IBEX_ALERT_HANDLER, - IBEX_NMI_GEN, - IBEX_USBDEV, - IBEX_PADCTRL, + IBEX_DEV_ROM, + IBEX_DEV_RAM, + IBEX_DEV_FLASH, + IBEX_DEV_UART, + IBEX_DEV_GPIO, + IBEX_DEV_SPI, + IBEX_DEV_FLASH_CTRL, + IBEX_DEV_RV_TIMER, + IBEX_DEV_AES, + IBEX_DEV_HMAC, + IBEX_DEV_PLIC, + IBEX_DEV_PWRMGR, + IBEX_DEV_RSTMGR, + IBEX_DEV_CLKMGR, + IBEX_DEV_PINMUX, + IBEX_DEV_ALERT_HANDLER, + IBEX_DEV_NMI_GEN, + IBEX_DEV_USBDEV, + IBEX_DEV_PADCTRL, }; =20 enum { diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index a8f0039e51..23ba3b4bfc 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -32,25 +32,25 @@ static const struct MemmapEntry { hwaddr base; hwaddr size; } ibex_memmap[] =3D { - [IBEX_ROM] =3D { 0x00008000, 16 * KiB }, - [IBEX_RAM] =3D { 0x10000000, 0x10000 }, - [IBEX_FLASH] =3D { 0x20000000, 0x80000 }, - [IBEX_UART] =3D { 0x40000000, 0x10000 }, - [IBEX_GPIO] =3D { 0x40010000, 0x10000 }, - [IBEX_SPI] =3D { 0x40020000, 0x10000 }, - [IBEX_FLASH_CTRL] =3D { 0x40030000, 0x10000 }, - [IBEX_PINMUX] =3D { 0x40070000, 0x10000 }, - [IBEX_RV_TIMER] =3D { 0x40080000, 0x10000 }, - [IBEX_PLIC] =3D { 0x40090000, 0x10000 }, - [IBEX_PWRMGR] =3D { 0x400A0000, 0x10000 }, - [IBEX_RSTMGR] =3D { 0x400B0000, 0x10000 }, - [IBEX_CLKMGR] =3D { 0x400C0000, 0x10000 }, - [IBEX_AES] =3D { 0x40110000, 0x10000 }, - [IBEX_HMAC] =3D { 0x40120000, 0x10000 }, - [IBEX_ALERT_HANDLER] =3D { 0x40130000, 0x10000 }, - [IBEX_NMI_GEN] =3D { 0x40140000, 0x10000 }, - [IBEX_USBDEV] =3D { 0x40150000, 0x10000 }, - [IBEX_PADCTRL] =3D { 0x40160000, 0x10000 } + [IBEX_DEV_ROM] =3D { 0x00008000, 16 * KiB }, + [IBEX_DEV_RAM] =3D { 0x10000000, 0x10000 }, + [IBEX_DEV_FLASH] =3D { 0x20000000, 0x80000 }, + [IBEX_DEV_UART] =3D { 0x40000000, 0x10000 }, + [IBEX_DEV_GPIO] =3D { 0x40010000, 0x10000 }, + [IBEX_DEV_SPI] =3D { 0x40020000, 0x10000 }, + [IBEX_DEV_FLASH_CTRL] =3D { 0x40030000, 0x10000 }, + [IBEX_DEV_PINMUX] =3D { 0x40070000, 0x10000 }, + [IBEX_DEV_RV_TIMER] =3D { 0x40080000, 0x10000 }, + [IBEX_DEV_PLIC] =3D { 0x40090000, 0x10000 }, + [IBEX_DEV_PWRMGR] =3D { 0x400A0000, 0x10000 }, + [IBEX_DEV_RSTMGR] =3D { 0x400B0000, 0x10000 }, + [IBEX_DEV_CLKMGR] =3D { 0x400C0000, 0x10000 }, + [IBEX_DEV_AES] =3D { 0x40110000, 0x10000 }, + [IBEX_DEV_HMAC] =3D { 0x40120000, 0x10000 }, + [IBEX_DEV_ALERT_HANDLER] =3D { 0x40130000, 0x10000 }, + [IBEX_DEV_NMI_GEN] =3D { 0x40140000, 0x10000 }, + [IBEX_DEV_USBDEV] =3D { 0x40150000, 0x10000 }, + [IBEX_DEV_PADCTRL] =3D { 0x40160000, 0x10000 } }; =20 static void opentitan_board_init(MachineState *machine) @@ -66,12 +66,12 @@ static void opentitan_board_init(MachineState *machine) qdev_realize(DEVICE(&s->soc), NULL, &error_abort); =20 memory_region_init_ram(main_mem, NULL, "riscv.lowrisc.ibex.ram", - memmap[IBEX_RAM].size, &error_fatal); + memmap[IBEX_DEV_RAM].size, &error_fatal); memory_region_add_subregion(sys_mem, - memmap[IBEX_RAM].base, main_mem); + memmap[IBEX_DEV_RAM].base, main_mem); =20 if (machine->firmware) { - riscv_load_firmware(machine->firmware, memmap[IBEX_RAM].base, NULL= ); + riscv_load_firmware(machine->firmware, memmap[IBEX_DEV_RAM].base, = NULL); } =20 if (machine->kernel_filename) { @@ -115,28 +115,28 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev= _soc, Error **errp) =20 /* Boot ROM */ memory_region_init_rom(&s->rom, OBJECT(dev_soc), "riscv.lowrisc.ibex.r= om", - memmap[IBEX_ROM].size, &error_fatal); + memmap[IBEX_DEV_ROM].size, &error_fatal); memory_region_add_subregion(sys_mem, - memmap[IBEX_ROM].base, &s->rom); + memmap[IBEX_DEV_ROM].base, &s->rom); =20 /* Flash memory */ memory_region_init_rom(&s->flash_mem, OBJECT(dev_soc), "riscv.lowrisc.= ibex.flash", - memmap[IBEX_FLASH].size, &error_fatal); - memory_region_add_subregion(sys_mem, memmap[IBEX_FLASH].base, + memmap[IBEX_DEV_FLASH].size, &error_fatal); + memory_region_add_subregion(sys_mem, memmap[IBEX_DEV_FLASH].base, &s->flash_mem); =20 /* PLIC */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->plic), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->plic), 0, memmap[IBEX_PLIC].base); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->plic), 0, memmap[IBEX_DEV_PLIC].bas= e); =20 /* UART */ qdev_prop_set_chr(DEVICE(&(s->uart)), "chardev", serial_hd(0)); if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart), 0, memmap[IBEX_UART].base); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart), 0, memmap[IBEX_DEV_UART].bas= e); sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart), 0, qdev_get_gpio_in(DEVICE(&s->plic), IBEX_UART_TX_WATERMARK_IRQ)); @@ -151,33 +151,33 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev= _soc, Error **errp) IBEX_UART_RX_OVERFLOW_IRQ)); =20 create_unimplemented_device("riscv.lowrisc.ibex.gpio", - memmap[IBEX_GPIO].base, memmap[IBEX_GPIO].size); + memmap[IBEX_DEV_GPIO].base, memmap[IBEX_DEV_GPIO].size); create_unimplemented_device("riscv.lowrisc.ibex.spi", - memmap[IBEX_SPI].base, memmap[IBEX_SPI].size); + memmap[IBEX_DEV_SPI].base, memmap[IBEX_DEV_SPI].size); create_unimplemented_device("riscv.lowrisc.ibex.flash_ctrl", - memmap[IBEX_FLASH_CTRL].base, memmap[IBEX_FLASH_CTRL].size); + memmap[IBEX_DEV_FLASH_CTRL].base, memmap[IBEX_DEV_FLASH_CTRL].size= ); create_unimplemented_device("riscv.lowrisc.ibex.rv_timer", - memmap[IBEX_RV_TIMER].base, memmap[IBEX_RV_TIMER].size); + memmap[IBEX_DEV_RV_TIMER].base, memmap[IBEX_DEV_RV_TIMER].size); create_unimplemented_device("riscv.lowrisc.ibex.pwrmgr", - memmap[IBEX_PWRMGR].base, memmap[IBEX_PWRMGR].size); + memmap[IBEX_DEV_PWRMGR].base, memmap[IBEX_DEV_PWRMGR].size); create_unimplemented_device("riscv.lowrisc.ibex.rstmgr", - memmap[IBEX_RSTMGR].base, memmap[IBEX_RSTMGR].size); + memmap[IBEX_DEV_RSTMGR].base, memmap[IBEX_DEV_RSTMGR].size); create_unimplemented_device("riscv.lowrisc.ibex.clkmgr", - memmap[IBEX_CLKMGR].base, memmap[IBEX_CLKMGR].size); + memmap[IBEX_DEV_CLKMGR].base, memmap[IBEX_DEV_CLKMGR].size); create_unimplemented_device("riscv.lowrisc.ibex.aes", - memmap[IBEX_AES].base, memmap[IBEX_AES].size); + memmap[IBEX_DEV_AES].base, memmap[IBEX_DEV_AES].size); create_unimplemented_device("riscv.lowrisc.ibex.hmac", - memmap[IBEX_HMAC].base, memmap[IBEX_HMAC].size); + memmap[IBEX_DEV_HMAC].base, memmap[IBEX_DEV_HMAC].size); create_unimplemented_device("riscv.lowrisc.ibex.pinmux", - memmap[IBEX_PINMUX].base, memmap[IBEX_PINMUX].size); + memmap[IBEX_DEV_PINMUX].base, memmap[IBEX_DEV_PINMUX].size); create_unimplemented_device("riscv.lowrisc.ibex.alert_handler", - memmap[IBEX_ALERT_HANDLER].base, memmap[IBEX_ALERT_HANDLER].size); + memmap[IBEX_DEV_ALERT_HANDLER].base, memmap[IBEX_DEV_ALERT_HANDLER= ].size); create_unimplemented_device("riscv.lowrisc.ibex.nmi_gen", - memmap[IBEX_NMI_GEN].base, memmap[IBEX_NMI_GEN].size); + memmap[IBEX_DEV_NMI_GEN].base, memmap[IBEX_DEV_NMI_GEN].size); create_unimplemented_device("riscv.lowrisc.ibex.usbdev", - memmap[IBEX_USBDEV].base, memmap[IBEX_USBDEV].size); + memmap[IBEX_DEV_USBDEV].base, memmap[IBEX_DEV_USBDEV].size); create_unimplemented_device("riscv.lowrisc.ibex.padctrl", - memmap[IBEX_PADCTRL].base, memmap[IBEX_PADCTRL].size); + memmap[IBEX_DEV_PADCTRL].base, memmap[IBEX_DEV_PADCTRL].size); } =20 static void lowrisc_ibex_soc_class_init(ObjectClass *oc, void *data) --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557175; cv=none; d=zohomail.com; s=zohoarc; b=ATd1Cj72vSDSugzydoIfPXPlO/U1eXAPItCDfSGzCcnu9hL+Hq67XTm41Daoh4R888H92Ds9c5Kn0X5QT0/krE0RSxJ/JxUnEun7K1Nuz+gZ1zlVw+ecTMj8gGzaz6Il0VF62/0Hp7iKfbvxfyN1qJ00sWTlDQAf1MJxt+tWPH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557175; 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=Xt81pdNSq5rc3Hsma4qNtuOpDfrLPUaLyoqm32S1pDE=; b=OczCtrmR7vBcpHByjioihM4m0QzMA+QeHI1pzgXoVGbJjKzVdJF/kz2ALfUa6/rsMQfP6/xLZNG1FNAgarunPtZysKGfUfMw+lSp6Z3C27/wOpm0+breIBAdpK0nnjhi6h7fMMhlZoYG2/ICM4AEYL8RT/mordjvmbVQvz42p2M= 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 15985571755462.779433891013582; Thu, 27 Aug 2020 12:39:35 -0700 (PDT) Received: from localhost ([::1]:34490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNkE-0007pp-Am for importer@patchew.org; Thu, 27 Aug 2020 15:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNT8-0006Ph-CZ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48270 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNT2-0000Mo-K1 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:54 -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-227-bJIrujhcMSead-nKSxWekQ-1; Thu, 27 Aug 2020 15:21:45 -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 31DDB802B7C; Thu, 27 Aug 2020 19:21:44 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE99F7E466; Thu, 27 Aug 2020 19:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556107; 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=Xt81pdNSq5rc3Hsma4qNtuOpDfrLPUaLyoqm32S1pDE=; b=J9JUNvEoOWo5B+xkfizHbP4KS8d3ey3Y66NmQTOPviAew4gnhktC33vUTycp7LMSSLBTSr PaYLznx+2DwOr9p5uTRno10pZVsFwJQiAqXXCRqk6YMVX+eftZYVA6Gfzq5zEyPhtj+HWr 8ozyhkbqqZKTr1kRSxXxr6PCHkY1sbg= X-MC-Unique: bJIrujhcMSead-nKSxWekQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/53] aspeed_timer: Fix ASPEED_TIMER macro definition Date: Thu, 27 Aug 2020 15:20:38 -0400 Message-Id: <20200827192122.658035-10-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The macro definition had an extra semicolon. This was never noticed because the macro was only being used where it didn't make a difference. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-11-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/timer/aspeed_timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_time= r.h index 948329893c..d7c7d8ad28 100644 --- a/include/hw/timer/aspeed_timer.h +++ b/include/hw/timer/aspeed_timer.h @@ -26,7 +26,7 @@ #include "hw/misc/aspeed_scu.h" =20 #define ASPEED_TIMER(obj) \ - OBJECT_CHECK(AspeedTimerCtrlState, (obj), TYPE_ASPEED_TIMER); + OBJECT_CHECK(AspeedTimerCtrlState, (obj), TYPE_ASPEED_TIMER) #define TYPE_ASPEED_TIMER "aspeed.timer" #define TYPE_ASPEED_2400_TIMER TYPE_ASPEED_TIMER "-ast2400" #define TYPE_ASPEED_2500_TIMER TYPE_ASPEED_TIMER "-ast2500" --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557260; cv=none; d=zohomail.com; s=zohoarc; b=LXjNbhErUP8zVQmJnSciJMfeBI8EM47Lx4WUNpjUkz2fD8OVwUENlp9MwTlI5kpMj3rY6UaA/GVyDaFlblll9OLoA21CCTFRilYikZ/ndyPEXtTq2LACYYnPHnUMb2PGgWaj1sLg580QNX55seu5VFEw7gXc4rjPAjA/R84f9hA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557260; 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=CP+DOULOj0w02HAwvltHBXZrv5Zpm+d+Sy70IDDtoQg=; b=V0x8y8DJncONvjVtzE+Jm1lsTbR2cX6d2vnAf/ZDcTbpMG8NQCi2L6o1qwuRfgSBxsZPud9hNW/jZUWKm1ldg4LF8+spNrairvr84irzWpKzKbXmjTzHeiInypKtSy5lG21S9G/Jr02XK7ScEPi7Fnd8Kb5PxZXGo8BKnz5753w= 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 1598557260913855.1672988869817; Thu, 27 Aug 2020 12:41:00 -0700 (PDT) Received: from localhost ([::1]:41634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNlb-0002Pz-Nj for importer@patchew.org; Thu, 27 Aug 2020 15:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTC-0006Zt-86 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTA-0000NU-EW for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21: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-361--33y91yjOM-FYP57JVoRxA-1; Thu, 27 Aug 2020 15:21:51 -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 3688B1895806; Thu, 27 Aug 2020 19:21:50 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF19C7849B; Thu, 27 Aug 2020 19:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556115; 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=CP+DOULOj0w02HAwvltHBXZrv5Zpm+d+Sy70IDDtoQg=; b=YytBp2KVB60o7Zi4+dwnTyNzMHkx9j99FvUklT6UBxgzYIne8/WtR0hqOQhIzeCEaSMtk8 eAKn297e5qRSrDgMKO+SkWUej90FUuMEZ8jvlIdzHohLhYXsfoH905GaKNCdJzLU29RA04 Vk6WBFljGNg750JwwaaELzQ43gpo9c8= X-MC-Unique: -33y91yjOM-FYP57JVoRxA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/53] versatile: Fix typo in PCI_VPB_HOST definition Date: Thu, 27 Aug 2020 15:20:39 -0400 Message-Id: <20200827192122.658035-11-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Fixes: cd93dbf375bd ("versatile_pci: Update to realize and instance init fu= nctions") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-12-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/pci-host/versatile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 616882a80d..7e4aa467a2 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -161,7 +161,7 @@ static const VMStateDescription pci_vpb_vmstate =3D { =20 #define TYPE_VERSATILE_PCI_HOST "versatile_pci_host" #define PCI_VPB_HOST(obj) \ - OBJECT_CHECK(PCIDevice, (obj), TYPE_VERSATILE_PCIHOST) + OBJECT_CHECK(PCIDevice, (obj), TYPE_VERSATILE_PCI_HOST) =20 typedef enum { PCI_IMAP0 =3D 0x0, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557359; cv=none; d=zohomail.com; s=zohoarc; b=Bm8hIo/VLYBUQFd9uw6puaETfTTq7gGf0NGJ2zwiFYgmMdqhJAoknaTFckdABoWLETR2mZZRnMAqJ+KVkeCUO+2+TuqN0uZ5ofWj+73K+4n8VzAg2jxN3QjpjfPe5vTVQ2aNWj4iM7HjQsy17N417jYpWKh1YlfwPDiMPiWaHGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557359; 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=vwaGSpawaqzMq1JtVKo0D7Zw39mdEsK4m4X847mdgBI=; b=b4w73ib1TuZ6ISxQ2TBcDnrhg/IGyhvZv/VZ5OG/HrDpOBs3mXFQaJRMxFkpaVXRlTthI3xF9GNZEz7BH0yikGKFayJZlChzXOIsf+KT+7cdQ9CoCx6orAtdpwOEJrYbQ3KihwnqwnJigEyWNPdcoupKbwaTGPeouJ2s97NR8Jc= 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 1598557359495612.7604912567401; Thu, 27 Aug 2020 12:42:39 -0700 (PDT) Received: from localhost ([::1]:47894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNnB-0004ve-U9 for importer@patchew.org; Thu, 27 Aug 2020 15:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTF-0006fV-HG for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51150 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTC-0000Nk-3f for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:01 -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-1-8JwECEs0PtuZTMopkuf58g-1; Thu, 27 Aug 2020 15:21:54 -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 CFD118018A4; Thu, 27 Aug 2020 19:21:53 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA5E97D8B1; Thu, 27 Aug 2020 19:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556117; 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=vwaGSpawaqzMq1JtVKo0D7Zw39mdEsK4m4X847mdgBI=; b=bMyd9Ut/WGDFCXqazyHxsmmmd1OEngyvuvvCuqcb3LnQ+fqgFeW/JyC0nGQszHQLhieBsX RqUOsX6jIjmysOKB0WVLe2kcIW691IhcFyutWmfXNPS+MRlRZFJBBIf3v6Bywq18EI+Eaz M0AG7LOjoUK34nV4Cn6NV+MjJ2FWpWU= X-MC-Unique: 8JwECEs0PtuZTMopkuf58g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/53] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS Date: Thu, 27 Aug 2020 15:20:40 -0400 Message-Id: <20200827192122.658035-12-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , David Hildenbrand , Cornelia Huck , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The macro was incorrectly defined using OBJECT_CHECK. Acked-by: Cornelia Huck Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: David Hildenbrand Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-13-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/s390x/virtio-ccw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index c0e3355248..b281896f7d 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -65,9 +65,9 @@ typedef struct VirtioBusClass VirtioCcwBusClass; =20 #define TYPE_VIRTIO_CCW_BUS "virtio-ccw-bus" #define VIRTIO_CCW_BUS(obj) \ - OBJECT_CHECK(VirtioCcwBus, (obj), TYPE_VIRTIO_CCW_BUS) + OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS) #define VIRTIO_CCW_BUS_GET_CLASS(obj) \ - OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS) + OBJECT_GET_CLASS(VirtioCcwBusClass, (obj), TYPE_VIRTIO_CCW_BUS) #define VIRTIO_CCW_BUS_CLASS(klass) \ OBJECT_CLASS_CHECK(VirtioCcwBusClass, klass, TYPE_VIRTIO_CCW_BUS) =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556604; cv=none; d=zohomail.com; s=zohoarc; b=k8by91Nh1ZwRGU9gtZb3UxC+o0IgRPrg9isuq9tfQaIFdkWfUBmTs99W2aF12SPPnGy6g7yUw/s/dG+luMwsdrbfGnNRQ9ZaSBwauxixxwSCPCZntYTmqeUcEav5G1m9bLwsst18qScRnYWYiZpY+BcvnjtVAwSUYkNVBQCFyEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556604; 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=meiXVJX1T3vE8VBoq16DCEwSHXZV2UDNq1vFT4KpFuY=; b=mzeF22oMyp7hgERciskn1jKJ9CP+E0uZrnOS6FObNGqfVdvFI0Les6Z2vlsRnLIkgScTCc7hlmg3TPrnUlo41CL/DmLQcNtqGWxSRhJoX17evkl4VgrxKKHTwLYz5c13KtISF9O2rdQRyfID430mY/1G1rONHR4/IngzsdhqIq4= 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 1598556604807282.9404868227458; Thu, 27 Aug 2020 12:30:04 -0700 (PDT) Received: from localhost ([::1]:44858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNb1-0005gq-Fj for importer@patchew.org; Thu, 27 Aug 2020 15:30:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTH-0006kO-GN for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTF-0000O5-RG for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:03 -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-150-ezbQcu0QMS-1SKsMriOxvQ-1; Thu, 27 Aug 2020 15:21:56 -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 560C4807337; Thu, 27 Aug 2020 19:21:55 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id C84197D64B; Thu, 27 Aug 2020 19:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556121; 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=meiXVJX1T3vE8VBoq16DCEwSHXZV2UDNq1vFT4KpFuY=; b=a4dMtk/8dGV6sNX9eMzNF9CtRAsal20d046IFB+fZDlICRx6H0Ne7qW4VmDmqK2/hRWVGC NY5GgcjJUPbufIJA+csIQu9BNLkl5CZzLZnuKJDLKbWWEFvihQDuyvznMWzpFM1AWREcpU /RkF9TBtsfMhIdaqW4kleVsKsz5zYqE= X-MC-Unique: ezbQcu0QMS-1SKsMriOxvQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/53] hvf: Add missing include Date: Thu, 27 Aug 2020 15:20:41 -0400 Message-Id: <20200827192122.658035-13-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini , =?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) The sysemu/accel.h header is needed for the ACCEL_CLASS_NAME macro. This will be necessary to allow us to use OBJECT_DEFINE*() for TYPE_HVF_ACCEL. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Roman Bolshakov Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-14-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/sysemu/hvf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index 6d3ee4fdb7..d3bed80ea8 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -13,6 +13,8 @@ #ifndef HVF_H #define HVF_H =20 +#include "sysemu/accel.h" + #ifdef CONFIG_HVF uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556738; cv=none; d=zohomail.com; s=zohoarc; b=GQaoXlvGD5ob4ud7zVCWzoATJRtZlKRoQeaLy/iUUGvse9ylWJ0BpFeU4oHfkfhTg7YpC7Pp0Pa6p1kPiLyX5wgYQ3FLcBeCtMapMMQ9Xn+nQuIV3uZlN/LWyiEseCdB0AMn95seXb1NBbsmEnImp4B58SQPS77A+qZuSnbhuKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556738; 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=hPDjoY8jkGB1MgoQ/65yzg7OMQsY2JF2LvIv8HRp7SM=; b=QvUVgI7m+99no2kR0IKfF0Cg0qmGIpHfmsDxgn639BeHpvGwDiZs2tqxycCdk22/4gZkNNmfVzdbDbv3YRnyJvemUIPOWmVrv36cVFC8dDT8VT3ZMSO2UZnBDyacruZV8LdcSK16qmJqx/d/7CWxInFjmXIqSqvMT+Xot8VaSSM= 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 1598556738210496.622002282219; Thu, 27 Aug 2020 12:32:18 -0700 (PDT) Received: from localhost ([::1]:53164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNdA-0000ky-DY for importer@patchew.org; Thu, 27 Aug 2020 15:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTS-0006zQ-JM for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTN-0000P4-SZ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:14 -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-550-WMRjcQH5P32g4nKrrBOaHQ-1; Thu, 27 Aug 2020 15:22:01 -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 B4C18801AB9; Thu, 27 Aug 2020 19:21:59 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B1C261100; Thu, 27 Aug 2020 19:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556128; 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=hPDjoY8jkGB1MgoQ/65yzg7OMQsY2JF2LvIv8HRp7SM=; b=VDl68Js4mYZwRlslZtU46zEjch9+b6I6wB5zoXKBQmgarvpnIBW03gtdmdX0y8GsfNiaCZ MqYlQB9M5U5WaP6a/zwXwAhFHgeeneEfi+RK5UerPTsmx7w/2W6JVL3kihbb3f1H0GlDh/ zJJl1u4LGo7Ymb7bJDVOXrTtAjaizec= X-MC-Unique: WMRjcQH5P32g4nKrrBOaHQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 13/53] hcd-dwc2: Rename USB_*CLASS macros for consistency Date: Thu, 27 Aug 2020 15:20:42 -0400 Message-Id: <20200827192122.658035-14-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the DWC2_CLASS to DWC2_USB_CLASS and DWC2_GET_CLASS to DWC2_USB_GET_CLASS, for consistency with the DWC2_USB macro. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Reviewed-by: Gerd Hoffmann Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-15-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/usb/hcd-dwc2.h | 4 ++-- hw/usb/hcd-dwc2.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index 4ba809a07b..54111d835e 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -182,9 +182,9 @@ struct DWC2Class { #define TYPE_DWC2_USB "dwc2-usb" #define DWC2_USB(obj) \ OBJECT_CHECK(DWC2State, (obj), TYPE_DWC2_USB) -#define DWC2_CLASS(klass) \ +#define DWC2_USB_CLASS(klass) \ OBJECT_CLASS_CHECK(DWC2Class, (klass), TYPE_DWC2_USB) -#define DWC2_GET_CLASS(obj) \ +#define DWC2_USB_GET_CLASS(obj) \ OBJECT_GET_CLASS(DWC2Class, (obj), TYPE_DWC2_USB) =20 #endif diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c index 56f91f6bee..97688d21bf 100644 --- a/hw/usb/hcd-dwc2.c +++ b/hw/usb/hcd-dwc2.c @@ -1155,7 +1155,7 @@ static void dwc2_work_timer(void *opaque) =20 static void dwc2_reset_enter(Object *obj, ResetType type) { - DWC2Class *c =3D DWC2_GET_CLASS(obj); + DWC2Class *c =3D DWC2_USB_GET_CLASS(obj); DWC2State *s =3D DWC2_USB(obj); int i; =20 @@ -1239,7 +1239,7 @@ static void dwc2_reset_enter(Object *obj, ResetType t= ype) =20 static void dwc2_reset_hold(Object *obj) { - DWC2Class *c =3D DWC2_GET_CLASS(obj); + DWC2Class *c =3D DWC2_USB_GET_CLASS(obj); DWC2State *s =3D DWC2_USB(obj); =20 trace_usb_dwc2_reset_hold(); @@ -1253,7 +1253,7 @@ static void dwc2_reset_hold(Object *obj) =20 static void dwc2_reset_exit(Object *obj) { - DWC2Class *c =3D DWC2_GET_CLASS(obj); + DWC2Class *c =3D DWC2_USB_GET_CLASS(obj); DWC2State *s =3D DWC2_USB(obj); =20 trace_usb_dwc2_reset_exit(); @@ -1382,7 +1382,7 @@ static Property dwc2_usb_properties[] =3D { static void dwc2_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - DWC2Class *c =3D DWC2_CLASS(klass); + DWC2Class *c =3D DWC2_USB_CLASS(klass); ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 dc->realize =3D dwc2_realize; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557424; cv=none; d=zohomail.com; s=zohoarc; b=aGmmKREFxXRwSpmCkSdOK5GoQ7QkfTssNVy47dtcwNlk2sxpfPSvj+DsKzRgYWR7YuuiMuR+OmxHgldGSKo2KK4Mn5M4T6M7bzgV3ykDGrvnnv1k+HnkKx60qiEPHFi3fHjYvQg/CQW2LbzefeAi46/Ft6yhoJyENl8xrF2DQIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557424; 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=rhsH3xgFuKTiTnROAKCu062OUg6Ii/r++IZgtgL2EIc=; b=GOGspqLF+wZ4tFoO9rqD9u4Gd8t4K0Usm5TmSpJK1vtnSwZXDJxLp3xcUybqdtWA2hpPcmfZF6/QhEVm7hqs/uBpeBk+2cz0b75y3trdwRYA5E1uUBpfjSVDMa87NpfLKa7in8Spc3owHMbRnbRUo0nfGNCC6hyfNcYqd8j6IAw= 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 1598557423931899.5064799293638; Thu, 27 Aug 2020 12:43:43 -0700 (PDT) Received: from localhost ([::1]:52066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNoD-0006ac-N1 for importer@patchew.org; Thu, 27 Aug 2020 15:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTK-0006tg-UI for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21977 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTJ-0000Oc-7A for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22: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-564-QBUA1lBxNIOt6EvcYVFKIw-1; Thu, 27 Aug 2020 15:22:02 -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 DAA1E801F98; Thu, 27 Aug 2020 19:22:00 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98C525D9E8; Thu, 27 Aug 2020 19:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556124; 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=rhsH3xgFuKTiTnROAKCu062OUg6Ii/r++IZgtgL2EIc=; b=frDNnoPv/+nmG5kw2vbkwJD6mLVHQ8ulTEtPTDemVcHg3la9P2icaUa0e7URa5W7zh8Sq3 Ktq1gRlVPHWa1zn3/UmUIL1Ex/oc0eBQ+DOSnDHF8VRiNsoxuJxHPmVJNKM5PqEsEz0O5r nDRLqQ2VzO6cZAB8GvcKTtEeEKl/+C8= X-MC-Unique: QBUA1lBxNIOt6EvcYVFKIw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 14/53] tulip: Move TulipState typedef to header Date: Thu, 27 Aug 2020 15:20:43 -0400 Message-Id: <20200827192122.658035-15-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-16-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/net/tulip.h | 1 + hw/net/tulip.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/tulip.h b/hw/net/tulip.h index 5271aad8d5..c3fcd4d4e1 100644 --- a/hw/net/tulip.h +++ b/hw/net/tulip.h @@ -5,6 +5,7 @@ #include "net/net.h" =20 #define TYPE_TULIP "tulip" +typedef struct TULIPState TULIPState; #define TULIP(obj) OBJECT_CHECK(TULIPState, (obj), TYPE_TULIP) =20 #define CSR(_x) ((_x) << 3) diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 4487fd61cf..ca69f7ea5e 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -18,7 +18,7 @@ #include "trace.h" #include "net/eth.h" =20 -typedef struct TULIPState { +struct TULIPState { PCIDevice dev; MemoryRegion io; MemoryRegion memory; @@ -44,7 +44,7 @@ typedef struct TULIPState { =20 uint32_t rx_status; uint8_t filter[16][6]; -} TULIPState; +}; =20 static const VMStateDescription vmstate_pci_tulip =3D { .name =3D "tulip", --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557140; cv=none; d=zohomail.com; s=zohoarc; b=gaLUBGHFVj/NDA8Tkfbm8+4Uv0APDIEZXSqDbvNFA7Xle3UxkiHoTpOL21DgKGwrfZ3hR5IgD+R7uUGdNOEfSK4ux9nWSLenEiYDFSSX9DkZg6u/HCMXgLpnt6UmMNFzNdivyv7IpTQX5NFPMuIUo0Z2zdyy8iobYHsIqnS4kqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557140; 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=p2OhsxXYFO8oYZwDb62gtGu4z+Q8a9njWmrcpWWO6NE=; b=M7dC0pbH/lFUGGSPF35sUs8KuASbmzzQsN/sDdbAOyHZLU1b5Mjjk5hqFlGdgCIqRgT9zME1oe22LWk7Bx8LTYsVUNcj464MDEXbpuGuk/1AZZwzarAUtuN+yK8CK0OdmV4Z05ZBT0nzYVHQR8kHIStdF6UL58iH/q/qmHZHiKY= 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 1598557140686150.39395182898306; Thu, 27 Aug 2020 12:39:00 -0700 (PDT) Received: from localhost ([::1]:59374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNjf-0006UW-Ew for importer@patchew.org; Thu, 27 Aug 2020 15:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTT-00071c-HE for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36478 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTQ-0000PH-Mr for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:15 -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-32-E0OzD84GNuCgD9KM6_m5wA-1; Thu, 27 Aug 2020 15:22:08 -0400 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 3CBCA1DDFF; Thu, 27 Aug 2020 19:22:07 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04D8519D7C; Thu, 27 Aug 2020 19:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556130; 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=p2OhsxXYFO8oYZwDb62gtGu4z+Q8a9njWmrcpWWO6NE=; b=F1vOau8M+51nAjVkosmgYDButWcXO9BvXmYwImj9IX4ipwZD2a+5H7El0OVWRRmxlMjDTC P208HGBuGlr4/50dZuR0mts/BhFXuEJJf9KagflZJ2fZSbDcW9HpBBZgVlb93R0pqg4FnA 8hn4ezLpL4r7roAXiJzBX/qBx4ZU0bs= X-MC-Unique: E0OzD84GNuCgD9KM6_m5wA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 15/53] throttle-groups: Move ThrottleGroup typedef to header Date: Thu, 27 Aug 2020 15:20:44 -0400 Message-Id: <20200827192122.658035-16-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-17-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/block/throttle-groups.h | 1 + block/throttle-groups.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/block/throttle-groups.h b/include/block/throttle-group= s.h index 712a8e64b4..5e77db700f 100644 --- a/include/block/throttle-groups.h +++ b/include/block/throttle-groups.h @@ -59,6 +59,7 @@ typedef struct ThrottleGroupMember { } ThrottleGroupMember; =20 #define TYPE_THROTTLE_GROUP "throttle-group" +typedef struct ThrottleGroup ThrottleGroup; #define THROTTLE_GROUP(obj) OBJECT_CHECK(ThrottleGroup, (obj), TYPE_THROTT= LE_GROUP) =20 const char *throttle_group_get_name(ThrottleGroupMember *tgm); diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 98fea7fd47..4e28365d8d 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -63,7 +63,7 @@ static void timer_cb(ThrottleGroupMember *tgm, bool is_wr= ite); * access some other ThrottleGroupMember's timers only after verifying that * that ThrottleGroupMember has throttled requests in the queue. */ -typedef struct ThrottleGroup { +struct ThrottleGroup { Object parent_obj; =20 /* refuse individual property change if initialization is complete */ @@ -79,7 +79,7 @@ typedef struct ThrottleGroup { =20 /* This field is protected by the global QEMU mutex */ QTAILQ_ENTRY(ThrottleGroup) list; -} ThrottleGroup; +}; =20 /* This is protected by the global QEMU mutex */ static QTAILQ_HEAD(, ThrottleGroup) throttle_groups =3D --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557479; cv=none; d=zohomail.com; s=zohoarc; b=HTusZK5eQ9ywKHvIulAIZa9Lox8edYZ8sdzGfG7OM9eKTD48qAIW96QK1/HraWkNK/dpBrFhi5mwPKLiAXrZXCittMBPshC2dAskcAR/o6jHGdQJ+1nIPlzCaHvInsEcfvBU/Ecn5XqPBhAakzEoW5g8b58xGI24k3pfqBs88HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557479; 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=dunSP9Qidngz/qIk+WBxeT1z0zhX3Vd4pj2JqsC3gP0=; b=V9nbWfddWRKooWoBRsA+QyjB/lO3Azi3D7Fdck+/q4R8ZUi6SqYY+AXbNQnJU68B2AXxsXC3fM2ctKTwWdD8/iscXnBho+9a9U3VN4xzUtpbkEALhxhTyG56a1ZqchHFdzLFNF5WgAWum2DswJCs/Ztv5W/tZ9Itdb+hWFzC2o4= 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 1598557479601722.5595060131759; Thu, 27 Aug 2020 12:44:39 -0700 (PDT) Received: from localhost ([::1]:56212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNp8-0008En-8M for importer@patchew.org; Thu, 27 Aug 2020 15:44:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTU-00073Q-8q for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTS-0000Pg-Id for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:15 -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-575-Sq-9g_mPOPWVLU0VL4QSiw-1; Thu, 27 Aug 2020 15:22:09 -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 811E91074650; Thu, 27 Aug 2020 19:22:08 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 462D0747BD; Thu, 27 Aug 2020 19:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556133; 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=dunSP9Qidngz/qIk+WBxeT1z0zhX3Vd4pj2JqsC3gP0=; b=GggNaSLvLM5G6L0Hk/ZuJM6KxwHKoaYT8I2RHaIqaFQsdP4otzDJ0RYM1ku5aXSLmwmCrb Ypc97rAlpj3ywgBgVrPmn5YlRRElQ9MdqW1PPU4dvLpEpX86qKAbOHBEXGHDeh1Vk+nvHF 8jz6YhIiT4OWjPmZq0fBX2cuLnXPyoQ= X-MC-Unique: Sq-9g_mPOPWVLU0VL4QSiw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 16/53] pci: Move PCIBusClass typedef to pci.h Date: Thu, 27 Aug 2020 15:20:45 -0400 Message-Id: <20200827192122.658035-17-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-18-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/pci/pci.h | 1 + include/hw/pci/pci_bus.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index c1bf7d5356..4ca7258b5b 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -396,6 +396,7 @@ typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int i= rq_num); typedef PCIINTxRoute (*pci_route_irq_fn)(void *opaque, int pin); =20 #define TYPE_PCI_BUS "PCI" +typedef struct PCIBusClass PCIBusClass; #define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS) #define PCI_BUS_CLASS(klass) OBJECT_CLASS_CHECK(PCIBusClass, (klass), TYPE= _PCI_BUS) #define PCI_BUS_GET_CLASS(obj) OBJECT_GET_CLASS(PCIBusClass, (obj), TYPE_P= CI_BUS) diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h index 0714f578af..347440d42c 100644 --- a/include/hw/pci/pci_bus.h +++ b/include/hw/pci/pci_bus.h @@ -10,14 +10,14 @@ * use accessor functions in pci.h */ =20 -typedef struct PCIBusClass { +struct PCIBusClass { /*< private >*/ BusClass parent_class; /*< public >*/ =20 int (*bus_num)(PCIBus *bus); uint16_t (*numa_node)(PCIBus *bus); -} PCIBusClass; +}; =20 enum PCIBusFlags { /* This bus is the root of a PCI domain */ --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556521; cv=none; d=zohomail.com; s=zohoarc; b=RfhKaogxE5mZplphRjFzMtm+Erq5n/QEFxHWUR/69Ky9+wK5xxa+63SrrnVlfpf9uaZmyDgePo/LPPgvTsxw2BIBariceLTkmYbY0hIZ8wg0XxQoLCDMjlgVxyef/HMQ1FTOBs7bwGqHG+OmMNzD0Nt5Y20mFpwIwhf9moK5EK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556521; 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=yQ43M/CP56AWWK5Ae5pn7BmVve5jkZY63ZKHw7xQv+g=; b=WspXygmrbYu111Hugyfvqis7X9PNKGkB/ZVI/iqq3ZYpTqS1pC6skOazz4CGP2LFssP/7kPqIGkZkEmRtjHOACFEJ3BfyynwrUpYZbekEi6XuqM6THLoXMT1AzBBOEKeLBGGP2WceHEZH282bWMBLxiKaFV22/xiMMzgZnF+VsU= 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 1598556521617764.3216485771077; Thu, 27 Aug 2020 12:28:41 -0700 (PDT) Received: from localhost ([::1]:37898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNZg-0002o2-C3 for importer@patchew.org; Thu, 27 Aug 2020 15:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTU-00072y-4U for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTR-0000PV-NO for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:15 -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-400-3aTkn6wcO1ywu-2jyqgVPQ-1; Thu, 27 Aug 2020 15:22:10 -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 803A31015ECD; Thu, 27 Aug 2020 19:22:09 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 457FD784A8; Thu, 27 Aug 2020 19:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556132; 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=yQ43M/CP56AWWK5Ae5pn7BmVve5jkZY63ZKHw7xQv+g=; b=fOktOShiVW8j3woByA5q9ItbeaeA5fGb6wDKYHI0aUqjImpY+UXSUuYlWoeDt6mtezRCVe 1dcbY+fTIr50beUH8rAAe+zsAR9jpVpZisuuL9hpZDJAxjKvNlW5mgHkMLlFf2zYcUFLiB /b6fiKqWyNSfEagdKAs49ySswcM/oU0= X-MC-Unique: 3aTkn6wcO1ywu-2jyqgVPQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 17/53] i8254: Move PITCommonState/PITCommonClass typedefs to i8254.h Date: Thu, 27 Aug 2020 15:20:46 -0400 Message-Id: <20200827192122.658035-18-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-19-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/timer/i8254.h | 2 ++ include/hw/timer/i8254_internal.h | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index e75b4a5a08..206b8f8464 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -39,6 +39,8 @@ typedef struct PITChannelInfo { } PITChannelInfo; =20 #define TYPE_PIT_COMMON "pit-common" +typedef struct PITCommonState PITCommonState; +typedef struct PITCommonClass PITCommonClass; #define PIT_COMMON(obj) \ OBJECT_CHECK(PITCommonState, (obj), TYPE_PIT_COMMON) #define PIT_COMMON_CLASS(klass) \ diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_int= ernal.h index 3db462aecd..a9a600d941 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -50,14 +50,14 @@ typedef struct PITChannelState { uint32_t irq_disabled; } PITChannelState; =20 -typedef struct PITCommonState { +struct PITCommonState { ISADevice dev; MemoryRegion ioports; uint32_t iobase; PITChannelState channels[3]; -} PITCommonState; +}; =20 -typedef struct PITCommonClass { +struct PITCommonClass { ISADeviceClass parent_class; =20 void (*set_channel_gate)(PITCommonState *s, PITChannelState *sc, int v= al); @@ -65,7 +65,7 @@ typedef struct PITCommonClass { PITChannelInfo *info); void (*pre_save)(PITCommonState *s); void (*post_load)(PITCommonState *s); -} PITCommonClass; +}; =20 int pit_get_out(PITChannelState *s, int64_t current_time); int64_t pit_get_next_transition_time(PITChannelState *s, int64_t current_t= ime); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556839; cv=none; d=zohomail.com; s=zohoarc; b=P6YBK94cXSAPllLMW0hCMwYRxUiNKDAW5F+7rGdCK1tWDVeg+KmZMms4A5un/wat/91FDfH65Fe9CdZTu6hmSXhs1UDj/O6pXeYxKqvaLOTHQ98NTOjSed6JiOPGrlcl7Adjo1Rm2Yo8iqYDYOgsQZ7dZ3VZNggNKkX6wHNCH3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556839; 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=OfHjnvheTqq+/4j3wD/AmaPXlWrBRT5P33UN2ld4sEA=; b=gi7+jU/1XRLmJVOi3XChSnOYBSuox6h70z48orDt5vnJd0OxKJ2CIZsDpeSxfW9hH3e5hmX+7XjM0u+/QBOf4t7t01LceoYKVZOuNdjZ9lZd8F1OGNcgcwWd0imJsOTxkCJQ4Sva0x5GZneCh+NOcJD0+Xi3d6omYMif0Dh09FI= 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 1598556839344719.5015864934614; Thu, 27 Aug 2020 12:33:59 -0700 (PDT) Received: from localhost ([::1]:33072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNen-00046T-Sq for importer@patchew.org; Thu, 27 Aug 2020 15:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTW-000797-DJ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTU-0000Q8-Iz for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:17 -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-488-nnCAe2I6NCGnbjs61qIAQA-1; Thu, 27 Aug 2020 15:22:11 -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 628741015ECB; Thu, 27 Aug 2020 19:22:10 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BA95784A3; Thu, 27 Aug 2020 19:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556135; 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=OfHjnvheTqq+/4j3wD/AmaPXlWrBRT5P33UN2ld4sEA=; b=R9tySr3kDmHbY+mjyf2Fx3n6MDZIoFEvl42GTVrE/F56y4oWpEb4FOVQBWOfjQtxFcjloN 1xWKoKoo6ZQ6boAmWJf+AWmw4YUIvEmkeFJVtRlaAT5+nMnFtePnNY7+pNMCeS9tVxcZEb pmmCZIlJcXiWqEB165S4VEXKE1Bo4U8= X-MC-Unique: nnCAe2I6NCGnbjs61qIAQA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 18/53] hvf: Move HVFState typedef to hvf.h Date: Thu, 27 Aug 2020 15:20:47 -0400 Message-Id: <20200827192122.658035-19-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-20-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/sysemu/hvf.h | 1 + target/i386/hvf/hvf-i386.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index d3bed80ea8..760d6c79a2 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -35,6 +35,7 @@ void hvf_vcpu_destroy(CPUState *); =20 #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") =20 +typedef struct HVFState HVFState; #define HVF_STATE(obj) \ OBJECT_CHECK(HVFState, (obj), TYPE_HVF_ACCEL) =20 diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index ef20c73eca..e0edffd077 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -57,13 +57,13 @@ typedef struct hvf_vcpu_caps { uint64_t vmx_cap_preemption_timer; } hvf_vcpu_caps; =20 -typedef struct HVFState { +struct HVFState { AccelState parent; hvf_slot slots[32]; int num_slots; =20 hvf_vcpu_caps *hvf_caps; -} HVFState; +}; extern HVFState *hvf_state; =20 void hvf_set_phys_mem(MemoryRegionSection *, bool); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556626; cv=none; d=zohomail.com; s=zohoarc; b=WPpwfQFs/CBC3X1YaJPlC6ZU5I0ynoYzWrtDBfLs0X0zFtRo1Vv4ioVkcTUnDlBeRSBWI/jqNAJN8h125yv0wpM/k/C7BoFovJaMpM5SEP1wl8+Vy0lWqDJ7pKEEwH8R21gquT0LkWLv6d4+bwP6b2y2k/OHE18z4KD5GXlHU2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556626; 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=ssjXNToZZ9tTpgSwUqUJhFKPIccF74ieHgLrtFzlAUk=; b=c7/99CPxBEo3at5Y9jl4ezslivnZL+nia3IPnlF5k656ygjCxpuw4sT7gXNgfw/49EZhSbi423zUpdrMc20Lk7TPd3hHF2gWvk5f3CNhMDESh8YgUg8QwCRdJgOUc3rZrJkSXlvgTqRdo28RLMfi4rdCr8n3XcGYa9gvabMosdw= 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 1598556626684651.2628921787913; Thu, 27 Aug 2020 12:30:26 -0700 (PDT) Received: from localhost ([::1]:46222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNbN-0006F9-C3 for importer@patchew.org; Thu, 27 Aug 2020 15:30:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTV-00076i-FS for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44149 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTT-0000Pr-Og for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:17 -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-52-obyw4RFWPuyx6mk38Q7oeQ-1; Thu, 27 Aug 2020 15:22:12 -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 64B13801AAB; Thu, 27 Aug 2020 19:22:11 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A91D7849B; Thu, 27 Aug 2020 19:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556134; 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=ssjXNToZZ9tTpgSwUqUJhFKPIccF74ieHgLrtFzlAUk=; b=GWqZuauRcpcFMkElGiR4wBthfnMxarRrLMtitGV16cmKyOfVuzjjcOqGNj5GuKpgi49KQA z/7wT9eAMwU1M5JRQcG4PQ63uO0UuyHlE/iI3v9Xxyr8PWMonLE7jepkTLI+z4fn9TcWka NVcBucXMETfevSl8YBT+f+HCneJMctU= X-MC-Unique: obyw4RFWPuyx6mk38Q7oeQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 19/53] mcf_fec: Move mcf_fec_state typedef to header Date: Thu, 27 Aug 2020 15:20:48 -0400 Message-Id: <20200827192122.658035-20-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-21-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/m68k/mcf_fec.h | 1 + hw/net/mcf_fec.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/m68k/mcf_fec.h b/include/hw/m68k/mcf_fec.h index eeb471f9c9..c09e33a57c 100644 --- a/include/hw/m68k/mcf_fec.h +++ b/include/hw/m68k/mcf_fec.h @@ -11,6 +11,7 @@ #define HW_M68K_MCF_FEC_H =20 #define TYPE_MCF_FEC_NET "mcf-fec" +typedef struct mcf_fec_state mcf_fec_state; #define MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_N= ET) =20 #define FEC_NUM_IRQ 13 diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 281345862c..25e3e453ab 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -32,7 +32,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0) #define FEC_MAX_FRAME_SIZE 2032 #define FEC_MIB_SIZE 64 =20 -typedef struct { +struct mcf_fec_state { SysBusDevice parent_obj; =20 MemoryRegion iomem; @@ -56,7 +56,7 @@ typedef struct { uint32_t etdsr; uint32_t emrbr; uint32_t mib[FEC_MIB_SIZE]; -} mcf_fec_state; +}; =20 #define FEC_INT_HB 0x80000000 #define FEC_INT_BABR 0x40000000 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556945; cv=none; d=zohomail.com; s=zohoarc; b=F58uQiFEbhXNJ1eIsO3/S8CTC8+6zKayQ8KD5JMoYfVfFgvvpXPqITDGgXTpmH447aE0ALOwKr6vuUR/WIDeY5jq/GlvC1aLrMNrutB05wvAcWdQ6aCOlIDv53eq2KsiNEEn6me7UVjLTtAvu56O/Epx9ND+8uKS6Wt5FlUx6gg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556945; 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=qcxG1gfHOekCDq68BK8RzZQ7lRvQgz+dPCny2jrJG+4=; b=bxLyGMIASbs/gE1SsaPqLU94BCr/fNKdqFDXYRCECbhbBt2+HohY/TvdYR+LWjpjZbDGo5nJnfITnMLfZC4RWyo0wrX/YEYHXA2LvJYupFsK/SEn6PqVxVIi0V30j8RhpS3tKl6yQQYvJgAGk0WitriOJMP7/bQT10sV69G6Aq0= 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 1598556945141647.8213203795016; Thu, 27 Aug 2020 12:35:45 -0700 (PDT) Received: from localhost ([::1]:41218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNgV-0007Rr-RQ for importer@patchew.org; Thu, 27 Aug 2020 15:35:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTX-0007Bq-Gx for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTV-0000QH-MR for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:19 -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-164-3a9ykkrYObqeYhIoZpiZxw-1; Thu, 27 Aug 2020 15:22:14 -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 AD1B0189E620; Thu, 27 Aug 2020 19:22:13 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7FD35D9F1; Thu, 27 Aug 2020 19:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556136; 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=qcxG1gfHOekCDq68BK8RzZQ7lRvQgz+dPCny2jrJG+4=; b=YoVTUS+HTXe5+WjxMLXMXmVQydqiJySo2EqawglRp9TSjFJ/PyavsSUGRhfe3OivZvPht0 X4ibU3l/KFLq3KBEj3Gv4GZImHeP1bsYBVPz9hKok9RaoonRniugk3xWtidfx4dLLD2D86 LVql80DVbPG9brCDMPdg/BwCsbhbQiY= X-MC-Unique: 3a9ykkrYObqeYhIoZpiZxw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 20/53] s390_flic: Move KVMS390FLICState typedef to header Date: Thu, 27 Aug 2020 15:20:49 -0400 Message-Id: <20200827192122.658035-21-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move typedef closer to the type check macros, to make it easier to convert the code to OBJECT_DEFINE_TYPE() in the future. Acked-by: Cornelia Huck Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Reviewed-by: Thomas Huth Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-22-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/s390x/s390_flic.h | 1 + hw/intc/s390_flic_kvm.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h index 4687ecfe83..df11de9b20 100644 --- a/include/hw/s390x/s390_flic.h +++ b/include/hw/s390x/s390_flic.h @@ -75,6 +75,7 @@ typedef struct S390FLICStateClass { } S390FLICStateClass; =20 #define TYPE_KVM_S390_FLIC "s390-flic-kvm" +typedef struct KVMS390FLICState KVMS390FLICState; #define KVM_S390_FLIC(obj) \ OBJECT_CHECK(KVMS390FLICState, (obj), TYPE_KVM_S390_FLIC) =20 diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index a306b26faa..dbd4e682ce 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -29,12 +29,12 @@ #define FLIC_FAILED (-1UL) #define FLIC_SAVEVM_VERSION 1 =20 -typedef struct KVMS390FLICState { +struct KVMS390FLICState{ S390FLICState parent_obj; =20 uint32_t fd; bool clear_io_supported; -} KVMS390FLICState; +}; =20 static KVMS390FLICState *s390_get_kvm_flic(S390FLICState *fs) { --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557542; cv=none; d=zohomail.com; s=zohoarc; b=I+Llor2y8VleOLLA18JZlKsFICxzrs02efplj5E2gETFudoShlc1V6YkpO0Cuotyh3/NUA/s7x3lUWmtpT9D8CrPbjiFtSPinin8Qb/V3vxgWqS282FLez35HuDXvUq1mW0fCCGtLWHY6UkKuZtjq6Q77IYI8yIBa7gXRjln6hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557542; 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=rMKMcWwzh3MZnH6oyMEbRBSU6Znu7QTmOTVWz3nLjEk=; b=BvFT6vs/kX0amharrqlXWwls0IzI9PDOUKLX+CkpiyU0Su1NiuI9wR2CUtlf87kePzt1x6wPdzBShu0hLxt+lLax7EAh+KVHKW0EjON6Ifyfwhld7jzE/JzsIkU0gV3OXartbfezUe8jVr/16cHomsaVgq/1hb7AgzYmyqJtecw= 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 1598557542873240.35663531855403; Thu, 27 Aug 2020 12:45:42 -0700 (PDT) Received: from localhost ([::1]:60392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNq9-0001YF-LZ for importer@patchew.org; Thu, 27 Aug 2020 15:45:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTa-0007JK-78 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTY-0000Qu-ED for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:21 -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-279-batpGVl4MSGlx32lEVEsWA-1; Thu, 27 Aug 2020 15:22:15 -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 95F16107464C; Thu, 27 Aug 2020 19:22:14 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E044747BD; Thu, 27 Aug 2020 19:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556139; 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=rMKMcWwzh3MZnH6oyMEbRBSU6Znu7QTmOTVWz3nLjEk=; b=YpzyXcozEs1bW28NFcD5myzFmuWhrwKfB/C8n6rR7qAjA4ZYz+Pzu1grE/kGA4v1MnnH+m ak5z6rwiFZ7qgNlMURpH/B8aLMHUEBQI6RtaRKYcrglGMm8kpud/o5/Rl4x1CE6Epxejy5 bKYSjDnKBWFIXRtULoKn2of+0s8eGFM= X-MC-Unique: batpGVl4MSGlx32lEVEsWA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 21/53] can_emu: Delete macros for non-existing typedef Date: Thu, 27 Aug 2020 15:20:50 -0400 Message-Id: <20200827192122.658035-22-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) CanBusClass doesn't exist. This will break when we automatically convert the code to use OBJECT_DEFINE_TYPE(). Delete the macros that reference the non-existing typedef. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-23-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/net/can_emu.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/net/can_emu.h b/include/net/can_emu.h index fce9770928..7e90fd8a45 100644 --- a/include/net/can_emu.h +++ b/include/net/can_emu.h @@ -100,10 +100,6 @@ struct CanBusClientState { }; =20 #define TYPE_CAN_BUS "can-bus" -#define CAN_BUS_CLASS(klass) \ - OBJECT_CLASS_CHECK(CanBusClass, (klass), TYPE_CAN_BUS) -#define CAN_BUS_GET_CLASS(obj) \ - OBJECT_GET_CLASS(CanBusClass, (obj), TYPE_CAN_BUS) #define CAN_BUS(obj) \ OBJECT_CHECK(CanBusState, (obj), TYPE_CAN_BUS) =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557218; cv=none; d=zohomail.com; s=zohoarc; b=LLgJFyzPXX335WtCUm60MQh+NbDuFUc/vVnkca8S+D4B+zsVZHS/JADPfpVRTTLBYrmOjZxTdZtB3bHfCG7RoqmAz7Jb41dhDtzIM5TGD0AWrNG+o6idGFf3RiO8t5tkuhrOWsr+DGQ5kJeSkXBVNYWh+184qtkjrjeWmH9HBcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557218; 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=/a1F8ULNHmlugJgaJhLzzHYP9LnrIrNxI4hpEzysAec=; b=mRZubYyhh2x+3OecDxttboUjthA9LOmbYL/WJiutgHrn+ZAgfrh7OpV+XJZlfT02aJMpDf53heNtnnK3+1z36X4OT5uSPt0ziIf2kNV66czcGsdnH9zSbtwgjQcqZ/c1kQY0ukw9RGglRtl36q5tdR0xcPbreftBhb4LoMs/hmk= 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 1598557218834937.7097228268418; Thu, 27 Aug 2020 12:40:18 -0700 (PDT) Received: from localhost ([::1]:39120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNkv-0001Jf-IY for importer@patchew.org; Thu, 27 Aug 2020 15:40:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTZ-0007I8-Qf for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:21 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:58127 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTY-0000Qq-2v for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:21 -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-509-YCvY8OnZOUa0V9TbQqzQbg-1; Thu, 27 Aug 2020 15:22:16 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9748C802B6B; Thu, 27 Aug 2020 19:22:15 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BBBD78396; Thu, 27 Aug 2020 19:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556139; 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=/a1F8ULNHmlugJgaJhLzzHYP9LnrIrNxI4hpEzysAec=; b=QSpJIBdsKslSf5K52mErnR94aG/dV9ciQanEHLUdsTg76zrMAlOWz4PMcxtBEWZqEyHJsa S8bKLzrHcUpbx5ulyain5/NFwAV7j8RhKXytvIo5eDcXoa8Is1RWehBuCd9iu8usuiqVTH ZIwL877q9lWkzFXEPpma6WOIYygb8IA= X-MC-Unique: YCvY8OnZOUa0V9TbQqzQbg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 22/53] nubus: Delete unused NUBUS_BRIDGE macro Date: Thu, 27 Aug 2020 15:20:51 -0400 Message-Id: <20200827192122.658035-23-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The macro never worked because the NubusBridge typedef doesn't exist. Delete it. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Laurent Vivier Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-24-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/nubus/nubus.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h index a8634e54c5..c350948262 100644 --- a/include/hw/nubus/nubus.h +++ b/include/hw/nubus/nubus.h @@ -29,7 +29,6 @@ #define NUBUS_BUS(obj) OBJECT_CHECK(NubusBus, (obj), TYPE_NUBUS_BUS) =20 #define TYPE_NUBUS_BRIDGE "nubus-bridge" -#define NUBUS_BRIDGE(obj) OBJECT_CHECK(NubusBridge, (obj), TYPE_NUBUS_BRID= GE) =20 typedef struct NubusBus { BusState qbus; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556751; cv=none; d=zohomail.com; s=zohoarc; b=Z4g6DI+A1/DncVRNWnrqV2kk7M1sGMxcc2+DB68IK0SIjhAGY4hR+Hb5AFiItOO3p7mvmQrX8/Ppv8ri1DbI3l4Zp94q96AWOqGfaAcI0onp60vxDnJOmKQXqTi1BpnzKDFC9bzhM/dT5Jq0WKipnsU4BRUpJjtT0VGpH2EvpWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556751; 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=ZwIQ8/xitgvcojsFfi9ZHtpUvOUvenjZxuMbQ/1FVFA=; b=PNszJGjQZQP5rryfU+VTRUTVEhvd+iLZu/jHfwxfa9RNUkJI3m+l+tsq0Z9phAwG9lmy0toZrcftIcjfcUdjYDm+0Jl5PiZNZIT5xDSVXhdANOJb2LHjnGcE2nR6O+uAic9TZ9v1r47Ijl00QH4thMNH25QUaKqXNKnMDkqRyZs= 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 1598556751403333.3551002695357; Thu, 27 Aug 2020 12:32:31 -0700 (PDT) Received: from localhost ([::1]:54402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNdO-0001H8-0I for importer@patchew.org; Thu, 27 Aug 2020 15:32:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTj-0007P8-7g for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:31 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:41869 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTf-0000RG-GL for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:30 -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-565-SYYwKtcWNAaIb6XxnDPUeA-1; Thu, 27 Aug 2020 15:22:17 -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 A9BAC107464D; Thu, 27 Aug 2020 19:22:16 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68D686115F; Thu, 27 Aug 2020 19:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556142; 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=ZwIQ8/xitgvcojsFfi9ZHtpUvOUvenjZxuMbQ/1FVFA=; b=S1+4hpucubgbfhywVFYr+H8XbS9w+hhZjcILk05GJorM/H3twp1GdiY9o60Ef+YAVSJY2A 2uxLLHuNPKg7GuVlwv80dv3LDr6JNhbxR/DFUZPtRZAZL3czZaBnDt2HlhmTXpiY8aVy1j Gtce6jzvtAMu0qynYO4UM//evgij+pU= X-MC-Unique: SYYwKtcWNAaIb6XxnDPUeA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 23/53] platform-bus: Delete macros for non-existing typedef Date: Thu, 27 Aug 2020 15:20:52 -0400 Message-Id: <20200827192122.658035-24-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) PlatformBusDeviceClass doesn't exist. This will break when we automatically convert the code to use OBJECT_DEFINE_TYPE(). Delete the macros that reference the non-existing typedef. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-25-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/platform-bus.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/hw/platform-bus.h b/include/hw/platform-bus.h index 19e20c57ce..33745a418e 100644 --- a/include/hw/platform-bus.h +++ b/include/hw/platform-bus.h @@ -29,10 +29,6 @@ typedef struct PlatformBusDevice PlatformBusDevice; #define TYPE_PLATFORM_BUS_DEVICE "platform-bus-device" #define PLATFORM_BUS_DEVICE(obj) \ OBJECT_CHECK(PlatformBusDevice, (obj), TYPE_PLATFORM_BUS_DEVICE) -#define PLATFORM_BUS_DEVICE_CLASS(klass) \ - OBJECT_CLASS_CHECK(PlatformBusDeviceClass, (klass), TYPE_PLATFORM_BUS= _DEVICE) -#define PLATFORM_BUS_DEVICE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(PlatformBusDeviceClass, (obj), TYPE_PLATFORM_BUS_DEV= ICE) =20 struct PlatformBusDevice { /*< private >*/ --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557036; cv=none; d=zohomail.com; s=zohoarc; b=C7pZK07YVe2CZjB7OChy7aTTK4kCXzu0VhSRtvhJKwgYUunzKj3a5Iiwau1sit1PcOdV8Qx9lXsiRfjhYF6nxpWua/XtbTUV5nmqnNUk1w1v5/ObnTMKCPVr3JrMAejhB5hMeH4alVlE3/lG3b9NN0ZQ1hEQoIVqPJMqFSQa/60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557036; 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=UDAB9lmlWJRibKtreg8TJ47DL+Yfto/OwhiERIuiAAc=; b=hJxGhLHzL3+rRpRQmmtrQR4RqYWWSd7Q06Rf8GZUaQT65tBhdE0oxGtMkpCVQRBRnUx1c+LzFX5w0mDXLsTpwcJauYS1de3OcAfm2PLX1FSZw0kqIks3lOJHlddrXySPcTIXXWdKcm8tF+9IF+9YIELs6PoWx7aM4QHLkPZPvA8= 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 1598557036205958.0374879171139; Thu, 27 Aug 2020 12:37:16 -0700 (PDT) Received: from localhost ([::1]:49380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNhy-0002Pd-TT for importer@patchew.org; Thu, 27 Aug 2020 15:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTo-0007Zi-Qt for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34737 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTh-0000RE-0M for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:35 -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-114-Wtdeo2QeNKu9WKP08wxvfA-1; Thu, 27 Aug 2020 15:22:19 -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 9E474189E616; Thu, 27 Aug 2020 19:22:18 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64B887849B; Thu, 27 Aug 2020 19:22:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556142; 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=UDAB9lmlWJRibKtreg8TJ47DL+Yfto/OwhiERIuiAAc=; b=cYd6m+Hk0kJP8mSN52Yyn/0xlYnbIbFVaSGDJQAEuAI6dWG/zJuz+DTngYJevKPaIMktMA vxIjMnRCQbyz0r5j17Fl3tMXkZHeh35m3ig1FJrwIPvYFVSOfMAeleAwNl4kENEj7JeXMO nc7W8gi5Aynf8Le30eGG6ofdZ5aFIy4= X-MC-Unique: Wtdeo2QeNKu9WKP08wxvfA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 24/53] armsse: Rename QOM macros to avoid conflicts Date: Thu, 27 Aug 2020 15:20:53 -0400 Message-Id: <20200827192122.658035-25-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename TYPE_ARMSSE to TYPE_ARM_SSE, and ARMSSE*() type checking macros to ARM_SSE*(). This will avoid a future conflict between an ARM_SSE() type checking macro and the ARMSSE typedef name. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-26-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/arm/armsse.h | 12 ++++++------ hw/arm/armsse.c | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 84080c2299..529816286d 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -106,8 +106,8 @@ #include "hw/core/split-irq.h" #include "hw/cpu/cluster.h" =20 -#define TYPE_ARMSSE "arm-sse" -#define ARMSSE(obj) OBJECT_CHECK(ARMSSE, (obj), TYPE_ARMSSE) +#define TYPE_ARM_SSE "arm-sse" +#define ARM_SSE(obj) OBJECT_CHECK(ARMSSE, (obj), TYPE_ARM_SSE) =20 /* * These type names are for specific IoTKit subsystems; other than @@ -224,9 +224,9 @@ typedef struct ARMSSEClass { const ARMSSEInfo *info; } ARMSSEClass; =20 -#define ARMSSE_CLASS(klass) \ - OBJECT_CLASS_CHECK(ARMSSEClass, (klass), TYPE_ARMSSE) -#define ARMSSE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(ARMSSEClass, (obj), TYPE_ARMSSE) +#define ARM_SSE_CLASS(klass) \ + OBJECT_CLASS_CHECK(ARMSSEClass, (klass), TYPE_ARM_SSE) +#define ARM_SSE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(ARMSSEClass, (obj), TYPE_ARM_SSE) =20 #endif diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index dcbff9bd8f..6264eab16b 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -167,7 +167,7 @@ static void irq_status_forwarder(void *opaque, int n, i= nt level) =20 static void nsccfg_handler(void *opaque, int n, int level) { - ARMSSE *s =3D ARMSSE(opaque); + ARMSSE *s =3D ARM_SSE(opaque); =20 s->nsccfg =3D level; } @@ -233,8 +233,8 @@ static void armsse_forward_sec_resp_cfg(ARMSSE *s) =20 static void armsse_init(Object *obj) { - ARMSSE *s =3D ARMSSE(obj); - ARMSSEClass *asc =3D ARMSSE_GET_CLASS(obj); + ARMSSE *s =3D ARM_SSE(obj); + ARMSSEClass *asc =3D ARM_SSE_GET_CLASS(obj); const ARMSSEInfo *info =3D asc->info; int i; =20 @@ -391,7 +391,7 @@ static void armsse_exp_irq(void *opaque, int n, int lev= el) =20 static void armsse_mpcexp_status(void *opaque, int n, int level) { - ARMSSE *s =3D ARMSSE(opaque); + ARMSSE *s =3D ARM_SSE(opaque); qemu_set_irq(s->mpcexp_status_in[n], level); } =20 @@ -401,7 +401,7 @@ static qemu_irq armsse_get_common_irq_in(ARMSSE *s, int= irqno) * Return a qemu_irq which can be used to signal IRQ n to * all CPUs in the SSE. */ - ARMSSEClass *asc =3D ARMSSE_GET_CLASS(s); + ARMSSEClass *asc =3D ARM_SSE_GET_CLASS(s); const ARMSSEInfo *info =3D asc->info; =20 assert(irq_is_common[irqno]); @@ -428,8 +428,8 @@ static void map_ppu(ARMSSE *s, int ppuidx, const char *= name, hwaddr addr) =20 static void armsse_realize(DeviceState *dev, Error **errp) { - ARMSSE *s =3D ARMSSE(dev); - ARMSSEClass *asc =3D ARMSSE_GET_CLASS(dev); + ARMSSE *s =3D ARM_SSE(dev); + ARMSSEClass *asc =3D ARM_SSE_GET_CLASS(dev); const ARMSSEInfo *info =3D asc->info; int i; MemoryRegion *mr; @@ -1114,7 +1114,7 @@ static void armsse_idau_check(IDAUInterface *ii, uint= 32_t address, * of the address bits. The NSC attribute is guest-adjustable via the * NSCCFG register in the security controller. */ - ARMSSE *s =3D ARMSSE(ii); + ARMSSE *s =3D ARM_SSE(ii); int region =3D extract32(address, 28, 4); =20 *ns =3D !(region & 1); @@ -1136,7 +1136,7 @@ static const VMStateDescription armsse_vmstate =3D { =20 static void armsse_reset(DeviceState *dev) { - ARMSSE *s =3D ARMSSE(dev); + ARMSSE *s =3D ARM_SSE(dev); =20 s->nsccfg =3D 0; } @@ -1145,7 +1145,7 @@ static void armsse_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); IDAUInterfaceClass *iic =3D IDAU_INTERFACE_CLASS(klass); - ARMSSEClass *asc =3D ARMSSE_CLASS(klass); + ARMSSEClass *asc =3D ARM_SSE_CLASS(klass); const ARMSSEInfo *info =3D data; =20 dc->realize =3D armsse_realize; @@ -1157,7 +1157,7 @@ static void armsse_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo armsse_info =3D { - .name =3D TYPE_ARMSSE, + .name =3D TYPE_ARM_SSE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMSSE), .instance_init =3D armsse_init, @@ -1177,7 +1177,7 @@ static void armsse_register_types(void) for (i =3D 0; i < ARRAY_SIZE(armsse_variants); i++) { TypeInfo ti =3D { .name =3D armsse_variants[i].name, - .parent =3D TYPE_ARMSSE, + .parent =3D TYPE_ARM_SSE, .class_init =3D armsse_class_init, .class_data =3D (void *)&armsse_variants[i], }; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557297; cv=none; d=zohomail.com; s=zohoarc; b=Q6n0QOEt/f6bdNnAMh6+27caeBdK2CMlXFautS08KLmAYwt03K5A1j/Ua8k68CFjeWWgavMIi6XeSqDr9Bu2ADVr4uQdtAuLsztLA6c+qzZcTATg5ESewRffGFbxkavDMizEK7yzBepwGmeIYNVnh5hqA2JPiCkfb+/7HZulu9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557297; 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=6m7+zGiLc9rB4CIybQhtjj2AzYa0ZlXS+zjIxx+URlY=; b=noFhW40selTN0mDldWzSSOxmEIJHVpmWsYsCd6wF2neFbDbZLJdZa0c8ziV6dIgdCV+CbCFG5nhFgV1jZXow62hUxO/kMcVBZFc3lYA3zE7QwhdpGIJk5wUk7CfyfGnNd1E+hUL8FHXGb8j4TCTIeGL1h6PLfMP5wm7vkm9w1rw= 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 1598557297167780.425362972799; Thu, 27 Aug 2020 12:41:37 -0700 (PDT) Received: from localhost ([::1]:44562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNmC-0003b9-0D for importer@patchew.org; Thu, 27 Aug 2020 15:41:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTl-0007S0-5f for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26797 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTg-0000RM-V4 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:32 -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-15-lJSavYrwPNmn_BP9UifiEw-1; Thu, 27 Aug 2020 15:22:21 -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 A3F41101C2EB; Thu, 27 Aug 2020 19:22:19 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63DB560FC2; Thu, 27 Aug 2020 19:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556143; 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=6m7+zGiLc9rB4CIybQhtjj2AzYa0ZlXS+zjIxx+URlY=; b=UI2SjuqnnkqvatZbE9AiuxGQcCJ9Pf3A9lOsivJ3oNay7s4UWn7SZSaa+LJjxAVfCMCQ85 4yAYwlmXP8Ki5G3ccT4sKJBQ3yyqICoRnPQcwqVlv/hdSEcsAnocoN5K1gltbUyrnh9FHD ZRn6kfMNtjS7AvXiKYrGiUWnJe8wlg8= X-MC-Unique: lJSavYrwPNmn_BP9UifiEw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 25/53] xen-legacy-backend: Add missing typedef XenLegacyDevice Date: Thu, 27 Aug 2020 15:20:54 -0400 Message-Id: <20200827192122.658035-26-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Igor Mammedov , Anthony PERARD , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The typedef was used in the XENBACKEND_DEVICE macro, but it was never defined. Define the typedef close to the type checking macro. Acked-by: Anthony PERARD Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-27-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/xen/xen-legacy-backend.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legac= y-backend.h index 5e6c56c4d6..704bc7852b 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -9,6 +9,7 @@ #define TYPE_XENSYSBUS "xen-sysbus" #define TYPE_XENBACKEND "xen-backend" =20 +typedef struct XenLegacyDevice XenLegacyDevice; #define XENBACKEND_DEVICE(obj) \ OBJECT_CHECK(XenLegacyDevice, (obj), TYPE_XENBACKEND) =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557677; cv=none; d=zohomail.com; s=zohoarc; b=h35c8NiwJRXIbHr+AIsJQ3Av1NLXVg+hJ9SqICQBGmU7ow1YtdJVXx3QTnr1X8UxHA0RI4J6znC2wBSr9PXp2ws0WFE9lujdH7nbNFermRCaNUwSO4bcvPxcVw7cu5R/FmYe1trCORZpfFp1WOkasbUHrS+TGdfgFaG04nVB678= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557677; 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=Ik14MHAXhtMtwVTmtm369eS+bBuD0Gph5E5LCubbjec=; b=ijkvQLvaQiHKvnhpSIY+zJGHYnJqiWGCu7ZMsJ7XkJD4QHxl7wDKV9AaZ820haNIiPZJzS8xqLC/VWqVcYNH2Ks252B63i8HK37Pxv99McxuJs8qY81AmtGp2YpnnxeN6KasHfjgLnE137gAOoTFVT1IlncE6notL+X4PgG3SMQ= 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 1598557677606460.64501693291425; Thu, 27 Aug 2020 12:47:57 -0700 (PDT) Received: from localhost ([::1]:40532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNsK-0004wp-1t for importer@patchew.org; Thu, 27 Aug 2020 15:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTn-0007XR-2I for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:35 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52019 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTg-0000SW-W6 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:34 -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-252-G4rSvv69P7me7Cs9KwJP7A-1; Thu, 27 Aug 2020 15:22:21 -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 B400E101C2E4; Thu, 27 Aug 2020 19:22:20 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 744587849B; Thu, 27 Aug 2020 19:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556146; 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=Ik14MHAXhtMtwVTmtm369eS+bBuD0Gph5E5LCubbjec=; b=NenYbrFpfKVb9zfpKBGr6BJBE0g0pq48IvGyPG3rMD9p7N2VpQyse3K4pojHtaSJVFC11i xn5GCkDczsyebTZs4KJvuSDFGGybTtlKAc34m7FGjhR4KJ2mv35c4FBcZEbmPTC7X2D36L t/VdUxGzqLXrOBuNr1Lc60wS+sqnZ1Q= X-MC-Unique: G4rSvv69P7me7Cs9KwJP7A-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 26/53] spapr: Move typedef SpaprMachineState to spapr.h Date: Thu, 27 Aug 2020 15:20:55 -0400 Message-Id: <20200827192122.658035-27-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move the typedef from spapr_irq.h to spapr.h, and use "struct SpaprMachineState" in the spapr_*.h headers (to avoid circular header dependencies). This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-28-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/ppc/spapr.h | 1 + include/hw/ppc/spapr_irq.h | 36 ++++++++++++++++++------------------ include/hw/ppc/spapr_xive.h | 3 ++- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 3134d339e8..a1e230ad39 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -41,6 +41,7 @@ typedef struct SpaprDimmState SpaprDimmState; typedef struct SpaprMachineClass SpaprMachineClass; =20 #define TYPE_SPAPR_MACHINE "spapr-machine" +typedef struct SpaprMachineState SpaprMachineState; #define SPAPR_MACHINE(obj) \ OBJECT_CHECK(SpaprMachineState, (obj), TYPE_SPAPR_MACHINE) #define SPAPR_MACHINE_GET_CLASS(obj) \ diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index ca8cb44213..b161ccebc2 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -28,7 +28,7 @@ =20 #define SPAPR_NR_XIRQS 0x1000 =20 -typedef struct SpaprMachineState SpaprMachineState; +struct SpaprMachineState; =20 typedef struct SpaprInterruptController SpaprInterruptController; =20 @@ -67,20 +67,20 @@ typedef struct SpaprInterruptControllerClass { int (*post_load)(SpaprInterruptController *intc, int version_id); } SpaprInterruptControllerClass; =20 -void spapr_irq_update_active_intc(SpaprMachineState *spapr); +void spapr_irq_update_active_intc(struct SpaprMachineState *spapr); =20 -int spapr_irq_cpu_intc_create(SpaprMachineState *spapr, +int spapr_irq_cpu_intc_create(struct SpaprMachineState *spapr, PowerPCCPU *cpu, Error **errp); -void spapr_irq_cpu_intc_reset(SpaprMachineState *spapr, PowerPCCPU *cpu); -void spapr_irq_cpu_intc_destroy(SpaprMachineState *spapr, PowerPCCPU *cpu); -void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon); -void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers, +void spapr_irq_cpu_intc_reset(struct SpaprMachineState *spapr, PowerPCCPU = *cpu); +void spapr_irq_cpu_intc_destroy(struct SpaprMachineState *spapr, PowerPCCP= U *cpu); +void spapr_irq_print_info(struct SpaprMachineState *spapr, Monitor *mon); +void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers, void *fdt, uint32_t phandle); =20 -uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr); -int spapr_irq_msi_alloc(SpaprMachineState *spapr, uint32_t num, bool align, +uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr); +int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, boo= l align, Error **errp); -void spapr_irq_msi_free(SpaprMachineState *spapr, int irq, uint32_t num); +void spapr_irq_msi_free(struct SpaprMachineState *spapr, int irq, uint32_t= num); =20 typedef struct SpaprIrq { bool xics; @@ -92,13 +92,13 @@ extern SpaprIrq spapr_irq_xics_legacy; extern SpaprIrq spapr_irq_xive; extern SpaprIrq spapr_irq_dual; =20 -void spapr_irq_init(SpaprMachineState *spapr, Error **errp); -int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **e= rrp); -void spapr_irq_free(SpaprMachineState *spapr, int irq, int num); -qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq); -int spapr_irq_post_load(SpaprMachineState *spapr, int version_id); -void spapr_irq_reset(SpaprMachineState *spapr, Error **errp); -int spapr_irq_get_phandle(SpaprMachineState *spapr, void *fdt, Error **err= p); +void spapr_irq_init(struct SpaprMachineState *spapr, Error **errp); +int spapr_irq_claim(struct SpaprMachineState *spapr, int irq, bool lsi, Er= ror **errp); +void spapr_irq_free(struct SpaprMachineState *spapr, int irq, int num); +qemu_irq spapr_qirq(struct SpaprMachineState *spapr, int irq); +int spapr_irq_post_load(struct SpaprMachineState *spapr, int version_id); +void spapr_irq_reset(struct SpaprMachineState *spapr, Error **errp); +int spapr_irq_get_phandle(struct SpaprMachineState *spapr, void *fdt, Erro= r **errp); =20 typedef int (*SpaprInterruptControllerInitKvm)(SpaprInterruptController *, uint32_t, Error **); @@ -111,7 +111,7 @@ int spapr_irq_init_kvm(SpaprInterruptControllerInitKvm = fn, /* * XICS legacy routines */ -int spapr_irq_find(SpaprMachineState *spapr, int num, bool align, Error **= errp); +int spapr_irq_find(struct SpaprMachineState *spapr, int num, bool align, E= rror **errp); #define spapr_irq_findone(spapr, errp) spapr_irq_find(spapr, 1, false, err= p) =20 #endif diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 0ffbe0be02..a1c8540ab4 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -66,7 +66,8 @@ typedef struct SpaprXiveClass { =20 void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon); =20 -void spapr_xive_hcall_init(SpaprMachineState *spapr); +struct SpaprMachineState; +void spapr_xive_hcall_init(struct SpaprMachineState *spapr); void spapr_xive_mmio_set_enabled(SpaprXive *xive, bool enable); void spapr_xive_map_mmio(SpaprXive *xive); =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557611; cv=none; d=zohomail.com; s=zohoarc; b=E1iyrPZpd1iE+WGmIgQkW1hTdG2ZG/1P4dKOu3sXEUt6paRQvcsmlxFOEYXjgdoEr9I0ck3gdWXKFpnwpHL8pq6m/uNGcqN4Fz9pNRdEssnuucmgnbc+8z5PwSYdIV512jJ1/yleNduQflL17IxA5vjs4YD8T3bv15YfMu2cVO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557611; 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=yAU4tVS7aPRW5XItUAha+EHzHkQnvvorrA8YoWf36I4=; b=nw6cPbiiZEWY2psZE/73Ejyq/9jsXj0IuN1TDIhDxkk07mKvTDhJFJAvO3QeazkuANKTwlITPCSzE8wYNH9iBR9/uNXMOrs4vTQp3ubzUs0OK/zs0vB8jcQ4wDBz0oB8N53zTWERlHL1iZj2cJfH+pT8MgeZxTJ99Bk4MD411F8= 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 1598557611573575.7728680197729; Thu, 27 Aug 2020 12:46:51 -0700 (PDT) Received: from localhost ([::1]:36370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNrG-0003H4-DF for importer@patchew.org; Thu, 27 Aug 2020 15:46:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTm-0007VB-6x for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTg-0000SY-WE for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:33 -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-401-tan1dLt7Nzm7CXzABSZRqQ-1; Thu, 27 Aug 2020 15:22:23 -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 97CF5107464C; Thu, 27 Aug 2020 19:22:22 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DC887849B; Thu, 27 Aug 2020 19:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556146; 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=yAU4tVS7aPRW5XItUAha+EHzHkQnvvorrA8YoWf36I4=; b=Tn9AkNP/YfmzvZ9IgOjcLYIuh/elRifXGjB/sYalSMHj7tES8CfMjQUzvWH2GUTf1Cvw3u FEMh09g2D0c3Uehjke4hJ8I8nCXNmSLM7aZEhjru5YknQd8M7Ws7JWXwy0daBx6U5DTQUE pheRDqscN1rWE4htoTvluWVrOwfmyZY= X-MC-Unique: tan1dLt7Nzm7CXzABSZRqQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 27/53] s390x: Move typedef SCLPEventFacility to event-facility.h Date: Thu, 27 Aug 2020 15:20:56 -0400 Message-Id: <20200827192122.658035-28-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. In sclp.h, use "struct SCLPEventFacility" to avoid introducing unnecessary header dependencies. Acked-by: Cornelia Huck Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Reviewed-by: Thomas Huth Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-29-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/s390x/event-facility.h | 1 + include/hw/s390x/sclp.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index 700a610f33..e61c4651d7 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -195,6 +195,7 @@ typedef struct SCLPEventClass { } SCLPEventClass; =20 #define TYPE_SCLP_EVENT_FACILITY "s390-sclp-event-facility" +typedef struct SCLPEventFacility SCLPEventFacility; #define EVENT_FACILITY(obj) \ OBJECT_CHECK(SCLPEventFacility, (obj), TYPE_SCLP_EVENT_FACILITY) #define EVENT_FACILITY_CLASS(klass) \ diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index 822eff4396..a87ed2a0ab 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -185,12 +185,12 @@ typedef struct SCCB { #define SCLP_CLASS(oc) OBJECT_CLASS_CHECK(SCLPDeviceClass, (oc), TYPE_SCLP) #define SCLP_GET_CLASS(obj) OBJECT_GET_CLASS(SCLPDeviceClass, (obj), TYPE_= SCLP) =20 -typedef struct SCLPEventFacility SCLPEventFacility; +struct SCLPEventFacility; =20 typedef struct SCLPDevice { /* private */ DeviceState parent_obj; - SCLPEventFacility *event_facility; + struct SCLPEventFacility *event_facility; int increment_size; =20 /* public */ --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557376; cv=none; d=zohomail.com; s=zohoarc; b=ApXj9wZP7XR8fhho7CSA8BFxRsQTugxu5GNa3ha1b9xXgUkoeR0mKK2MlCm8VlTAevmByd99PxPbk6jrHAH6XBOGj995YARuFd2aHaBNfpvAwENQCM6jwaxFRNsNz0MmaSpSgKSN3bbZmlixcHBoDa5ao1a5PDQxWfxgdqL5H/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557376; 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=buKt9oftnuCXgZrQbXZGbP4rSbw7EOmuPkekw22LSRQ=; b=mVMfEc+dI5O/czbh8CfJG66PFzrd9NImoVWXw5coDWhBFm32usxqYfRIP5o+wYY8JiER/81hZz4qGVkEImnQreOhinH6OgZnP5Vufm26Goyq23to33pnu5mTijByg6bs6Vs2QABx3dEqdPQCjAxtcWK5G9whgF1VGcyKDz3P2Oo= 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 1598557376525423.3874647718676; Thu, 27 Aug 2020 12:42:56 -0700 (PDT) Received: from localhost ([::1]:48642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNnS-0005FN-39 for importer@patchew.org; Thu, 27 Aug 2020 15:42:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTo-0007ay-E9 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37680 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTl-0000T8-1T for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -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-280-BJbFRRWONhWTIN_PD_DRcw-1; Thu, 27 Aug 2020 15:22:28 -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 E9AC28018A4; Thu, 27 Aug 2020 19:22:26 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F0AB60FC2; Thu, 27 Aug 2020 19:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556152; 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=buKt9oftnuCXgZrQbXZGbP4rSbw7EOmuPkekw22LSRQ=; b=bGtBHRW6E6zDAbvMt+/S5LDGbf7aNo8REyiwYYh7fVRlofhH4PUd5RNVo6g8d3wW5WHjXM FaV6lvJgbb4PqKIJoD5+d3uNEWCv8PMP8Xh8LzauNd7ZPJhXIxSQN3hGUpd7IY1LnMXuXw /ZVSyPdUb+JufnPVODvBqUgxb5H12fU= X-MC-Unique: BJbFRRWONhWTIN_PD_DRcw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 28/53] vhost-user-gpu: Move QOM macro to header Date: Thu, 27 Aug 2020 15:20:57 -0400 Message-Id: <20200827192122.658035-29-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move the VHOST_USER_GPU type checking macro to virtio-gpu.h, close to the TYPE_VHOST_USER_GPU #define. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-30-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/virtio/virtio-gpu.h | 2 ++ hw/display/vhost-user-gpu.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 6dd57f2025..7517438e10 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -36,6 +36,8 @@ OBJECT_CHECK(VirtIOGPU, (obj), TYPE_VIRTIO_GPU) =20 #define TYPE_VHOST_USER_GPU "vhost-user-gpu" +#define VHOST_USER_GPU(obj) \ + OBJECT_CHECK(VhostUserGPU, (obj), TYPE_VHOST_USER_GPU) =20 #define VIRTIO_ID_GPU 16 =20 diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 4cdaee1bde..51f1747c4a 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -17,9 +17,6 @@ #include "qapi/error.h" #include "migration/blocker.h" =20 -#define VHOST_USER_GPU(obj) \ - OBJECT_CHECK(VhostUserGPU, (obj), TYPE_VHOST_USER_GPU) - typedef enum VhostUserGpuRequest { VHOST_USER_GPU_NONE =3D 0, VHOST_USER_GPU_GET_PROTOCOL_FEATURES, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557770; cv=none; d=zohomail.com; s=zohoarc; b=n0Efnm4x9VqjSgoXAWvTbNZR+IosqK5kLuR4HUWmUv6oXGuRJ0tg4U7hCGz6zG92hcsbiYti7uEfVzzt0YxLCwMK68UTRd8j4uRVjgh3A9okc+9hJbuTmp9HLDgWDlOnzD2NbAbRq0En5q2xjKu6noa1C6HQHY+VYryNZ80Cbps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557770; 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=E4iFFHbbejOKhyQs06hmEa9IJFuf0W41RmCWhEmOxK0=; b=QGQaRAeM+STbqbuVf9DW77fSM5sIWdYVfa2P0yUz9ADa25hLR1NSYaVLDowdrS6Dkn3QtF6Zx7f18Rzs3l7mXI5LZhqgl9qz+JLL6earaHQJvBw7pOhFb7BAEFu00ZB4gbbrbShXkW3XkssTE8HyVcfdA0Pu7oM/vKetYZWvSMg= 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 1598557770836855.06391512068; Thu, 27 Aug 2020 12:49:30 -0700 (PDT) Received: from localhost ([::1]:44822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNtp-0006fa-MJ for importer@patchew.org; Thu, 27 Aug 2020 15:49:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTp-0007da-MI for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTl-0000TA-8c for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:37 -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-460-BWGUA7jKOFShDqBaWA4xqg-1; Thu, 27 Aug 2020 15:22:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F180F801AF6; Thu, 27 Aug 2020 19:22:28 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6E857D4E4; Thu, 27 Aug 2020 19:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556152; 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=E4iFFHbbejOKhyQs06hmEa9IJFuf0W41RmCWhEmOxK0=; b=LOz0tP9Uvm4J2re1WtQiEP2v58nM36nJt/bU2N7gilL5+IRXP9O7GGc4Qg2D4ameKE9kWp vRrAE/z26ZhEpfu76VFTcXgD6w7CUm7Y4ulxaFeUOwfAXme69tmu9Vz7kz8ieZH4NUXsH8 BZkFNqmfEFeLxRsuw4IBUw2G105puLw= X-MC-Unique: BWGUA7jKOFShDqBaWA4xqg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 29/53] ahci: Move QOM macros to header Date: Thu, 27 Aug 2020 15:20:58 -0400 Message-Id: <20200827192122.658035-30-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The TYPE_* constants and the typedefs are defined in ahci.h, so we can move the type checking macros there too. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-31-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/ide/ahci_internal.h | 5 ----- include/hw/ide/ahci.h | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index bab0459774..ac9bdead7b 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -332,9 +332,6 @@ struct AHCIPCIState { AHCIState ahci; }; =20 -#define ICH_AHCI(obj) \ - OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI) - extern const VMStateDescription vmstate_ahci; =20 #define VMSTATE_AHCI(_field, _state) { \ @@ -394,6 +391,4 @@ void ahci_uninit(AHCIState *s); =20 void ahci_reset(AHCIState *s); =20 -#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_= AHCI) - #endif /* HW_IDE_AHCI_INTERNAL_H */ diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index b44e3000cf..ce2bf8a5f8 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -53,11 +53,14 @@ typedef struct AHCIState { typedef struct AHCIPCIState AHCIPCIState; =20 #define TYPE_ICH9_AHCI "ich9-ahci" +#define ICH_AHCI(obj) \ + OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI) =20 int32_t ahci_get_num_ports(PCIDevice *dev); void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd); =20 #define TYPE_SYSBUS_AHCI "sysbus-ahci" +#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_= AHCI) =20 typedef struct SysbusAHCIState { /*< private >*/ --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556851; cv=none; d=zohomail.com; s=zohoarc; b=Ptmb87eTqRdH97/ZcV6/4D4ZSnT9bDCwAwQkwW2amkJqNGcfcB9KRS0doWOTYZwdJK0sFpOdRUzxoPL+LEVgyVs6u4BQXYv9qRzePheFZUKFOdFHX3ouEVEk9LgJAngzMN6K/IQKhhHEpQrKmP9eD1lYyHTEh95UEUjkVbYgE7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556851; 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=QDFvAThdxBiZ+OodaaiyC2nMo9zw7CtZ3DTqqwycb/U=; b=mT4fdV4H+cxVji9j54Xt/kqHvIpLCilihUCCIF6EjSocF0E7VNkgykTbfFNu688PY3D6ypo6pwivKBjCtON9XSqZsCjnwToYH/ZXbCgpsNEKWROGig4f+/mcab01bxL/y7LKfpCt/cfO1UJvabc1AhZwLgI4mXFeKRfvKs/SeZ4= 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 1598556851042288.15993943407875; Thu, 27 Aug 2020 12:34:11 -0700 (PDT) Received: from localhost ([::1]:34374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNez-0004cn-Nc for importer@patchew.org; Thu, 27 Aug 2020 15:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTo-0007cD-SD for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21863 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTm-0000TJ-0b for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -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-504-vOMGLmBSPY2TrPi3GHDqXg-1; Thu, 27 Aug 2020 15:22:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5C491074668; Thu, 27 Aug 2020 19:22:29 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABBC678396; Thu, 27 Aug 2020 19:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556153; 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=QDFvAThdxBiZ+OodaaiyC2nMo9zw7CtZ3DTqqwycb/U=; b=YKaT4yO38P6Mu4bIm2cIhdV4bNmIJoH+nLAPZKvduYiaAJyB7X871YmIQJ3OvJ/myZdU5r Ug4vOIsaP6ZqTgLxJeDJ7o+oA+XCxFIuvde2+MZJTdzgMbgGGg+h4+rDpwrHtr0VfnnELU EMBugyNv8XXNR/aLKztUD1xlRieo+yk= X-MC-Unique: vOMGLmBSPY2TrPi3GHDqXg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 30/53] i8257: Move QOM macro to header Date: Thu, 27 Aug 2020 15:20:59 -0400 Message-Id: <20200827192122.658035-31-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move the I8257 macro to i8257.h, close to the TYPE_I8257 define. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-32-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/dma/i8257.h | 2 ++ hw/dma/i8257.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 03e2c166be..ee06371699 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -5,6 +5,8 @@ #include "exec/ioport.h" =20 #define TYPE_I8257 "i8257" +#define I8257(obj) \ + OBJECT_CHECK(I8257State, (obj), TYPE_I8257) =20 typedef struct I8257Regs { int now[2]; diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index db808029b0..de5f696919 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -33,8 +33,6 @@ #include "qemu/log.h" #include "trace.h" =20 -#define I8257(obj) \ - OBJECT_CHECK(I8257State, (obj), TYPE_I8257) =20 /* #define DEBUG_DMA */ =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598556957; cv=none; d=zohomail.com; s=zohoarc; b=kPP0bTw3tg+rIJwAamBfBbyjH8rshTjmnhJDdXkddCEVCaCdt6rD8swzGyf9KJC1SBvHucqtQwoCxH1/932WfWEKdyOGr3bY2FDbcyV+r1csZErRN6oVKQkuhTKFA5rdu5VDE+NXd2/d0+jKOgqCnE+Rri/uIGkb1F2MU74E6VM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556957; 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=3ilQNTa7uND8ERU/CX8/fVvxaxWeqnExbJ3dT0n01Fw=; b=H79qCb2cl1My1M5xVLsib4kAcBwo59KhyWfsqaH81ofRFcUOLnqRysFB2cFl/FLvYqynppk03UB8FvwI0b4ZhZn6AgPQx6MgOUYTr0zfziPYl+K4LVi7ndnZikHv/G65ZffQXZp+yikwdohhwVwbfasbrjwWjxzjp77ZFN6QDyU= 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 1598556957157922.4009566279896; Thu, 27 Aug 2020 12:35:57 -0700 (PDT) Received: from localhost ([::1]:42448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNgg-00080N-U8 for importer@patchew.org; Thu, 27 Aug 2020 15:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTp-0007cX-1B for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60091 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTn-0000TX-5j for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:36 -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-351-2bEd1aQXPFG6ivjveDYRQQ-1; Thu, 27 Aug 2020 15:22:31 -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 E57F5101C2E3; Thu, 27 Aug 2020 19:22:30 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB734747BD; Thu, 27 Aug 2020 19:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556154; 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=3ilQNTa7uND8ERU/CX8/fVvxaxWeqnExbJ3dT0n01Fw=; b=Ch+/rdxoMLUgRleB2tFGb6oWMC72g9ff/zA3GY8K/F/5nDtpE4HMRCmQPbHArehw1KqpcK HNTbSflP5Q03gxmL7062zlabh6u3882pRhvcj8Hmj52l3yoMEasXMkcM2RFp7EMd5oGxET W/f4EruNKBqdCySeMUARZAw5e8BS3Lw= X-MC-Unique: 2bEd1aQXPFG6ivjveDYRQQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 31/53] ahci: Move QOM macro to header Date: Thu, 27 Aug 2020 15:21:00 -0400 Message-Id: <20200827192122.658035-32-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move the ALLWINNER_AHCI macro close to the TYPE_ALLWINNER_AHCI define. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-33-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/ide/ahci.h | 2 ++ hw/ide/ahci-allwinner.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index ce2bf8a5f8..41bb517047 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -72,6 +72,8 @@ typedef struct SysbusAHCIState { } SysbusAHCIState; =20 #define TYPE_ALLWINNER_AHCI "allwinner-ahci" +#define ALLWINNER_AHCI(obj) \ + OBJECT_CHECK(AllwinnerAHCIState, (obj), TYPE_ALLWINNER_AHCI) =20 #define ALLWINNER_AHCI_MMIO_OFF 0x80 #define ALLWINNER_AHCI_MMIO_SIZE 0x80 diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c index 8536b9eb5a..227e747ba7 100644 --- a/hw/ide/ahci-allwinner.c +++ b/hw/ide/ahci-allwinner.c @@ -25,9 +25,6 @@ =20 #include "trace.h" =20 -#define ALLWINNER_AHCI(obj) \ - OBJECT_CHECK(AllwinnerAHCIState, (obj), TYPE_ALLWINNER_AHCI) - #define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4) #define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4) #define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4) --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557834; cv=none; d=zohomail.com; s=zohoarc; b=d39I/qsNxK9BsNeu/C+wLmHG9I6Jrk/CeRqpDDluaDJpa4XT4Uh0ojL+BhDPUPzE57lN18vfUD03E26C8fGgEXRjIjimwjfYlrkPlOcC7qFRoz/JA2YLzv2RNJCBh1L77TANztLpJ1QnRIkK4enYz7f8/H5oflQcWkH3rm03dTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557834; 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=ClHMBwjDNhYDDMdiCYbxXiOD5wk+OXlFAseOOxzfMuk=; b=QZBkUbPhCUR1EEi+DWBpgydsyhY3zVj2m6bybOjXq8cIvNMU97GX2gWwgZ7gEA3dgh3BS8tQT0dmfEAMQImxP4Sh2HvqBtNa3KDCz/Df6s/NarfoP8pc0eRfgUU6wiZJbe2gO5t8OO5KUhZXyTxPa5j+PEvKZQRWRDh57qyJ0m4= 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 1598557834932713.2632238179742; Thu, 27 Aug 2020 12:50:34 -0700 (PDT) Received: from localhost ([::1]:49092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNur-0008Rz-ME for importer@patchew.org; Thu, 27 Aug 2020 15:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTr-0007fR-CC for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTp-0000UY-Ng for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:39 -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-451-RfQeboBbNgStEfGASWAG6w-1; Thu, 27 Aug 2020 15:22:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2FE48018A4; Thu, 27 Aug 2020 19:22:32 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id B346F795B0; Thu, 27 Aug 2020 19:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556156; 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=ClHMBwjDNhYDDMdiCYbxXiOD5wk+OXlFAseOOxzfMuk=; b=D7kN7Yx8yXAHG0gj7tcmT0p3lyxZBUq3aI1VWhJWKKECqvSZfv6XuEko15hBzFQE3Sslkq 7W+fmJr9p/2K/qlohhavZWlFSZERdmkhAjU5m1qiZdOTFl/ipUUPg2ffbm9g6OWJ9DAexD 2hkREaNYvYZnweEiQzNSPmwiai/TaPo= X-MC-Unique: RfQeboBbNgStEfGASWAG6w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 32/53] pckbd: Move QOM macro to header Date: Thu, 27 Aug 2020 15:21:01 -0400 Message-Id: <20200827192122.658035-33-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move the I8042 macro close to the TYPE_I8042 define. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-34-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/input/i8042.h | 1 + hw/input/pckbd.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 8eaebf50ce..4569dfddd9 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -11,6 +11,7 @@ #include "hw/isa/isa.h" =20 #define TYPE_I8042 "i8042" +#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) =20 #define I8042_A20_LINE "a20" =20 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 29d633ca94..dde85ba6c6 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -481,8 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, qemu_register_reset(kbd_reset, s); } =20 -#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) - struct ISAKBDState { ISADevice parent_obj; =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557899; cv=none; d=zohomail.com; s=zohoarc; b=E85MLHKeOv2duehOndJRzKuzgItcjCQLXkPMlsPQ1tFnOMinJkx+nM5MpWqoYlIx7BwZzHSCVBmCNZfgKORlPDxXdBNdY0qYwhuo+DMosZAtXGyntTYuJzCPKoycFN2NDjedf/Q5LFy5CfpXuHkzrCIPQr7v8mf0saWB4nXymjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557899; 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=P847TqoNJFzJB2K8e6REplRN3E3O2/fiCQfD92kksM8=; b=hsvOtdGT0bgn87BhrOtHpTi/uMmLHpQK8ck0WEBf6dP9URZA1cBcZTc22yiggKgVEpsCGLkFJpbiKNlXhHGD3hLr3ym6zTOXXUG0ixm3q8NC9hGySAwVY2Rv/nJvRRvlQGZnFMGBsRXIyOpVDa4MNBxRRMx2rntOPPB2kBFcoM0= 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 1598557899545186.44814597129732; Thu, 27 Aug 2020 12:51:39 -0700 (PDT) Received: from localhost ([::1]:53346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNvu-0001jv-6h for importer@patchew.org; Thu, 27 Aug 2020 15:51:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTw-0007gT-MF for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:45 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57070 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTr-0000V2-6j for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:44 -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-390-ISvVBzAMMo-NrwHLB6XuSA-1; Thu, 27 Aug 2020 15:22:35 -0400 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 04F81189E616; Thu, 27 Aug 2020 19:22:34 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7BAA19D61; Thu, 27 Aug 2020 19:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556157; 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=P847TqoNJFzJB2K8e6REplRN3E3O2/fiCQfD92kksM8=; b=jDxas//h14yYIOnhZu+nLVrKqa2M4liE+ao3+tLo4vltWUhYHoz4WFp3YkNw/fAJq1iUiD fdV660fhWUoJc1jVy3xXJda0GMwZ+h1v4y0wPNf81IjR6BlaXi8Pru7jo1+3H/gHa1R96O GAgOE/E/zHMQAQNOfZXGWZIEjuZrD9Y= X-MC-Unique: ISvVBzAMMo-NrwHLB6XuSA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 33/53] vmbus: Move QOM macros to vmbus.h Date: Thu, 27 Aug 2020 15:21:02 -0400 Message-Id: <20200827192122.658035-34-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move all declarations related to TYPE_VMBUS to the same place in vmbus.h. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-35-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/hyperv/vmbus-bridge.h | 3 +-- include/hw/hyperv/vmbus.h | 4 ++++ hw/hyperv/vmbus.c | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bri= dge.h index 33f93de64d..fe90bda01b 100644 --- a/include/hw/hyperv/vmbus-bridge.h +++ b/include/hw/hyperv/vmbus-bridge.h @@ -11,11 +11,10 @@ #define HW_HYPERV_VMBUS_BRIDGE_H =20 #include "hw/sysbus.h" +#include "hw/hyperv/vmbus.h" =20 #define TYPE_VMBUS_BRIDGE "vmbus-bridge" =20 -typedef struct VMBus VMBus; - typedef struct VMBusBridge { SysBusDevice parent_obj; =20 diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h index 40e8417eec..cd98ec24e7 100644 --- a/include/hw/hyperv/vmbus.h +++ b/include/hw/hyperv/vmbus.h @@ -26,6 +26,10 @@ #define VMBUS_DEVICE_GET_CLASS(obj) \ OBJECT_GET_CLASS(VMBusDeviceClass, (obj), TYPE_VMBUS_DEVICE) =20 +#define TYPE_VMBUS "vmbus" +typedef struct VMBus VMBus; +#define VMBUS(obj) OBJECT_CHECK(VMBus, (obj), TYPE_VMBUS) + /* * Object wrapping a GPADL -- GPA Descriptor List -- an array of guest phy= sical * pages, to be used for various buffers shared between the host and the g= uest. diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 34392e892a..75af6b83dd 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -20,9 +20,6 @@ #include "cpu.h" #include "trace.h" =20 -#define TYPE_VMBUS "vmbus" -#define VMBUS(obj) OBJECT_CHECK(VMBus, (obj), TYPE_VMBUS) - enum { VMGPADL_INIT, VMGPADL_ALIVE, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557154; cv=none; d=zohomail.com; s=zohoarc; b=M7Iu6cQN/RXieK9YjY74fPyfSjgYg683VIrydZ5pIDgad1NnFFOThBQAAUTFM7s/eQ+kreh7hsf6hXYupyYongb+eqhh4RMHfskWLFZsDK1KSHUt55m7P2BPMlKz61P16Gws3G/jg8GnUmEo9NWJ4RNn4fkModfAHrKObLP5z5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557154; 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=8V+AdwqlbYUH6OguZbyOOfR6ie5miodV0Nz/vrMwUcU=; b=cWrL53OA2ciTO9gRyoOh9ssTHdQu5ppz2e9e/GtOaKQiN7JvKNFFJ7UHNG6OKWcGfeewI3hQrPvHE/ZK4OOPH6OcbYBlqetMucHcHqZ33Qv4XgkIagVPhYHRZmU6JPCBmIwsAIj9+IshIewrilv6yr07pNfxLL71MePO1KO3bug= 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 1598557154210442.6585640478329; Thu, 27 Aug 2020 12:39:14 -0700 (PDT) Received: from localhost ([::1]:60414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNjs-0006uF-T3 for importer@patchew.org; Thu, 27 Aug 2020 15:39:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTw-0007gM-Lb for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTr-0000VL-PG for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:43 -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-569-jFFrD_qPPNih1k3pf96kTg-1; Thu, 27 Aug 2020 15:22:36 -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 E152D1074672; Thu, 27 Aug 2020 19:22:35 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 770F05D9F1; Thu, 27 Aug 2020 19:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556159; 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=8V+AdwqlbYUH6OguZbyOOfR6ie5miodV0Nz/vrMwUcU=; b=e1RlwUWnAFGJWRfT/PAEs9kRWINCWzORKL1H+d1RsbIQ3+caN7ohAwGsj/MhHc5K5mlyqo gyrNtg0S4LI/UWlugOl+6n5Ldgw6m/u9f5RFLXizi+Fbgu9ZPVkopKuLjdt0v+SyWa36dG y5yh05UgqI3dY33MKRky8675czmhe5w= X-MC-Unique: jFFrD_qPPNih1k3pf96kTg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 34/53] virtio-serial-bus: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:03 -0400 Message-Id: <20200827192122.658035-35-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-36-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/virtio/virtio-serial.h | 5 +++++ hw/char/virtio-serial-bus.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-s= erial.h index ed3e916b68..448615a6b3 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -33,7 +33,12 @@ struct virtio_serial_conf { OBJECT_GET_CLASS(VirtIOSerialPortClass, (obj), TYPE_VIRTIO_SERIAL_POR= T) =20 typedef struct VirtIOSerial VirtIOSerial; + +#define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus" typedef struct VirtIOSerialBus VirtIOSerialBus; +#define VIRTIO_SERIAL_BUS(obj) \ + OBJECT_CHECK(VirtIOSerialBus, (obj), TYPE_VIRTIO_SERIAL_BUS) + typedef struct VirtIOSerialPort VirtIOSerialPort; =20 typedef struct VirtIOSerialPortClass { diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index f9a4428bd6..cf08ef9728 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -843,10 +843,6 @@ static Property virtser_props[] =3D { DEFINE_PROP_END_OF_LIST() }; =20 -#define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus" -#define VIRTIO_SERIAL_BUS(obj) \ - OBJECT_CHECK(VirtIOSerialBus, (obj), TYPE_VIRTIO_SERIAL_BUS) - static void virtser_bus_class_init(ObjectClass *klass, void *data) { BusClass *k =3D BUS_CLASS(klass); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558020; cv=none; d=zohomail.com; s=zohoarc; b=FcM+Ey7Bw0ZfXWJ77LaE78AOdgCQWSHpcaOpTYGYUZVT+9tetGklrlLTy+CgDxlYbfloZ/5RZdPQbDmewquWDYwjldEQztVp24RgFFp51DxMRWZzp8ldw4HNv75G0iyigLdWRn0rguwwH5psCD6qFuguXm9kfCklEGMIMbUxNM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558020; 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=Ah3+qUYN57QY21uDFwtbaxKteWkL08OgRLaFL/vnFsE=; b=f1WLWCiyL8Iot+imWSeLVMYK3hjO2ylkBje0aFDl785Gk5+VYec57vmD3G7LOaf/hZt3YS+08q/UeQg5BP+THBoMYFJKmy3CccGpChI+XaasvOplErvc/NvBXptmtSjssGa1zVBPQxTtmV/cBnaBgI0ZjwyAFrRxH9bxeY+k94k= 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 1598558020831205.80763121457096; Thu, 27 Aug 2020 12:53:40 -0700 (PDT) Received: from localhost ([::1]:33538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNxr-00057B-9y for importer@patchew.org; Thu, 27 Aug 2020 15:53:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTz-0007iT-Om for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTw-0000VV-BA for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:47 -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-181-yhTbbvn5Nsuw4OXVhwAtSw-1; Thu, 27 Aug 2020 15:22:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8960F18A0F0E; Thu, 27 Aug 2020 19:22:38 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CDE17A1F6; Thu, 27 Aug 2020 19:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556163; 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=Ah3+qUYN57QY21uDFwtbaxKteWkL08OgRLaFL/vnFsE=; b=hO328KuXbviGrJwg6BeReoCPXmIba4zpRKQV5teU50EobQmHGBOYbLo4lqDNr4h0nz8nJj t+RA3FjilpRC4z7RdmxIrdtQJRPKB49YXMdLKxDd4SMUQ3+J1O3UBgk+TFJH2LzulufRvA VEA+h5D4ZY71W3xi4537r3ysrjmSbpk= X-MC-Unique: yhTbbvn5Nsuw4OXVhwAtSw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 35/53] piix: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:04 -0400 Message-Id: <20200827192122.658035-36-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-37-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/southbridge/piix.h | 4 ++++ hw/isa/piix3.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 02bd741209..ac1d04ddc2 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -64,6 +64,10 @@ typedef struct PIIXState { MemoryRegion rcr_mem; } PIIX3State; =20 +#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" +#define PIIX3_PCI_DEVICE(obj) \ + OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE) + extern PCIDevice *piix4_dev; =20 PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus); diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index 1a5267e19f..587850b888 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -36,10 +36,6 @@ =20 #define XEN_PIIX_NUM_PIRQS 128ULL =20 -#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" -#define PIIX3_PCI_DEVICE(obj) \ - OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE) - #define TYPE_PIIX3_DEVICE "PIIX3" #define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557959; cv=none; d=zohomail.com; s=zohoarc; b=i2+mgomMcCRg5Cg2u5LHm4RqwZfUZCRzwz0Yum/z1fdfTakCc/MZVt2xuu8Y9+3uaeXTXMeLo6WDT7gjoJY03F0Ss8B5k+Rq49GQjXG/NFQCZkFt4XbbzyrhCvmF6I1m5N3rJjlj5/IWGX3CAIrfS5wq/BNq7HYZvGc6H7EQGqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557959; 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=gCzdj0wP9hH9GSsYgQ/Mxpku+ddRHqP0wd810k2sVH4=; b=jT9OC5vx5u8KmTm1n2w6R21tMTqfg1ahtZkqyGNmb2wGK1UQpSb9u2xBSx+BmsvC2rIn+n1KNUJq8Dk59lOOl0ZynIvsW0h5J6wKLJQnLnwNEwRmasEi6wFL4QECNBo25HXP2NiD/0lHlum42gNk9YQHDMJFYA+MiSHCyMuFA7E= 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 1598557959872706.8516611118625; Thu, 27 Aug 2020 12:52:39 -0700 (PDT) Received: from localhost ([::1]:57582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNws-0003RA-Mh for importer@patchew.org; Thu, 27 Aug 2020 15:52:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNTz-0007hq-6k for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24546 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTw-0000VY-C6 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:46 -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-324-H0yQgybYNsGoLDRVrG0ZZA-1; Thu, 27 Aug 2020 15:22:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2A148018A4; Thu, 27 Aug 2020 19:22:39 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83C4B795A0; Thu, 27 Aug 2020 19:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556163; 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=gCzdj0wP9hH9GSsYgQ/Mxpku+ddRHqP0wd810k2sVH4=; b=T8ZnYDhEXSqLMaMkLUG1vjzUEujjbBEe7JE5W77Mb7XYKChncP8A/LBF/p3B2vythsRi/D UWkttK9ux5P90YVOj02nTouSgmoyboxkNOMH6Ku5sGtiC7fwh96sol9rcHOZcBTIHjU9QE Msb3Yv10OdEWGoRo/Ux0KaCy5OPZrwc= X-MC-Unique: H0yQgybYNsGoLDRVrG0ZZA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 36/53] auxbus: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:05 -0400 Message-Id: <20200827192122.658035-37-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-38-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/misc/auxbus.h | 3 +++ hw/misc/auxbus.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index 15a8973517..041edfc9e9 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -32,7 +32,10 @@ typedef struct AUXBus AUXBus; typedef struct AUXSlave AUXSlave; typedef enum AUXCommand AUXCommand; typedef enum AUXReply AUXReply; + +#define TYPE_AUXTOI2C "aux-to-i2c-bridge" typedef struct AUXTOI2CState AUXTOI2CState; +#define AUXTOI2C(obj) OBJECT_CHECK(AUXTOI2CState, (obj), TYPE_AUXTOI2C) =20 enum AUXCommand { WRITE_I2C =3D 0, diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index da361baa32..6c099ae2a2 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -45,8 +45,6 @@ } = \ } while (0) =20 -#define TYPE_AUXTOI2C "aux-to-i2c-bridge" -#define AUXTOI2C(obj) OBJECT_CHECK(AUXTOI2CState, (obj), TYPE_AUXTOI2C) =20 static void aux_slave_dev_print(Monitor *mon, DeviceState *dev, int indent= ); static inline I2CBus *aux_bridge_get_i2c_bus(AUXTOI2CState *bridge); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557432; cv=none; d=zohomail.com; s=zohoarc; b=Lg1GSwxabYuSl43uDlMgpRs5YqzMUCp/1ZfE6qyv4/DZgVs3X0/M1bcyu+0t9pb02S4Vw/eFGqSc3eXFIl0lB6LIMehVGP1LVUa3AI/tt9WrPiYL/eEgmhgDnL8wcnCzSdJtEidoegCaImQVMG7WI3Ug0TI31Jq0pKqdlv7txFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557432; 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=8aXup1DjgJiHXxRKSwI0joWB15Sx1yxkC1ROHNXJamw=; b=MnnSsGgF0+cJZ6O+SCY+agXRJlTmUXGteNNDQnFAWx6J9tJhr7+hvkKHl3YlKvru+KmToHo9mT4QyOHdehL4ybwB1TFMTfjfLVYj6Nj7YNaNCvWoKFQ5huB97yL3QXBjM8WK89bTIzBrbg7I69vKm1X+pRYgzlMS61RdPQlqgwg= 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 1598557432940343.41835623435816; Thu, 27 Aug 2020 12:43:52 -0700 (PDT) Received: from localhost ([::1]:52840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNoN-0006uo-Pi for importer@patchew.org; Thu, 27 Aug 2020 15:43:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNU0-0007lA-KB for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNTy-0000Vt-VI for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:48 -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-403-sXFYquEbMAu1p3xNqhqb3A-1; Thu, 27 Aug 2020 15:22:42 -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 331782FD03; Thu, 27 Aug 2020 19:22:41 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7FDD50B3F; Thu, 27 Aug 2020 19:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556166; 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=8aXup1DjgJiHXxRKSwI0joWB15Sx1yxkC1ROHNXJamw=; b=YbHjTDbROUCLCNCSgVWmaaKL9nUlZDyW827SXC/pDuFdByqJO6PgVHhCfNDKKE3Qyo6rKE 5zp5hWORKV4KpOklFunLfUiiro9RjfXErYh6X1+m21hpGvakL2WzkgSgpsUPL83AQ7B2fE WZDn2To/gHa/3L0eXQOVFR6GmmjRm9c= X-MC-Unique: sXFYquEbMAu1p3xNqhqb3A-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 37/53] rocker: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:06 -0400 Message-Id: <20200827192122.658035-38-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-39-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/net/rocker/rocker.h | 6 +++++- hw/net/rocker/rocker.c | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/net/rocker/rocker.h b/hw/net/rocker/rocker.h index 7ae0495d9e..e4c22db4ff 100644 --- a/hw/net/rocker/rocker.h +++ b/hw/net/rocker/rocker.h @@ -66,11 +66,15 @@ static inline bool ipv6_addr_is_multicast(const Ipv6Add= r *addr) return (addr->addr32[0] & htonl(0xFF000000)) =3D=3D htonl(0xFF000000); } =20 -typedef struct rocker Rocker; typedef struct world World; typedef struct desc_info DescInfo; typedef struct desc_ring DescRing; =20 +#define TYPE_ROCKER "rocker" +typedef struct rocker Rocker; +#define ROCKER(obj) \ + OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER) + Rocker *rocker_find(const char *name); uint32_t rocker_fp_ports(Rocker *r); int rocker_event_link_changed(Rocker *r, uint32_t pport, bool link_up); diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 15d66f6cbc..1af1e6fa2f 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -73,11 +73,6 @@ struct rocker { QLIST_ENTRY(rocker) next; }; =20 -#define TYPE_ROCKER "rocker" - -#define ROCKER(obj) \ - OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER) - static QLIST_HEAD(, rocker) rockers; =20 Rocker *rocker_find(const char *name) --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557490; cv=none; d=zohomail.com; s=zohoarc; b=PmIZ2KNfinP7QYw6hZjayxwPAATj26YR0VW+lzqh0E0lwuMD1HaeTwYUGP8P9cLcrVjeUNFqxpPHZJIrbECy3ZyDlfC68bSzsm39uEod3QI5x27bhILGY1SxYQ3D2MQuCtXVhGrZZwYOT4F12HyEaBeSrKnbsxExpfBvqtG8/6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557490; 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=6l7pYC7+QtYMsb5r0CsBHD03u43gUzWBb4OYxTCohQ4=; b=VSLbLAWUuByPNGk35zL68nEB49IbYZf0LlnhSSlag3sbasWszAnjdHd/3+g6gcLlZUbNo3p8H1hj8yVARX9WGepkTZFtZ8meC2ixjjDzngL3l5jalH8RXrG28U0aoWxslfhpbejQ4M5jJY+W6/ddR+0xmWUuKLka2cU5zwkpF/4= 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 1598557490538517.2445335691091; Thu, 27 Aug 2020 12:44:50 -0700 (PDT) Received: from localhost ([::1]:57026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNpJ-000093-CT for importer@patchew.org; Thu, 27 Aug 2020 15:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNU7-00085J-Bq for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNU5-0000WS-FS for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:55 -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-460-OyoKre2SOoaHpHm5Lga8Hg-1; Thu, 27 Aug 2020 15:22:48 -0400 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 3944A18A2252; Thu, 27 Aug 2020 19:22:47 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id F18B119C71; Thu, 27 Aug 2020 19:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556172; 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=6l7pYC7+QtYMsb5r0CsBHD03u43gUzWBb4OYxTCohQ4=; b=IfMxK0MjD/fUhAww+tvIVcGwMFHLGVdSpGFoFBx0GBHtKcFovBnYcfANb+J6Xjz0Wlyrhu mfbZ82q/wqOWNXyuBD5XIAMe8JcqxINDRKyt06uppRPT5XOujWkQzyqYIFmNrXBkvFDblZ B42fvwkAt+yec2DDYbQKcc151/42J8M= X-MC-Unique: OyoKre2SOoaHpHm5Lga8Hg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 38/53] pxa2xx: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:07 -0400 Message-Id: <20200827192122.658035-39-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-40-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/arm/pxa.h | 13 +++++++++++++ hw/arm/pxa2xx.c | 7 ------- hw/pcmcia/pxa2xx.c | 4 ---- hw/sd/pxa2xx_mmci.c | 3 --- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index d99b6192da..09c1336071 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -86,7 +86,10 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, void pxa2xx_lcd_vsync_notifier(PXA2xxLCDState *s, qemu_irq handler); =20 /* pxa2xx_mmci.c */ +#define TYPE_PXA2XX_MMCI "pxa2xx-mmci" typedef struct PXA2xxMMCIState PXA2xxMMCIState; +#define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_= MMCI) + PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, hwaddr base, qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma); @@ -94,7 +97,11 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq r= eadonly, qemu_irq coverswitch); =20 /* pxa2xx_pcmcia.c */ +#define TYPE_PXA2XX_PCMCIA "pxa2xx-pcmcia" typedef struct PXA2xxPCMCIAState PXA2xxPCMCIAState; +#define PXA2XX_PCMCIA(obj) \ + OBJECT_CHECK(PXA2xxPCMCIAState, obj, TYPE_PXA2XX_PCMCIA) + PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, hwaddr base); int pxa2xx_pcmcia_attach(void *opaque, PCMCIACardState *card); @@ -119,8 +126,14 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, qemu_irq irq, uint32_t page_size); I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s); =20 +#define TYPE_PXA2XX_I2C "pxa2xx_i2c" typedef struct PXA2xxI2SState PXA2xxI2SState; +#define PXA2XX_I2C(obj) \ + OBJECT_CHECK(PXA2xxI2CState, (obj), TYPE_PXA2XX_I2C) + +#define TYPE_PXA2XX_FIR "pxa2xx-fir" typedef struct PXA2xxFIrState PXA2xxFIrState; +#define PXA2XX_FIR(obj) OBJECT_CHECK(PXA2xxFIrState, (obj), TYPE_PXA2XX_FI= R) =20 typedef struct { ARMCPU *cpu; diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 20fa201dd5..76975d17a4 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1251,10 +1251,6 @@ typedef struct PXA2xxI2CSlaveState { PXA2xxI2CState *host; } PXA2xxI2CSlaveState; =20 -#define TYPE_PXA2XX_I2C "pxa2xx_i2c" -#define PXA2XX_I2C(obj) \ - OBJECT_CHECK(PXA2xxI2CState, (obj), TYPE_PXA2XX_I2C) - struct PXA2xxI2CState { /*< private >*/ SysBusDevice parent_obj; @@ -1787,9 +1783,6 @@ static PXA2xxI2SState *pxa2xx_i2s_init(MemoryRegion *= sysmem, } =20 /* PXA Fast Infra-red Communications Port */ -#define TYPE_PXA2XX_FIR "pxa2xx-fir" -#define PXA2XX_FIR(obj) OBJECT_CHECK(PXA2xxFIrState, (obj), TYPE_PXA2XX_FI= R) - struct PXA2xxFIrState { /*< private >*/ SysBusDevice parent_obj; diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 5f4bf22a90..fcca7e571b 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -18,10 +18,6 @@ #include "hw/pcmcia.h" #include "hw/arm/pxa.h" =20 -#define TYPE_PXA2XX_PCMCIA "pxa2xx-pcmcia" -#define PXA2XX_PCMCIA(obj) \ - OBJECT_CHECK(PXA2xxPCMCIAState, obj, TYPE_PXA2XX_PCMCIA) - struct PXA2xxPCMCIAState { SysBusDevice parent_obj; =20 diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 04f0a98f81..3a47b380dd 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -22,9 +22,6 @@ #include "qemu/module.h" #include "trace.h" =20 -#define TYPE_PXA2XX_MMCI "pxa2xx-mmci" -#define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_= MMCI) - #define TYPE_PXA2XX_MMCI_BUS "pxa2xx-mmci-bus" #define PXA2XX_MMCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_PXA2XX_MMCI_B= US) =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557051; cv=none; d=zohomail.com; s=zohoarc; b=ZMNeBNel7lmcED1l0UnJn7TV8udmU3yul+krqAyGYyg5LNWQvuzmY/PsmL1LrHpIM/6c5r2y/UQTHVMjxjkOem898N8A8RIPIOQw5PIz/Koq1dVcBgYSunjxEpRyG+Uh30ly7kmF5EvZTLTN4aiCy74TcoVNMwa2IrpdelL3c8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557051; 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=bGXbAiYTASYGGEBCy9P2BZF868tBcfi+9F/wWZusn1o=; b=TgU/Txbe6N2EUUgYo/fSjrmTfhicR5/kOt1/YC/uCMF+4lh7gyScMsCiDVYuBG5Lc5zYC3/jX7jijwv8x3Lr//7mJMUFLbCeFjfkUnxC2x5DRN0hS5w3twHBAVxoAtm+Lq6/KTb7NleitjiXvmvh1iG1nC5+YQMjxIvl0oYW55s= 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 1598557051097108.1149113940827; Thu, 27 Aug 2020 12:37:31 -0700 (PDT) Received: from localhost ([::1]:50470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNiD-0002qo-P4 for importer@patchew.org; Thu, 27 Aug 2020 15:37:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNU7-00084Y-4T for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNU5-0000WU-FK for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:54 -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-87-QtpmyrdnMYmtnGjKoNadbA-1; Thu, 27 Aug 2020 15:22:50 -0400 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 4028A8018A4; Thu, 27 Aug 2020 19:22:49 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 055C419C71; Thu, 27 Aug 2020 19:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556172; 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=bGXbAiYTASYGGEBCy9P2BZF868tBcfi+9F/wWZusn1o=; b=KWxhOtGVqrZ6xATsRLwqV+W8j/8MEFuJyKSOGdS0PsY2vGd1/01P0qJj2rO1HvyFVEwKyG FFm0AH8sv6B7LuVkhFjbq44ivcX49nvDTp5i1Vl1zMDbNxQefOuGpBXawuC2+kKmE/pnp3 kxmdcF3x9gl2O1RLOvp7Uh+UE/GbsJk= X-MC-Unique: QtpmyrdnMYmtnGjKoNadbA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 39/53] mptsas: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:08 -0400 Message-Id: <20200827192122.658035-40-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-41-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/scsi/mptsas.h | 6 +++++- hw/scsi/mptsas.c | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h index 0436a33911..9ac98fc20e 100644 --- a/hw/scsi/mptsas.h +++ b/hw/scsi/mptsas.h @@ -11,9 +11,13 @@ =20 #define MPTSAS_MAXIMUM_CHAIN_DEPTH 0x22 =20 -typedef struct MPTSASState MPTSASState; typedef struct MPTSASRequest MPTSASRequest; =20 +#define TYPE_MPTSAS1068 "mptsas1068" +typedef struct MPTSASState MPTSASState; +#define MPT_SAS(obj) \ + OBJECT_CHECK(MPTSASState, (obj), TYPE_MPTSAS1068) + enum { DOORBELL_NONE, DOORBELL_WRITE, diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 14cbed84d0..135e7d96e4 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -42,11 +42,6 @@ #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL #define IEEE_COMPANY_LOCALLY_ASSIGNED 0x525400 =20 -#define TYPE_MPTSAS1068 "mptsas1068" - -#define MPT_SAS(obj) \ - OBJECT_CHECK(MPTSASState, (obj), TYPE_MPTSAS1068) - #define MPTSAS1068_PRODUCT_ID \ (MPI_FW_HEADER_PID_FAMILY_1068_SAS | \ MPI_FW_HEADER_PID_PROD_INITIATOR_SCSI | \ --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557623; cv=none; d=zohomail.com; s=zohoarc; b=nY2PrkJzOpnRkju8fmy9jiZrHFFevoB6pqYKEweQekCTgYvlv8HtZD3nfHT48VF9e3ELYHXA7StkeY9Xg3a7iAxTfTk2VsqiiCVaJbelgiQq5sQ6gNUsr/kCnJJOI2qXu33iIMYF4WF1laGB9ApEhmfh4JxqGoJ/YPZjTnYBAR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557623; 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=6Pmz/c9uWc17RBm2lA6dRWI3j5A0TV/v7Ga7jvXfr+I=; b=R+iIYzc/JtXKDyLzNUYlSnhgBP58FdXwSAypxJYtXHze71dsQCZ4LHUqGuPJVUmHEk66VSsg9sRjSBOLrSQwH+KWolnrYYvdX+iAY2X7Y63uQiQvi3nB05TT+XEZzP08rriu/EX1Pgs6VAVJeJmFnlXxffUQk5+HC33TwnRAaU0= 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 1598557623534164.22219734036014; Thu, 27 Aug 2020 12:47:03 -0700 (PDT) Received: from localhost ([::1]:37212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNrS-0003bx-Ca for importer@patchew.org; Thu, 27 Aug 2020 15:47:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUA-0008Ca-BA for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNU7-0000Wg-JN for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22: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-490-AXZNcYXmOuygEFDeDLJA9Q-1; Thu, 27 Aug 2020 15:22:51 -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 4D2A618A2240; Thu, 27 Aug 2020 19:22:50 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CDAD60FC2; Thu, 27 Aug 2020 19:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556174; 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=6Pmz/c9uWc17RBm2lA6dRWI3j5A0TV/v7Ga7jvXfr+I=; b=KbI7MOKUeR+cqNGK4arv8VdGVTP8RY4lT1V4mlmpxo9kRqO1y/oq1piNQlS2+Is7DklP1f ev0yfD14ZToGx8ofRc/FvzJWDK54TQTUclHTFxP6WLjSiLPTmRLDhbjECrZ+xUWYERhZh8 3/rIDZ2lKcm6/3S8oR/LJhEE5tW/o/c= X-MC-Unique: AXZNcYXmOuygEFDeDLJA9Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 40/53] kvm: Move QOM macros to kvm.h Date: Thu, 27 Aug 2020 15:21:09 -0400 Message-Id: <20200827192122.658035-41-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move QOM macros close to the KVMState typedef. This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-42-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/sysemu/kvm.h | 6 ++++++ include/sysemu/kvm_int.h | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index b4174d941c..8445a88db1 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -17,6 +17,7 @@ #include "qemu/queue.h" #include "hw/core/cpu.h" #include "exec/memattrs.h" +#include "sysemu/accel.h" =20 #ifdef NEED_CPU_H # ifdef CONFIG_KVM @@ -199,7 +200,12 @@ typedef struct KVMCapabilityInfo { #define KVM_CAP_LAST_INFO { NULL, 0 } =20 struct KVMState; + +#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") typedef struct KVMState KVMState; +#define KVM_STATE(obj) \ + OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) + extern KVMState *kvm_state; typedef struct Notifier Notifier; =20 diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index c660a70c51..65740806da 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -33,11 +33,6 @@ typedef struct KVMMemoryListener { int as_id; } KVMMemoryListener; =20 -#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") - -#define KVM_STATE(obj) \ - OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) - void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, AddressSpace *as, int as_id); =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557556; cv=none; d=zohomail.com; s=zohoarc; b=jrAQy6oBVLYpCTdJY7j46/+c6d/JhAXVlZzaZQglNvgyuwIzyLllV6uIi0DJNKSEuGf7/Tvk04+wNV/iU2H+pgMh23NRjQmvz4gptp/5RzYZjxPH2yOvCMKvRjxATH0rS7/YdfOBdtA+jThJN9aWWr0WBNrdHbNWscNskyxVr6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557556; 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=ZR2VgKuOzprKdj8I22bOLa1+1WcP7oX7JoHwTS66XwI=; b=ATQ3Ej9gLy0SpGTfKAxPVKXpLwXa/LQ8oh05Oon4/ii5KzH0TELjKry/Mmd4XrY5Qc/4ymX2EuQOwhwxY8fUqAODW+4KJCAQCzBEgq/l8Et1VYjWgQsb+nLAFGLMeHYJUTSWb9ZaNUPBi2ifctUzFt6BGPBv3dhwUNQsUpufCGg= 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 1598557556311362.4132618910462; Thu, 27 Aug 2020 12:45:56 -0700 (PDT) Received: from localhost ([::1]:33000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNqM-0001vF-13 for importer@patchew.org; Thu, 27 Aug 2020 15:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNU9-0008Aj-9S for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37470 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNU7-0000Wi-Ft for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:22: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-137-9yK4OVMGNFiDff8fqwoo8Q-1; Thu, 27 Aug 2020 15:22:52 -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 3FDAB101C2E0; Thu, 27 Aug 2020 19:22:51 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04358101417D; Thu, 27 Aug 2020 19:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556174; 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=ZR2VgKuOzprKdj8I22bOLa1+1WcP7oX7JoHwTS66XwI=; b=Cc39FhfdNe8osWwJl3dUYtZIHd0l290Wz7K5s396FnLp+/xyZEMkSGEIYvpmEljqV+CJO2 3fck0G/1bxCFuSDEvBJ1pq5BY87ui5uxoLEp2voEcXlhFz372v9917ci90kChYFdO/ngtI 2U5REOjcnrxME2wfsqeWVgHMwPPV6c8= X-MC-Unique: 9yK4OVMGNFiDff8fqwoo8Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 41/53] vfio/pci: Move QOM macros to header Date: Thu, 27 Aug 2020 15:21:10 -0400 Message-Id: <20200827192122.658035-42-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-43-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/vfio/pci.h | 3 +++ hw/vfio/pci.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index 0da7a20a7e..3c0dca024b 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -113,6 +113,9 @@ typedef struct VFIOMSIXInfo { unsigned long *pending; } VFIOMSIXInfo; =20 +#define TYPE_VFIO_PCI "vfio-pci" +#define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) + typedef struct VFIOPCIDevice { PCIDevice pdev; VFIODevice vbasedev; diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 2e561c06d6..3611dcd38b 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -42,9 +42,6 @@ #include "qapi/error.h" #include "migration/blocker.h" =20 -#define TYPE_VFIO_PCI "vfio-pci" -#define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) - #define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug" =20 static void vfio_disable_interrupts(VFIOPCIDevice *vdev); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557782; cv=none; d=zohomail.com; s=zohoarc; b=aPz41amH65YPvi5k3djFWfPU+tvjrfgl1Dz4hHNRnWTT5H+EScZgxGD9Ap6chVap9OBQfJg+S/8qi8WgWJ1lnsQHbASGhQeYR/pjFYRSkKhISX1NVcJYYJVkPNAVWBO7p0Cbitb7ZANSUE7QXRNyP6FLMWLYVrIPYIwWrCN+5Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557782; 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=LH39dE9a5vM+1JuAteqvtu0Avzivktg7pVUG8JDWclI=; b=O2VF8u/hrpunX+vwe4RDQQmqDcsQeeYeNhLnUFnc1Gjxki/YioOQT8uKRqW1yHPizy+WwKSZww39wXKYh8brEnqNqrqmEkhOml0nrnNFx3Dx6be329dCLQWIFl4FenSUoEUTchoxnJfPhTPC7eu9UXXxBsHUkXbNwu2ZpAI51lA= 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 1598557782567844.0507041532258; Thu, 27 Aug 2020 12:49:42 -0700 (PDT) Received: from localhost ([::1]:45668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNu1-00070K-BL for importer@patchew.org; Thu, 27 Aug 2020 15:49:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUH-00007a-T8 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38502 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUG-0000XD-6L for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:05 -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-265-2NEPvkS_M1O6Bx31J0yA0Q-1; Thu, 27 Aug 2020 15:22:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6D9C81CBDF; Thu, 27 Aug 2020 19:22:57 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19CA17959E; Thu, 27 Aug 2020 19:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556183; 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=LH39dE9a5vM+1JuAteqvtu0Avzivktg7pVUG8JDWclI=; b=MPcj5mPjVOJeXb1vBVgCnOxGUB07ERaRlUPeYB2pjEGrUnU063lxJnG0kS6of2Wf8EFyuk b9Pors4B+P5fbH3jwTNljqLbRB96J4W/OkWjFQ2O/AD2mx8B37hnXIblTRyNl5MdhrcwzM rzqKWd/vgb6D7XCG0ejcFShhaty1Xxc= X-MC-Unique: 2NEPvkS_M1O6Bx31J0yA0Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 42/53] nubus: Rename class type checking macros Date: Thu, 27 Aug 2020 15:21:11 -0400 Message-Id: <20200827192122.658035-43-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Laurent Vivier , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename the existing class type checking macros to be consistent with the type name and instance type checking macro. Use a NUBUS_MACFB prefix instead of MACFB_NUBUS. This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Laurent Vivier Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-44-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/display/macfb.h | 4 ++-- hw/display/macfb.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 26367ae2c4..347871b623 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -40,9 +40,9 @@ typedef struct { MacfbState macfb; } MacfbSysBusState; =20 -#define MACFB_NUBUS_DEVICE_CLASS(class) \ +#define NUBUS_MACFB_CLASS(class) \ OBJECT_CLASS_CHECK(MacfbNubusDeviceClass, (class), TYPE_NUBUS_MACFB) -#define MACFB_NUBUS_GET_CLASS(obj) \ +#define NUBUS_MACFB_GET_CLASS(obj) \ OBJECT_GET_CLASS(MacfbNubusDeviceClass, (obj), TYPE_NUBUS_MACFB) =20 typedef struct MacfbNubusDeviceClass { diff --git a/hw/display/macfb.c b/hw/display/macfb.c index b68faff4bb..ff8bdb846b 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -391,7 +391,7 @@ static void macfb_nubus_realize(DeviceState *dev, Error= **errp) { NubusDevice *nd =3D NUBUS_DEVICE(dev); MacfbNubusState *s =3D NUBUS_MACFB(dev); - MacfbNubusDeviceClass *ndc =3D MACFB_NUBUS_GET_CLASS(dev); + MacfbNubusDeviceClass *ndc =3D NUBUS_MACFB_GET_CLASS(dev); MacfbState *ms =3D &s->macfb; =20 ndc->parent_realize(dev, errp); @@ -443,7 +443,7 @@ static void macfb_sysbus_class_init(ObjectClass *klass,= void *data) static void macfb_nubus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - MacfbNubusDeviceClass *ndc =3D MACFB_NUBUS_DEVICE_CLASS(klass); + MacfbNubusDeviceClass *ndc =3D NUBUS_MACFB_CLASS(klass); =20 device_class_set_parent_realize(dc, macfb_nubus_realize, &ndc->parent_realize); --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557713; cv=none; d=zohomail.com; s=zohoarc; b=DWkNMEbtEa52V35OHtCDbXlsk9d7ATPJgMRXmOX0AMc7p4grew1NXc1o61DlM8DPLfSqOJJ63DLMuXY2hj5PixKMEOfHcp7nX8+N2pdpmR6qNtTOTYN+kFiSXOetnHJuj81UOBQZGm+4+B/uGtjSFwl95SKoCTTv5Rm8mAhzxCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557713; 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=K7jRXu7XdKNIirLlu0zE2pj0pztITiAtglPfvGYOcoc=; b=AHxTWKVf+o+pItvV8xXtk+MUAbJ3ji2tl7/2xB446HEXCX7IhMwERhZwMLCgLJoECDklsTzlGVUMgmAnuEVRuoqZ4d0z/I8ov70n6wObDY+66D+57z/XXShXEx7wWiCLHz/ENCdhUYCFAQGZbh0TDRHAmWlUtPeGxrwSFD80F/w= 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 1598557713731353.1567662315488; Thu, 27 Aug 2020 12:48:33 -0700 (PDT) Received: from localhost ([::1]:41390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNsu-0005Hn-BB for importer@patchew.org; Thu, 27 Aug 2020 15:48:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUH-000058-06 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:05 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:43005 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUF-0000X6-58 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23: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-322-wQUOmdK5Mzyni35WgFxS3g-1; Thu, 27 Aug 2020 15:22:59 -0400 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 DABEC344F3; Thu, 27 Aug 2020 19:22:58 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 990DE19D61; Thu, 27 Aug 2020 19:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556182; 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=K7jRXu7XdKNIirLlu0zE2pj0pztITiAtglPfvGYOcoc=; b=YXTBEQD3BX5jAjEP+Gn28BqLYAsZtCJ1ABuLHa3kqfqpTrQADxZ7fiHWxDvbWauExlYXn2 jbKJilXVm9mECqnNtoHAzWeX7YcTNvGSD7YOgq+mKdmJVCNMMgPGL2DPBMh7ZUGjP9PkHB hlZH9pK6EGVeZpkg5wpqnoxhk2me/dM= X-MC-Unique: wQUOmdK5Mzyni35WgFxS3g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro Date: Thu, 27 Aug 2020 15:21:12 -0400 Message-Id: <20200827192122.658035-44-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename it to be consistent with S390_CCW_MACHINE and TYPE_S390_CCW_MACHINE. This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-49-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/s390x/s390-virtio-ccw.h | 2 +- hw/s390x/s390-virtio-ccw.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index cd1dccc6e3..caf4962d29 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -18,7 +18,7 @@ #define S390_CCW_MACHINE(obj) \ OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE) =20 -#define S390_MACHINE_CLASS(klass) \ +#define S390_CCW_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE) =20 typedef struct S390CcwMachineState { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f4ea6a9545..3106bbea33 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -596,7 +596,7 @@ static void ccw_machine_class_init(ObjectClass *oc, voi= d *data) MachineClass *mc =3D MACHINE_CLASS(oc); NMIClass *nc =3D NMI_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->ri_allowed =3D true; s390mc->cpu_model_allowed =3D true; @@ -677,7 +677,7 @@ static S390CcwMachineClass *get_machine_class(void) * be called for the 'none' machine. The properties will * have their after-initialization values. */ - current_mc =3D S390_MACHINE_CLASS( + current_mc =3D S390_CCW_MACHINE_CLASS( object_class_by_name(TYPE_S390_CCW_MACHINE)); } return current_mc; @@ -786,7 +786,7 @@ bool css_migration_enabled(void) static void ccw_machine_##suffix##_instance_init(Object *obj) = \ { = \ MachineState *machine =3D MACHINE(obj); = \ - current_mc =3D S390_MACHINE_CLASS(MACHINE_GET_CLASS(machine)); = \ + current_mc =3D S390_CCW_MACHINE_CLASS(MACHINE_GET_CLASS(machine));= \ ccw_machine_##suffix##_instance_options(machine); = \ } = \ static const TypeInfo ccw_machine_##suffix##_info =3D { = \ @@ -898,7 +898,7 @@ static void ccw_machine_3_0_instance_options(MachineSta= te *machine) =20 static void ccw_machine_3_0_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->hpage_1m_allowed =3D false; ccw_machine_3_1_class_options(mc); @@ -965,7 +965,7 @@ static void ccw_machine_2_9_instance_options(MachineSta= te *machine) =20 static void ccw_machine_2_9_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { { TYPE_S390_STATTRIB, "migration-enabled", "off", }, }; @@ -1001,7 +1001,7 @@ static void ccw_machine_2_7_instance_options(MachineS= tate *machine) =20 static void ccw_machine_2_7_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->cpu_model_allowed =3D false; ccw_machine_2_8_class_options(mc); @@ -1016,7 +1016,7 @@ static void ccw_machine_2_6_instance_options(MachineS= tate *machine) =20 static void ccw_machine_2_6_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { { TYPE_S390_IPL, "iplbext_migration", "off", }, { TYPE_VIRTUAL_CSS_BRIDGE, "css_dev_path", "off", }, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557847; cv=none; d=zohomail.com; s=zohoarc; b=m3ZlUrr8StA2PHagjtUIgITJLOSJbuWJ27C4KOHwOedvg9YK8WSgJ2tEao4Y3s72L4i/ANd2vpoeXR9jHK/zgSIaYxBEr45yjDu8Hd3rwGTu7xgwxAxTtJox6cRH5/Mt3d4KeJL7S/9nTU3eGkV9VSgeSNwVOvUlEB1rqjqHUJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557847; 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=mBmnDkuEVMNVkcADTPvtKNeMp0nFpsqcBD6Cr7Tv/hc=; b=I3iucRs3JYMop/phc1hkackpcP8X7Om4Xz2bGmDhT+TNkMfC6NiKb1Uudb1pb+zTmNmgCHIJ3OP0ytQOyeL0M4HUiftDYRmw+rxm2vgE0tkOTQcErhAnYDgOx5Z01agH9BIbHDY255rStUr+Lh70gr4Gs8cI1632Vr/Ru84WXVc= 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 15985578475918.902837559745421; Thu, 27 Aug 2020 12:50:47 -0700 (PDT) Received: from localhost ([::1]:49942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNv4-0000OB-Dd for importer@patchew.org; Thu, 27 Aug 2020 15:50:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUI-000094-DB for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25227 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUG-0000XC-6q for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23: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-458-pykBTZoONk-xBdIYPNYmaA-1; Thu, 27 Aug 2020 15:23:01 -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 DB3B81084C84; Thu, 27 Aug 2020 19:22:59 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B1485D9FC; Thu, 27 Aug 2020 19:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556183; 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=mBmnDkuEVMNVkcADTPvtKNeMp0nFpsqcBD6Cr7Tv/hc=; b=HIwzGeIEJoVNjnV7v0xoeHoXwYTs6BLipCGY0Z7j89AerKlTfYW3uR5EYvKJHJZK7l81wy XcNkOO6rH/uzigjVCDV2h35m3WEl7U3FHheFvi/c9qvti1UAu7YMDcjR7eGvxwavzT2OBw OP6JPRVJJJNXoHhdR3QMOwMCXDDU6gM= X-MC-Unique: pykBTZoONk-xBdIYPNYmaA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 44/53] swim: Rename struct SWIM to Swim Date: Thu, 27 Aug 2020 15:21:13 -0400 Message-Id: <20200827192122.658035-45-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Laurent Vivier , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Currently we have a SWIM typedef and a SWIM type checking macro, but OBJECT_DECLARE* would transform the SWIM macro into a function, and the function name would conflict with the SWIM typedef name. Rename the struct and typedef to "Swim". This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Laurent Vivier Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-50-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/block/swim.h | 6 +++--- hw/block/swim.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 6add3499d0..9d8b65c561 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -67,10 +67,10 @@ struct SWIMCtrl { }; =20 #define TYPE_SWIM "swim" -#define SWIM(obj) OBJECT_CHECK(SWIM, (obj), TYPE_SWIM) +#define SWIM(obj) OBJECT_CHECK(Swim, (obj), TYPE_SWIM) =20 -typedef struct SWIM { +typedef struct Swim { SysBusDevice parent_obj; SWIMCtrl ctrl; -} SWIM; +} Swim; #endif diff --git a/hw/block/swim.c b/hw/block/swim.c index 74f56e8f46..20133a814c 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -387,7 +387,7 @@ static const MemoryRegionOps swimctrl_mem_ops =3D { =20 static void sysbus_swim_reset(DeviceState *d) { - SWIM *sys =3D SWIM(d); + Swim *sys =3D SWIM(d); SWIMCtrl *ctrl =3D &sys->ctrl; int i; =20 @@ -408,7 +408,7 @@ static void sysbus_swim_reset(DeviceState *d) static void sysbus_swim_init(Object *obj) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); - SWIM *sbs =3D SWIM(obj); + Swim *sbs =3D SWIM(obj); SWIMCtrl *swimctrl =3D &sbs->ctrl; =20 memory_region_init_io(&swimctrl->iomem, obj, &swimctrl_mem_ops, swimct= rl, @@ -418,7 +418,7 @@ static void sysbus_swim_init(Object *obj) =20 static void sysbus_swim_realize(DeviceState *dev, Error **errp) { - SWIM *sys =3D SWIM(dev); + Swim *sys =3D SWIM(dev); SWIMCtrl *swimctrl =3D &sys->ctrl; =20 qbus_create_inplace(&swimctrl->bus, sizeof(SWIMBus), TYPE_SWIM_BUS, de= v, @@ -460,7 +460,7 @@ static const VMStateDescription vmstate_sysbus_swim =3D= { .name =3D "SWIM", .version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_STRUCT(ctrl, SWIM, 0, vmstate_swim, SWIMCtrl), + VMSTATE_STRUCT(ctrl, Swim, 0, vmstate_swim, SWIMCtrl), VMSTATE_END_OF_LIST() } }; @@ -477,7 +477,7 @@ static void sysbus_swim_class_init(ObjectClass *oc, voi= d *data) static const TypeInfo sysbus_swim_info =3D { .name =3D TYPE_SWIM, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(SWIM), + .instance_size =3D sizeof(Swim), .instance_init =3D sysbus_swim_init, .class_init =3D sysbus_swim_class_init, }; --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557912; cv=none; d=zohomail.com; s=zohoarc; b=eNJD4W9LDrATsT8AO9jY5hQk+v2ZYEUDqbRB8PO4pNAZcxlAICeGsSwxGCW6yB/aPmvS6XnHy+qe20MEPAHLbfAO55oFyQXlgeRBnTkxSJIsfV/j5SYRPkYd+JG13U8cR3hX/RvZp8LQGgCtf1ue/rKrBCGemQvLBLOR6fNxA0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557912; 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=FC7gWrO5rA8n5kvbt1UyMxdfosQoNwnuqkSOSMS22Fw=; b=SiCx0a07yYBBCSg+tHSt3odNjuiQyGQLBzEb/WhcqQeccDhk9JoBHLyOxbe2e7USJZYYQQSHgscXY7Zo8XeG8PKa9+CrGfUeH9BxBFkeSSD+JkYnakWxEWbskjtCC9AyBieb2AvQi73LqE+rBXkEi1MjUig72enuxCuXLS7Uc5k= 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 1598557912053846.8781080385884; Thu, 27 Aug 2020 12:51:52 -0700 (PDT) Received: from localhost ([::1]:54214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNw6-00026L-NX for importer@patchew.org; Thu, 27 Aug 2020 15:51:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUJ-0000BC-2I for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUH-0000XN-6y for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23: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-496-v2aq7njONJudsHXKSyg7dw-1; Thu, 27 Aug 2020 15:23:02 -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 E73D4802B68; Thu, 27 Aug 2020 19:23:00 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5E63101417D; Thu, 27 Aug 2020 19:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556184; 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=FC7gWrO5rA8n5kvbt1UyMxdfosQoNwnuqkSOSMS22Fw=; b=V27dCJXbu8qkAAhEsZM9C+Wrm58ab+JMrWSeKHmIYsbyQ/4pVTxr9ko5sgms5DtN0i1K/t f8rBdDYuuA9dBWUDtoDwZYtPEQ9JJV0sC57Gx6Howlm1OgzhQDmGfEmMcptLkRFhbXe0XH 0qwCGTf2Yd92MPpBwhYHewJ+x0mqtuQ= X-MC-Unique: v2aq7njONJudsHXKSyg7dw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 45/53] migration: Rename class type checking macros Date: Thu, 27 Aug 2020 15:21:14 -0400 Message-Id: <20200827192122.658035-46-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Juan Quintela , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename the macros to make them consistent with the MIGRATION_OBJ macro name. This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Juan Quintela Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-51-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- migration/migration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/migration.h b/migration/migration.h index 2ed55c4aef..ae497bd45a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -114,11 +114,11 @@ void fill_destination_postcopy_migration_info(Migrati= onInfo *info); =20 #define TYPE_MIGRATION "migration" =20 -#define MIGRATION_CLASS(klass) \ +#define MIGRATION_OBJ_CLASS(klass) \ OBJECT_CLASS_CHECK(MigrationClass, (klass), TYPE_MIGRATION) #define MIGRATION_OBJ(obj) \ OBJECT_CHECK(MigrationState, (obj), TYPE_MIGRATION) -#define MIGRATION_GET_CLASS(obj) \ +#define MIGRATION_OBJ_GET_CLASS(obj) \ OBJECT_GET_CLASS(MigrationClass, (obj), TYPE_MIGRATION) =20 typedef struct MigrationClass { --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558031; cv=none; d=zohomail.com; s=zohoarc; b=W/7ytmIk7joSQ8BU+AsZ++k91bEDhLSEnugVJIk9Cmqq69Ah26X585rro9L+O1S+ZQG45JcFFiyvVbZQoA+tFMyCDCzDyf4W5mUQRZ4g7hQey9BAymXNAumg0FUB/XmwY4H1/womzSIuH6MiTrsuXpLzTqJkmBH1n+/2nX/+v/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558031; 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=S5K1EWV5frIMx8lCNYxuzakDgmKfL794+0E91gXAn/I=; b=Ev29Se5Bfr3a6sda4plTo0Jk2AEsMteRmTvnpX3vcyVVkDl/EfyPa+OXg8trdnLPidHU/XZLEpISsYXygZArbkOS2rIauHp97JA0alxZ+f7XDGB1GwNVy6ZrAAqgkCHXBc6tvsACoHu5s8oP7lLm44qfEZN2UgHRquuXZR++/L0= 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 1598558031659194.04605191060205; Thu, 27 Aug 2020 12:53:51 -0700 (PDT) Received: from localhost ([::1]:34326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNy2-0005Rp-FQ for importer@patchew.org; Thu, 27 Aug 2020 15:53:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUL-0000I7-Gt for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUJ-0000Xk-Of for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:09 -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-518--attzFT_OXeU0VZR_fy5oQ-1; Thu, 27 Aug 2020 15:23:04 -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 93D581084C84; Thu, 27 Aug 2020 19:23:02 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id F31C75C1C2; Thu, 27 Aug 2020 19:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556187; 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=S5K1EWV5frIMx8lCNYxuzakDgmKfL794+0E91gXAn/I=; b=Evecmo/7DIKTVPt+nVF3Tx+m01v3ZKGoybIU7+ZQO9PUHAF0bISoZ1nEsPkZXerrKwwjeO RKQszRxkj30GOEeZ4TE7zeEtBYcDQmgM8u9O70F0vQFkMKEFFPyaajGk28BHSRjJrGg79X WxML+uLBIgMaMWO8TJMJO9Ju4GCqzqU= X-MC-Unique: -attzFT_OXeU0VZR_fy5oQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 46/53] etsec: Use TYPE_ETSEC_COMMON constant Date: Thu, 27 Aug 2020 15:21:15 -0400 Message-Id: <20200827192122.658035-47-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Li Qiang , Igor Mammedov , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: David Gibson Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-2-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/net/fsl_etsec/etsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 7035cf4eb9..ad20b22cdd 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *= data) } =20 static TypeInfo etsec_info =3D { - .name =3D "eTSEC", + .name =3D TYPE_ETSEC_COMMON, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(eTSEC), .class_init =3D etsec_class_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557971; cv=none; d=zohomail.com; s=zohoarc; b=Znkp0zz/KxkiLZPIkhY1iOq1tfDQCpOrDIJUts76FlstODebT3ZVO0SK7zaLLC60MWvynX8WhJgnMdF7Lpa/3sVDYbjECdx9JvaWWLnVaRRCFMEXcr9eVo1NmnYfrv8qMK2xH5pGkR17VmixZr5n5xBIaHD5WSkMl7t/DyFmqpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557971; 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=9rqvWsd2crIiQ2e/Lqyy7JfBiJZfUXb0eMdjh1V74EQ=; b=iMFnF/kVAdzpxefYoYh6+Ma/STCFfH+35F09K7ZBGCNM1F4LJEIZB1DIT98Bo9OMf7kg4D3VpqE0HDbe2eoz8Uz9uqC09jN/KaJ787QgHve5U2Kqz1ftE1hJKr8NPj3VOlhG4k8xH58tArG959uN9VQlz8jPht6Kk+mmyUsJ3x8= 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 15985579713341014.7417708147119; Thu, 27 Aug 2020 12:52:51 -0700 (PDT) Received: from localhost ([::1]:58400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNx4-0003mQ-5L for importer@patchew.org; Thu, 27 Aug 2020 15:52:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUL-0000Hp-DQ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUJ-0000Xm-N4 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:09 -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-551-Fb0f4xClNN2bSeDL0B-yvA-1; Thu, 27 Aug 2020 15:23:04 -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 83CDE85C737; Thu, 27 Aug 2020 19:23:03 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4860F101417D; Thu, 27 Aug 2020 19:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556187; 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=9rqvWsd2crIiQ2e/Lqyy7JfBiJZfUXb0eMdjh1V74EQ=; b=TeiO8g6Ccyqx1Mi6hx9NkFRuNJyrZ9AWDwWg3k2wtKyv1JgrfURmwdsMet+14pK7CF2Trz kr9AAfcqIzrNr4cDO4CAhHtOr6xwRqb/LV9VHgSZNM7DGwr58bnR1VKV4e68BtfoX083aX +3KBucT9+/fpd2m56SlcPccQKqfCCao= X-MC-Unique: Fb0f4xClNN2bSeDL0B-yvA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 47/53] nios2_iic: Use TYPE_ALTERA_IIC constant Date: Thu, 27 Aug 2020 15:21:16 -0400 Message-Id: <20200827192122.658035-48-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Li Qiang , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-3-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/intc/nios2_iic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c index 1a5df8c89a..86d088f9b5 100644 --- a/hw/intc/nios2_iic.c +++ b/hw/intc/nios2_iic.c @@ -80,7 +80,7 @@ static void altera_iic_class_init(ObjectClass *klass, voi= d *data) } =20 static TypeInfo altera_iic_info =3D { - .name =3D "altera,iic", + .name =3D TYPE_ALTERA_IIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(AlteraIIC), .instance_init =3D altera_iic_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558079; cv=none; d=zohomail.com; s=zohoarc; b=iQo3X4/s0wiQKPYJMV5Z5GOE9amP/4Bd0DON6KHDm6wMaDydG9mmeAGiNybPNc2gkayKfrHCcALFT/g8m7/LJV9xW+NHtch6dAv+AmRHNsGjcuKNe3sGLtGkQCMI/PwfJxkumhjzRD+vvIUWC9rvfRgrtgAwOLgmzdgRSSRm6xE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558079; 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=jG9kSgqgjXdWsP/55yPDPvd9k7FZjJ/Ur4P+ZL6SGGY=; b=i+6uGW1H89WOHM8Ro3PocVdU5JPbRSNdYVDDeXcAKPpx0MdDofAmT3OeY1tRSlsfaP/oj9SDsKlu5CTnX24yhcuv7WyOP8N438pGJzsCd4JFe7WxgatEtiNYh3rEwLkcoGu4d0kh9EI6ls6idHUjFsRdX4VpGXzcCFJjfzJiBhM= 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 1598558079417515.7834369947714; Thu, 27 Aug 2020 12:54:39 -0700 (PDT) Received: from localhost ([::1]:37718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNyo-0006mm-96 for importer@patchew.org; Thu, 27 Aug 2020 15:54:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUR-0000Zt-GB for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58297 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUP-0000YD-TT for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:15 -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-199-D06VV4vYMresh6BCyu_BLA-1; Thu, 27 Aug 2020 15:23:08 -0400 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 CDB7D1084C84; Thu, 27 Aug 2020 19:23:07 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC7FD19D61; Thu, 27 Aug 2020 19:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556193; 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=jG9kSgqgjXdWsP/55yPDPvd9k7FZjJ/Ur4P+ZL6SGGY=; b=CiUW915MY28CtUi9vnl2zDo8Tha3b+Z10mLNGjNzFVCORPOxg3J+OSdPaFgUO0tq05+NKY N53+XaJQgGLLTUk8XEF6uv1CTdrYbd7rM+felZlq2nvuAIRD/b1SwDYmxEAzV0p345tILy cez+zuZMzCyw+V1ZjXl1ZYeFcwBevj8= X-MC-Unique: D06VV4vYMresh6BCyu_BLA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 48/53] amd_iommu: Use TYPE_AMD_IOMMU_PCI constant Date: Thu, 27 Aug 2020 15:21:17 -0400 Message-Id: <20200827192122.658035-49-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Michael S . Tsirkin" , Li Qiang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Li Qiang Reviewed-by: Michael S. Tsirkin Message-Id: <20200826184334.4120620-4-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/i386/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 087f601666..18411f1dec 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1622,7 +1622,7 @@ static const TypeInfo amdvi =3D { }; =20 static const TypeInfo amdviPCI =3D { - .name =3D "AMDVI-PCI", + .name =3D TYPE_AMD_IOMMU_PCI, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(AMDVIPCIState), .interfaces =3D (InterfaceInfo[]) { --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558090; cv=none; d=zohomail.com; s=zohoarc; b=Xxz0sEWrQGEsYD4WnpDe5AzwTW4TAi02xPQQuGLoJCx0Gzeq+sxSt2Mx93TcpfqnbbFW41rHtkSaQdeatro/ECw6auv3lKl8Qvq+84w9BvOmk86zJEyhAC0Rs8zj6NMQIefv7VmYLGNovtIHg26AOlcs5TVcHyG12o7wQugkDTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558090; 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=oU2M7XvJR80fM4tDCM96DaTf2rrkntMZhxYcQ9Std54=; b=oFfwe0P7wjI+cRXD2RchHvxnQAaBdrbI0mwo2sKpLjEb+pstK0vgo+ijj9ZQHEWn31r8ax2+q1vOVV8Bn3BPl1m0tJzEqGU1RovywpSjHFKuOcSpLzqmoiBKyAglXHXkxsIUfht5eZbn/OEQF1yHgvC+L6hQZmM0kyxM+7ihzr8= 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 1598558090193766.551747439702; Thu, 27 Aug 2020 12:54:50 -0700 (PDT) Received: from localhost ([::1]:38486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNyz-00076s-0b for importer@patchew.org; Thu, 27 Aug 2020 15:54:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUQ-0000Xf-Mo for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20300 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUP-0000Y6-0a for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:14 -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-390-cNbpujuJO6yCvInL6Brkhw-1; Thu, 27 Aug 2020 15:23:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C45BF8797E1; Thu, 27 Aug 2020 19:23:08 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88021702FF; Thu, 27 Aug 2020 19:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556192; 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=oU2M7XvJR80fM4tDCM96DaTf2rrkntMZhxYcQ9Std54=; b=aRNrnMSgvrenVFHnnMx8aEzELNG6iE89HOnd8bfybwHRGTxvSfQXb9WyuTiYFSEr6zTyKi CXk0F64p26fMW6pbvW6zsvU5DpzlFbafd62izdXn1UQCqx5IJjdXS8VFw9HNLrk7odJEzh pyFoPj34i/ZiBTNzdVSSnV4WA/r5+yE= X-MC-Unique: cNbpujuJO6yCvInL6Brkhw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 49/53] sclpconsole: Use TYPE_* constants Date: Thu, 27 Aug 2020 15:21:18 -0400 Message-Id: <20200827192122.658035-50-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , Li Qiang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck Reviewed-by: Li Qiang Reviewed-by: Thomas Huth Message-Id: <20200826184334.4120620-5-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 2b5f37b6a2..5848b4e9c5 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -355,7 +355,7 @@ static void console_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo sclp_console_info =3D { - .name =3D "sclplmconsole", + .name =3D TYPE_SCLPLM_CONSOLE, .parent =3D TYPE_SCLP_EVENT, .instance_size =3D sizeof(SCLPConsoleLM), .class_init =3D console_class_init, diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 5c7664905e..d6f7da0818 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -271,7 +271,7 @@ static void console_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo sclp_console_info =3D { - .name =3D "sclpconsole", + .name =3D TYPE_SCLP_CONSOLE, .parent =3D TYPE_SCLP_EVENT, .instance_size =3D sizeof(SCLPConsole), .class_init =3D console_class_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558165; cv=none; d=zohomail.com; s=zohoarc; b=oDVFQktISzInBG6Rs+Q/s4gi0Q3rYzStnxqSY4Th6BEUN+G8RMjuUws7asqp0MA79kOMZTQl5AG7viWHuK8VjCka52pJDS4RuHsmW8XyLOgL09k+0Dj9cBPYm5/7iyJXZr2XbmocmsAuvNxzGx6v68BKm8Wfb2Ax1oWfHeUJiGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558165; 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=eBhLW5gtU0+x6sEOPSnH7vx5dZxYxWjOHuErJ2M3898=; b=OarTOm7ZJEpoNg0qBG2LaV4cCDjGc25JncWnFu9BME1uR86uO6sMKDRNFy0CbtLQE0ZPuPP+N41pR0p6K2dRJiv1+t/zritx+4CcXFtd0abKXm/tUuiOtGQ/s6v00Kxl8wCfruTkYR03c6eKAjFtKyDKgDBUWn00a9neeZkV+eI= 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 1598558165925554.2872879542784; Thu, 27 Aug 2020 12:56:05 -0700 (PDT) Received: from localhost ([::1]:42612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBO0C-0000Rn-PV for importer@patchew.org; Thu, 27 Aug 2020 15:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUT-0000gr-M0 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58974 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUS-0000YW-1B for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:17 -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-320-HWNysShsP_2Xt3hosgY71Q-1; Thu, 27 Aug 2020 15:23:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6E0918A2240; Thu, 27 Aug 2020 19:23:09 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78740795B0; Thu, 27 Aug 2020 19:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556195; 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=eBhLW5gtU0+x6sEOPSnH7vx5dZxYxWjOHuErJ2M3898=; b=ZsDixVJvKnZGX5z+UOqqxpkk99UJMNOciJeqdJi8HctdjOUcq/0HNYgjrwCGPzIvXoJoex GhkDAaZELiFKtBlNbg8uVxCSwz1i01vBQL71k3SKyhmHo9ZBxhDBtjmGFekLwC7meycmD7 6n5YijXcMYT/x8ATiyDtITzDRUnD2F4= X-MC-Unique: HWNysShsP_2Xt3hosgY71Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 50/53] xlnx-zcu102: Use TYPE_ZCU102_MACHINE constant Date: Thu, 27 Aug 2020 15:21:19 -0400 Message-Id: <20200827192122.658035-51-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: "Edgar E . Iglesias" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Li Qiang , Alistair Francis , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-6-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/arm/xlnx-zcu102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 5997262459..672d9d4bd1 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -238,7 +238,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass = *oc, void *data) } =20 static const TypeInfo xlnx_zcu102_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("xlnx-zcu102"), + .name =3D TYPE_ZCU102_MACHINE, .parent =3D TYPE_MACHINE, .class_init =3D xlnx_zcu102_machine_class_init, .instance_init =3D xlnx_zcu102_machine_instance_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557228; cv=none; d=zohomail.com; s=zohoarc; b=Lta1qAKT15XR6UFYauqNrupQeKYVmR+3WmLbMEl6AbypFKgo6tbNWHmSj0aQy2sNN1KEBSGbC1mVbTv9RJJDA0MhZqbsJvZAGyFk13KynhhEGKiwnI0wAHHC09i2v86ApIPWMxAN/lUBUrAQUGPbGwL/X4PdxD4Imozbck6ea2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557228; 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=JuqObo5Stx54sDkztwpMsZyM+kk3SNr3Go4J1o36SKw=; b=YmT+LjYe/5qyZJZFLIxxk3G6cGkBPBO4WcRqMFtXTZPDiN05XGJtTuzuZ+6zlBdqeFRQNM05Nix3PXC/CzAKdHecTh+dn4yEKUpQxCY9R4YfCZXJqx514hTeTIHrqW5JA1lhgxFMR7w4N0ZiP6FFNnNDdTYr+bYOmgSk7O6Z+9U= 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 1598557228866301.353808330024; Thu, 27 Aug 2020 12:40:28 -0700 (PDT) Received: from localhost ([::1]:39870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNl4-0001cK-LM for importer@patchew.org; Thu, 27 Aug 2020 15:40:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUS-0000eE-SS for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUR-0000YL-57 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:16 -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-564-WlxiKSN6M1OjKrR3FJ_yNA-1; Thu, 27 Aug 2020 15:23:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA66B18A225A; Thu, 27 Aug 2020 19:23:10 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B3D97A1FC; Thu, 27 Aug 2020 19:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556194; 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=JuqObo5Stx54sDkztwpMsZyM+kk3SNr3Go4J1o36SKw=; b=LOsa2t3QZeAIkwAiOOF4JkYBk+bGCkU1T4S6DNFe1wSqbMOTTZqtvUdRTkEpnYyCrWM8XW n7JCrmSDhsa+hixbjLOHV8gSacbi1QNHiwIrNPU8jMMZZQQMPP//ZeEdKAyUEak5t/AlG2 E+WDi9UpuTuFq+b8d+rEEvm4p8/1Qtg= X-MC-Unique: WlxiKSN6M1OjKrR3FJ_yNA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 51/53] tosa: Use TYPE_TOSA_MISC_GPIO constant Date: Thu, 27 Aug 2020 15:21:20 -0400 Message-Id: <20200827192122.658035-52-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Li Qiang , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-7-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/arm/tosa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index e29566f7b3..90eef1f14d 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -316,7 +316,7 @@ static const TypeInfo tosa_ssp_info =3D { }; =20 static const TypeInfo tosa_misc_gpio_info =3D { - .name =3D "tosa-misc-gpio", + .name =3D TYPE_TOSA_MISC_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(TosaMiscGPIOState), .instance_init =3D tosa_misc_gpio_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598558148; cv=none; d=zohomail.com; s=zohoarc; b=XI8jjGaPMY0tVOPVtM5WhmPNo8CJ+sg4gGW+X6aguRkw8DiS/J6wPkpf5Pzn2hYd3oHGQ7rwlI634wOV2wfYNLWY9Hy200GW+grUo6+A3Ms6yhe2RminJNOobcYCuzc+pHyrj7UIV0aqSVA3QYnQPSeMF7OT9Xyoh0p5UgRJARo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598558148; 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=XWNN7Kdb+a6YAt/lLzFfbXGPuuq4HL0EUrZ/+Y+pARw=; b=YV40PogdfrESLGnh4XDbtKV7p7le2AkgbugdntTaOPywl66ayXhFPrdSBAceQgMiJN9ffxTKQXQaDr/m89nRtFs+JbC/cvRr3kaRyZg2mvaOQTDwUoXoefIigAeV1twmI2ZMajgBmnSPnKacAXvbt66UJRtHGg0RgINab4IFD90= 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 1598558148955327.1328962069638; Thu, 27 Aug 2020 12:55:48 -0700 (PDT) Received: from localhost ([::1]:41872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNzv-00004w-Jm for importer@patchew.org; Thu, 27 Aug 2020 15:55:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUU-0000jD-Ib for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:18 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:53044 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUS-0000Ya-KW for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:18 -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-122-8JDJhXn5PVK_XVj4QmekTA-1; Thu, 27 Aug 2020 15:23:13 -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 46CD6801AC2; Thu, 27 Aug 2020 19:23:12 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 080877E722; Thu, 27 Aug 2020 19:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556195; 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=XWNN7Kdb+a6YAt/lLzFfbXGPuuq4HL0EUrZ/+Y+pARw=; b=L8xTeWw8fxv1g6RNz+NV9+8z0f+vz7gipTgRGzxQ36Io3x4IRL6D9S9eZMNMRuRMboo4hE BKU9Isjd9njsbT6/htRPgZiBl1lIvjBVCprl22NQDVLPSTwqtsT47jtamoZ8tjbFbZZtGH c0v+YrNKeJ/7S+5SgdI/eBrn+78KzbU= X-MC-Unique: 8JDJhXn5PVK_XVj4QmekTA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 52/53] ppce500: Use TYPE_PPC_E500_PCI_BRIDGE constant Date: Thu, 27 Aug 2020 15:21:21 -0400 Message-Id: <20200827192122.658035-53-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@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=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Li Qiang , Igor Mammedov , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: David Gibson Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-8-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/pci-host/ppce500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index d71072731d..1a62b2f8cc 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -509,7 +509,7 @@ static void e500_host_bridge_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo e500_host_bridge_info =3D { - .name =3D "e500-host-bridge", + .name =3D TYPE_PPC_E500_PCI_BRIDGE, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PPCE500PCIBridgeState), .class_init =3D e500_host_bridge_class_init, --=20 2.26.2 From nobody Sun Nov 16 04:16:11 2025 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=1598557132; cv=none; d=zohomail.com; s=zohoarc; b=PH7J+xJQuYqBK8AydWlkpYzZ7nB8Yc2IuAVB2s8bDJlfv2w07YERke+FYPCRnhLraJ51O3+g/kmYmROlGthLD8XP1Ei74ADoWYR1poLSUWOBkP27HlVF7qKUIg11Oo0OXDIIptBrrrJSrjYsBSaVzXHuXPOhcOmAOxgOSMUKGpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557132; 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=4IzQnUBXRHPF0ABT52aNXvyGaLlR3JDi3vy9ONCcfco=; b=Jx7ru5ewcbnpxe0qdhJuOtzMCyMWLh0+yvFVBr1+NJPaRTI453GGobkbwCRWLNZp7oV11e5DLDnkw3jWLi89fC46YoOpsEjbwRWVesrYAv1xhfpZwNxffY+wPNUVwm8735+aT4CeGMjq7hlpaLHwaODjdUZt7WoksgeNfDNB8Sk= 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 1598557132646301.022348309236; Thu, 27 Aug 2020 12:38:52 -0700 (PDT) Received: from localhost ([::1]:58500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNjX-00068Y-GA for importer@patchew.org; Thu, 27 Aug 2020 15:38:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUb-00011U-4N for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUZ-0000ZB-F1 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:24 -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-367-1JMQiIb8MoOmZNypbX75jQ-1; Thu, 27 Aug 2020 15:23:14 -0400 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 3A1A38018A4; Thu, 27 Aug 2020 19:23:13 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id F23DD19C71; Thu, 27 Aug 2020 19:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556202; 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=4IzQnUBXRHPF0ABT52aNXvyGaLlR3JDi3vy9ONCcfco=; b=RpJIuVzNqLHvTYPzKQVvSTVYEB+K1dlpAc81tldTS55o6W4VHRrE2N6gJNwmoYPVXs3H7v 6QgKpFjedHOd5KPyou3ulb4d/E9CZ0YCCi+uc0+GYJaAroZ7RtqvCIRVXlnUgj44tHm+R7 j8xbmbOeIHak2nL6CV5Q3fNHSChC+tY= X-MC-Unique: 1JMQiIb8MoOmZNypbX75jQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 53/53] dc390: Use TYPE_DC390_DEVICE constant Date: Thu, 27 Aug 2020 15:21:22 -0400 Message-Id: <20200827192122.658035-54-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , Li Qiang , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make future conversion to use OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Reviewed-by: Li Qiang Message-Id: <20200826184334.4120620-9-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/scsi/esp-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 497a8d5901..90432ef107 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -521,7 +521,7 @@ static void dc390_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo dc390_info =3D { - .name =3D "dc390", + .name =3D TYPE_DC390_DEVICE, .parent =3D TYPE_AM53C974_DEVICE, .instance_size =3D sizeof(DC390State), .class_init =3D dc390_class_init, --=20 2.26.2