From patchwork Tue Sep 17 10:35:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 829235 Delivered-To: patch@linaro.org Received: by 2002:a5d:44c6:0:b0:367:895a:4699 with SMTP id z6csp214275wrr; Tue, 17 Sep 2024 03:37:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWjKvPWViL5yF+CkzsECcppUZCzt+4d1eYQTAm5Lc6F4tSgcOtlJQ4WkW1vXrk6HyRZJG6ZxQ==@linaro.org X-Google-Smtp-Source: AGHT+IG70MQb8Q2vgSekx2k57Tpw1z/7gvIU4rP+vuW6RT8TbkDdRWqU+tEBnLA19gC0VUHM7eH2 X-Received: by 2002:a05:6214:3f8e:b0:6c5:1614:9c59 with SMTP id 6a1803df08f44-6c573582ed5mr258664426d6.31.1726569469039; Tue, 17 Sep 2024 03:37:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726569469; cv=none; d=google.com; s=arc-20240605; b=JWGpFDeZiM4jvi08xwpn9FXm483ccUdOA5fl0JdAtewAyLMpjnU9MeTsnGWzFYX+hU K5zvvfjN2X5+uwSe3e69XHa/w9wr3fgSNutQkFWYycND6k/9Fdgm7XOiEtFSEtZmncql 3qQEhhprSaCPdJQXEwlHQ1Du2g4+J3fwh5ci8fqkhn8vhxel2h38BEejOuOGJe1QADsN PWNLdNEN3+YI4MkKvrEx5cpznYp/Rvy3zNo6L55BSlMK0JOlo9hnxZp51QLJnsELMwLP 8stA7XYgQVJlVEdPk6ixEULiRySWNFbfap0BAlZQ7Bywf1teP89vIAhOvr8t+lOd50xe xUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RrpOSC6Rg72NNwlied+iu+T4AhUm/+ZVKk3vGDHCg58=; fh=O2CrEh5mhIHeEcAGIBhUzevFkYJbEzl3B4GiSlAkA7U=; b=IHI64IGpvie2nvB1hi2pT5CUzqWEuYe3Y6aPBFV/vNHrOLevm/Ix19XWgLkjhGMfQc RIV1k11M0DllT9nxTOWvGtKm7BpXCcQKQ7ibkpgga2BqB0UAlNtpXIzo+LbkAC0/wUXQ tmbrtz+s3qYfo0w+9JGvifsJ015hK0Jbcq8Xy2Hd24rjVhfQRRwOUaCZ89Jf++s+T0jv K2vs6wz25BPcj1EvcXb00jSwKSLFxdPTtBkxRWyDiUgDQegDk6CoMEA50sc0ul8lJUKJ 8sJe3/lrzKSo9AFiBWgYW9gfYC6TUsGCDgC6ut7dXV5y9chOl7o+6QpeJ4s5laBbmq3P o9JA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZA2Jy5LD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c58c7ad8b3si79613896d6.341.2024.09.17.03.37.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Sep 2024 03:37:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZA2Jy5LD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqVZi-0007DF-DG; Tue, 17 Sep 2024 06:36:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqVZO-0005MB-SC for qemu-devel@nongnu.org; Tue, 17 Sep 2024 06:36:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqVZL-0007NX-64 for qemu-devel@nongnu.org; Tue, 17 Sep 2024 06:36:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726569385; 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=RrpOSC6Rg72NNwlied+iu+T4AhUm/+ZVKk3vGDHCg58=; b=ZA2Jy5LD15uQ5SEWsgbws3GqPew5ZERg1I3S20B3q/+NQWXPb3PspN945Cs+7LuGQzZFYT swW6pX/4NRVdxNkKtojH4etNgPJMiR2jzU+gZMVI/q+A8kgzTiVanzJ9Y9qChvsNwPAS8o BiFGcmdkI8RC9L0MLHCyv80bLpeC9mY= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679--MH9P_I4PIeBPieLQxUDHw-1; Tue, 17 Sep 2024 06:36:21 -0400 X-MC-Unique: -MH9P_I4PIeBPieLQxUDHw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7390D1955D50; Tue, 17 Sep 2024 10:36:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.158]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9C10D19560A3; Tue, 17 Sep 2024 10:36:18 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Pierrick Bouvier Subject: [PULL 13/17] system: Sort QEMU_ARCH_VIRTIO_PCI definition Date: Tue, 17 Sep 2024 12:35:36 +0200 Message-ID: <20240917103540.149144-14-thuth@redhat.com> In-Reply-To: <20240917103540.149144-1-thuth@redhat.com> References: <20240917103540.149144-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Sort the QEMU_ARCH_VIRTIO_PCI to simplify adding/removing entries. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20240705124528.97471-2-philmd@linaro.org> Reviewed-by: Pierrick Bouvier Signed-off-by: Thomas Huth --- system/qdev-monitor.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 6af6ef7d66..acdc8b73a3 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -55,12 +55,17 @@ typedef struct QDevAlias } QDevAlias; /* default virtio transport per architecture */ -#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ - QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ - QEMU_ARCH_MIPS | QEMU_ARCH_PPC | \ - QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ - QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA | \ - QEMU_ARCH_LOONGARCH) +#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | \ + QEMU_ARCH_ARM | \ + QEMU_ARCH_HPPA | \ + QEMU_ARCH_I386 | \ + QEMU_ARCH_LOONGARCH | \ + QEMU_ARCH_MIPS | \ + QEMU_ARCH_PPC | \ + QEMU_ARCH_RISCV | \ + QEMU_ARCH_SH4 | \ + QEMU_ARCH_SPARC | \ + QEMU_ARCH_XTENSA) #define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) #define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K)