From nobody Mon Feb 9 17:36:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598383962; cv=none; d=zohomail.com; s=zohoarc; b=TEgIohdzEyS1eSC+cWRFbYK4gdr4+RFgPikuAblzzKwQrg7aJUaLOg4T8ONuqSaTB6e4awDmKo0xvs0i5Dkb+yjTwaJcrpjK9FhRTqibMnszejke8+f1a5qOHqFq2dYnCoFxUoU7QL2TbLdGYfEuiSioujPa35xqHhmBOFUMwo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598383962; 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=j7jxWsd+4Vv1z1kMVpfwSu0v0+QLEqdE31XUalig0dM=; b=BuRLF6JlYVstMfq60Fno+cj0G3UTJS38NYvrn249J3K1Us57rszpQ9Vv3Vmx+/9vIfHs9ISdyCj20l1I0YO2Yi7BogfxaRq5+QxqEjmXlZrWQXf3IAYh+09wU/yxIdcmk7OpbOSYhD8XhL9BVWJOf+JRIKhzAE2o1f749TZmsXE= 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 1598383962558943.4778341446407; Tue, 25 Aug 2020 12:32:42 -0700 (PDT) Received: from localhost ([::1]:53050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAegT-0003a0-09 for importer@patchew.org; Tue, 25 Aug 2020 15:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAeWn-000126-VO for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:22:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:45223 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 1kAeWm-0006GV-6f for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:22:41 -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-499-F-ylC1sLNFKZw3b9l6sY6A-1; Tue, 25 Aug 2020 15:22:37 -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 5350D800475; Tue, 25 Aug 2020 19:22:36 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9FD51002D49; Tue, 25 Aug 2020 19:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598383359; 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=j7jxWsd+4Vv1z1kMVpfwSu0v0+QLEqdE31XUalig0dM=; b=HX2GVgMPu7+E5GQZSUnu6ZByxqMeKk9uXaOgydj/38SzWNrEzdWUZR5EVms6z+AMtu0u1y +WaKL1/oqImiCFQ0RvDGQtvDJCBgGB2SUe3GBiwGCvN0T77FZTYzKgsXZHOGiYGEeBTP5x pTQqObj6IMopAqPH1efZoGNrddrs6qQ= X-MC-Unique: F-ylC1sLNFKZw3b9l6sY6A-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 36/74] piix: Move QOM macros to header Date: Tue, 25 Aug 2020 15:20:32 -0400 Message-Id: <20200825192110.3528606-37-ehabkost@redhat.com> In-Reply-To: <20200825192110.3528606-1-ehabkost@redhat.com> References: <20200825192110.3528606-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/25 01:37:44 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.958, 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: "Daniel P. Berrange" , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno 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 --- Changes v2 -> v3: none Changes series v1 -> v2: new patch in series v2 Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: "Herv=C3=A9 Poussineau" Cc: "Philippe Mathieu-Daud=C3=A9" Cc: Aleksandar Markovic Cc: Aurelien Jarno Cc: qemu-devel@nongnu.org --- 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