From nobody Mon Nov 17 13:42:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604580248; cv=none; d=zohomail.com; s=zohoarc; b=F6Y5tlfX+w73ENirJgAG1fHFSP2xxbzqSBVuIB7G3JDiBTPml11IBsQTZbLSR3xxrAJDt422T9XDFedEptMw6x/kZWSbzPMrub/JXwQwcl14kU5iy3hbrnA7z+voHQyT8cJL1JDAllvwdYBmUhsNXerRcAc1VScij+0jWxnwaKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604580248; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=QbMTJ3ao+EWjH5At6//uqbDIysge1ZWepFJJby54Ojc=; b=Mj6U5Pwta1u2TKyRtJLyAKZfxllrhC/7zkJslQCVGixRlHZrZ0xApsKKQVTZk1H/XOYs9R+bZuN53FpbD5WvrvZxGTGaixSHyZZFoPPrnbFfNSOVIUM1ThZQLQhNM7GLsg1lUsu9QYLlmowEUYc2blDmyeEd2CEbzSwTZX//RRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604580248704600.4603237008779; Thu, 5 Nov 2020 04:44:08 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-na7Zb9pLOUC1pRNNsFgbLQ-1; Thu, 05 Nov 2020 07:44:03 -0500 Received: by mail-wr1-f70.google.com with SMTP id t11so664987wrv.10 for ; Thu, 05 Nov 2020 04:44:02 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e5sm2170548wrw.93.2020.11.05.04.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 04:44:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580247; 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=QbMTJ3ao+EWjH5At6//uqbDIysge1ZWepFJJby54Ojc=; b=JzxHoGUKdtidMvMbK1vi+zk0LJzcYczYZESZSmJVoP1DhgYCjoJPJ41z7TJBAsYAOGVUnA CmdLeYjkKReVnb1vuHEk1yPZvcLZHuy97L9vi8V3oJoH/wU9cwrPP57mDMKwqXQq5o0ecJ mEoNOASm87/3v7QDl8BmKcAwYGs1EgE= X-MC-Unique: na7Zb9pLOUC1pRNNsFgbLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QbMTJ3ao+EWjH5At6//uqbDIysge1ZWepFJJby54Ojc=; b=o/R8i+ILqRxmi3eZXo+Uo8+npQakHz7nk+BeksYigrjxjvSebcSOBxWF27Dyft+BGT +BdXTkEHZxCM4kJKuXkAdZrxQAChkHRiFPRGm1nLOR7FNIhFg30Ck28aF9H+rjoOdzqH od4bq3KovT+lMLsUmN3mnAo/cdLX74VIyhp5a3rLkNwJ3XDEL2EynQmq4t4B2Kbd9hN8 tYjSMuFvcw093qm7Hv9PugGzcQq4OqH/LcL9ETCsmNq7rZhX8QhQ1S9EILUCCJJkfRU9 Tqudif3HIL/bmwf/B01HJIZt1Y5CNsjuQxGyvYoO9P5LJDKDcMhvGnMETMnOUcIhhXzp /n3A== X-Gm-Message-State: AOAM530pf5WxNQ/eAdw7BRUkP3b1qq3+6Wi5mo6hXPwc8Qkll/UVtgWH SM+ivs/5lHVcH2nqqReDnJk96mLR8RhonTvase5pyTLfuOJZDMzu97h/wtTzngnlbsJE5pRaJl8 9m0rt+aPWxE+XgA== X-Received: by 2002:adf:f285:: with SMTP id k5mr2710316wro.299.1604580241673; Thu, 05 Nov 2020 04:44:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDBKXqoZGV6QVR06D/ZHdIYvVnb7Xr/YHMllDCX1Blc96HXFdWLgRfsrKSWKsSK/e2UxC/qA== X-Received: by 2002:adf:f285:: with SMTP id k5mr2710301wro.299.1604580241450; Thu, 05 Nov 2020 04:44:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Elena Ufimtseva , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , Greg Kurz , Jagannathan Raman , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Wainer dos Santos Moschetta , Stefan Hajnoczi , Thomas Huth , Jason Wang , Cornelia Huck , Paolo Bonzini , Kevin Wolf Subject: [PATCH-for-6.0 1/3] hw/virtio: Add configure switch to disable legacy VIRTIO Date: Thu, 5 Nov 2020 13:43:51 +0100 Message-Id: <20201105124353.3680057-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105124353.3680057-1-philmd@redhat.com> References: <20201105124353.3680057-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Per [1] (Terminology): Legacy interfaces are not required; ie. don=E2=80=99t implement them unless you have a need for backwards compatibility! [2] (Version 1.0): The device configuration space uses the little-endian format for multi-byte fields. and [3] (Legacy Interface): for legacy interfaces, device configuration space is generally the guest=E2=80=99s native endian, rather than PCI=E2=80=99s little-endia= n. The correct endian-ness is documented for each device. Add the --disable-virtio-legacy configure flag to produce builds with VIRTIO 1.0 only, and the --enable-virtio-legacy to include legacy VIRTIO support (supporting legacy VIRTIO is the default). [1] http://docs.oasis-open.org/virtio/virtio/v1.0/cs04/virtio-v1.0-cs04.htm= l#x1-60001 [2] http://docs.oasis-open.org/virtio/virtio/v1.0/cs04/virtio-v1.0-cs04.htm= l#x1-170003 [3] http://docs.oasis-open.org/virtio/virtio/v1.0/cs04/virtio-v1.0-cs04.htm= l#x1-200003 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configure | 10 ++++++++++ meson.build | 1 + include/hw/virtio/virtio-access.h | 19 +++++-------------- hw/virtio/virtio-legacy.c | 29 +++++++++++++++++++++++++++++ hw/virtio/meson.build | 1 + 5 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 hw/virtio/virtio-legacy.c diff --git a/configure b/configure index 2c3c69f1188..f46216b3788 100755 --- a/configure +++ b/configure @@ -302,6 +302,7 @@ fdt=3D"auto" netmap=3D"no" sdl=3D"auto" sdl_image=3D"auto" +virtio_legacy=3D"enabled" virtiofsd=3D"auto" virtfs=3D"" libudev=3D"auto" @@ -1001,6 +1002,10 @@ for opt do ;; --enable-libudev) libudev=3D"enabled" ;; + --disable-virtio-legacy) virtio_legacy=3D"disabled" + ;; + --enable-virtio-legacy) virtio_legacy=3D"enabled" + ;; --disable-virtiofsd) virtiofsd=3D"disabled" ;; --enable-virtiofsd) virtiofsd=3D"enabled" @@ -1764,6 +1769,7 @@ disabled with --disable-FEATURE, default is enabled i= f available: vnc-png PNG compression for VNC server cocoa Cocoa UI (Mac OS X only) virtfs VirtFS + virtio-legacy enable support for legacy virtio (before VIRTIO 1.0) virtiofsd build virtiofs daemon (virtiofsd) libudev Use libudev to enumerate host devices mpath Multipath persistent reservation passthrough @@ -6816,6 +6822,10 @@ if test "$safe_stack" =3D "yes"; then echo "CONFIG_SAFESTACK=3Dy" >> $config_host_mak fi =20 +if test "$virtio_legacy" =3D "enabled"; then + echo "CONFIG_VIRTIO_LEGACY=3Dy" >> $config_host_mak +fi + # If we're using a separate build tree, set it up now. # DIRS are directories which we simply mkdir in the build tree; # LINKS are things to symlink back into the source tree diff --git a/meson.build b/meson.build index 39ac5cf6d8a..51406c28c6e 100644 --- a/meson.build +++ b/meson.build @@ -2061,6 +2061,7 @@ summary_info +=3D {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHI= TELIST']} summary_info +=3D {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHI= TELIST']} summary_info +=3D {'VirtFS support': config_host.has_key('CONFIG_VIRTFS= ')} +summary_info +=3D {'Legacy VIRTIO support': config_host.has_key('CONFIG_VI= RTIO_LEGACY')} summary_info +=3D {'build virtiofs daemon': have_virtiofsd} summary_info +=3D {'Multipath support': mpathpersist.found()} summary_info +=3D {'VNC support': vnc.found()} diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 6818a23a2d3..b6c060f8cc6 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -20,24 +20,15 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" =20 -#if defined(TARGET_PPC64) || defined(TARGET_ARM) -#define LEGACY_VIRTIO_IS_BIENDIAN 1 -#endif - +#ifdef CONFIG_VIRTIO_LEGACY +bool virtio_access_is_big_endian(VirtIODevice *vdev); +#else static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) { -#if defined(LEGACY_VIRTIO_IS_BIENDIAN) - return virtio_is_big_endian(vdev); -#elif defined(TARGET_WORDS_BIGENDIAN) - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - /* Devices conforming to VIRTIO 1.0 or later are always LE. */ - return false; - } - return true; -#else + /* Devices conforming to VIRTIO 1.0 or later are always LE. */ return false; -#endif } +#endif =20 static inline uint16_t virtio_lduw_phys(VirtIODevice *vdev, hwaddr pa) { diff --git a/hw/virtio/virtio-legacy.c b/hw/virtio/virtio-legacy.c new file mode 100644 index 00000000000..bf28c824a25 --- /dev/null +++ b/hw/virtio/virtio-legacy.c @@ -0,0 +1,29 @@ +/* + * Legacy virtio endian helpers. + * + * Copyright Red Hat, Inc. 2020 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-access.h" + +#if defined(TARGET_PPC64) || defined(TARGET_ARM) +# define LEGACY_VIRTIO_IS_BIENDIAN 1 +#endif + +bool virtio_access_is_big_endian(VirtIODevice *vdev) +{ +#if defined(LEGACY_VIRTIO_IS_BIENDIAN) + return virtio_is_big_endian(vdev); +#elif defined(TARGET_WORDS_BIGENDIAN) + if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + /* Devices conforming to VIRTIO 1.0 or later are always LE. */ + return false; + } + return true; +#else + return false; +#endif +} diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index fbff9bc9d4d..95415913a9a 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -11,6 +11,7 @@ =20 virtio_ss =3D ss.source_set() virtio_ss.add(files('virtio.c')) +virtio_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.= c')) virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backe= nd.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) --=20 2.26.2 From nobody Mon Nov 17 13:42:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604580251; cv=none; d=zohomail.com; s=zohoarc; b=gPkAntwRNq/xAWiJRG2iqo2OcKnAADRPmBfoam/5tSyqo3JA9NEDm1sAciFqBWmEa12hpa9GUm1YvYqrLeAh4WcHiMp5hNlqzfSu8gXH8kBfLpo0ZCh3WvDSpBLFW2HxGvHBwkPGrZ46RuIzK2rZP17ABL5eF/THCO9bhfvbVas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604580251; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=qnXFKvPT1o0VTR2smUlGauG0ibfVMGznfVlfrMUGLE8=; b=VPxH09u5An4i45feFDFQElJJfY6TPQcM5fCWnA4lcT2Jq48VKiGVfkNcYQs/6dWmWXI+WgjE7fbcxhI2fe1VoXLLz81hbES7qSkSmzZ3He3kUKAQHXfVa7DorHmwv9tauw2hvgY1TwKbOp3u248FDEjSQk+Y9BqU6TZUbKnfTvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604580251482211.8947652606522; Thu, 5 Nov 2020 04:44:11 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-zmLRZBVyNICxJoGP_A-o1g-1; Thu, 05 Nov 2020 07:44:09 -0500 Received: by mail-wr1-f72.google.com with SMTP id w3so658541wrt.11 for ; Thu, 05 Nov 2020 04:44:08 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o3sm2341584wru.15.2020.11.05.04.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 04:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580250; 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=qnXFKvPT1o0VTR2smUlGauG0ibfVMGznfVlfrMUGLE8=; b=KN87+4XUdzBxpZlEsBLYqQI/vr5QO6DrlXd83AUZP6ELUYZNGIQomt0jbULh5GiQT44m6m F2q98FXgK8N73lOPlBeWXtREiL1oD0qc64Y8VS60D4doLJKKNBPB20brbv5agZDUKjU0FR /dzvK8gBzQJVp3kVk1MLi0mzQUS1faA= X-MC-Unique: zmLRZBVyNICxJoGP_A-o1g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qnXFKvPT1o0VTR2smUlGauG0ibfVMGznfVlfrMUGLE8=; b=C8EjVVdMRCVy6UJk6XBb7dJ5rX45tkw59k9vsBN7D68DEW/Q14G/pYBUnnOrk/ijFi U018nEIcKeDUBRTmcCqUW9rl9PQkvKLj0/YmGG7me3UoCdJnYiu4I/zwLyFE6Du1Y7ki gI+g4DuIolCclGD3ImGe8eGrt1DdGC1GV91cBggvLM74W9RUNViTRrKRGZp4iT0MIvWs xye5/jnYwXh5BR+rIYQrcyAcDQWS7Hn9VW1ROwanGuP1Ngfx+T9LEOi7F1WMM089iywf eUTpXV30kOcx3Sh9X8OXHjCu++i8kjxtRDnkn9Q6nqm1s38G3XPJU2SH42EvJ1gRh+YD 8XcQ== X-Gm-Message-State: AOAM5328KeVOH6S6E2hQOsnpEvIDL4fffJ33l/eRX7V5MdN5XR3eTmFD +dOfwFOX/N588OSagMwbDHeWDq3VSn4JbPRUvboKPgSa3saTCPEp3B/lhr7Rl+ZdfN2q+Io3ziA oyPs1s46eiJ4bQg== X-Received: by 2002:a1c:c912:: with SMTP id f18mr2602440wmb.150.1604580247354; Thu, 05 Nov 2020 04:44:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJycMZGYAqkWvUm4ti0KNbj3uR1qWoZk8mAAoVfJIvz+XFcQUGZxVsgOrCv+hbJC5AhUxiCYWQ== X-Received: by 2002:a1c:c912:: with SMTP id f18mr2602420wmb.150.1604580247183; Thu, 05 Nov 2020 04:44:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Elena Ufimtseva , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , Greg Kurz , Jagannathan Raman , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Wainer dos Santos Moschetta , Stefan Hajnoczi , Thomas Huth , Jason Wang , Cornelia Huck , Paolo Bonzini , Kevin Wolf , Stefan Hajnoczi Subject: [PATCH-for-6.0 2/3] hw/virtio: Build most of virtio devices as arch-independent objects Date: Thu, 5 Nov 2020 13:43:52 +0100 Message-Id: <20201105124353.3680057-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105124353.3680057-1-philmd@redhat.com> References: <20201105124353.3680057-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) VirtIO devices shouldn't be arch-specific. Some device have to use PAGE_SIZE definition or access to CPUState. Keep building them as arch-specific objects. Move all we can to libcommon.fa. Suggested-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Paolo Bonzini --- hw/9pfs/meson.build | 2 +- hw/block/dataplane/meson.build | 2 +- hw/block/meson.build | 2 +- hw/char/meson.build | 2 +- hw/net/meson.build | 2 +- hw/scsi/meson.build | 2 +- hw/virtio/meson.build | 15 +++++++++------ 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index cc094262122..ac964be15ce 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -17,4 +17,4 @@ fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) =20 -specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device= .c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.= c')) diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build index 12c6a264f10..e2f3721ce24 100644 --- a/hw/block/dataplane/meson.build +++ b/hw/block/dataplane/meson.build @@ -1,2 +1,2 @@ -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..497592c33ac 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -15,7 +15,7 @@ softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.= c')) =20 -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-= blk.c')) =20 subdir('dataplane') diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29..7496594ea07 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -37,5 +37,5 @@ =20 specific_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c')) specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.= c')) -specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c= ')) +softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c'= )) specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) diff --git a/hw/net/meson.build b/hw/net/meson.build index 4a7051b54a0..c795af23eee 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -43,7 +43,7 @@ specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethl= ite.c')) =20 softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) -specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) =20 softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: f= iles('vhost_net.c'), if_false: files('vhost_net-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index 923a34f344c..fdf27156f6a 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -19,7 +19,7 @@ virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-c= ommon.c', 'vhost-scsi.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-s= csi-common.c', 'vhost-user-scsi.c')) -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_= ss) +softmmu_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) =20 specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) =20 diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 95415913a9a..40df99f1a48 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -9,12 +9,15 @@ =20 softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) =20 +virtio_arch_ss =3D ss.source_set() +virtio_arch_ss.add(files('virtio.c')) +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-le= gacy.c')) +virtio_arch_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c= ')) +virtio_arch_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c= ')) +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iom= mu.c')) + virtio_ss =3D ss.source_set() -virtio_ss.add(files('virtio.c')) -virtio_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.= c')) virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backe= nd.c')) -virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) -virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloo= n.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.= c')) virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true= : files('virtio-crypto-pci.c')) @@ -24,7 +27,6 @@ virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', = 'vhost-vsock-common.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-= vsock.c', 'vhost-vsock-common.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) -virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c'= )) virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) =20 virtio_pci_ss =3D ss.source_set() @@ -49,4 +51,5 @@ =20 virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) =20 -specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) +softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) +specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_arch_ss) --=20 2.26.2 From nobody Mon Nov 17 13:42:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604580258; cv=none; d=zohomail.com; s=zohoarc; b=Kgk6ll3u3h7VtbX1KM4wJTSdRpTheg+r+TFDeTLsdeRGIO7Z1taikok0b+vGIWmvxIkAcvV9uvWjBeACtDon/Sjzn/UKdjoWS8blHs3pLWi100YN7WKSErc1A8ATyq0dIjN7lIL/wGBmdSzeyadcyUIRx4Um8+QyxFTAY2usARY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604580258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=bepWcvGQ0bfdYX/qi1p2dH7ehIvF5dT/hahyqVRGcmk=; b=KicYvB8oclLFTimuETuopp6h3nbainJVs/LpwHj/I7DK5Opw2m/hnYs2DAa5EodbQwrLOimzFadK6ajTQJsouXTS62Te7z8GNUPIu4HSsQ8N2VIM0Fx5CFVhrztzr/Wm0UoES3R0Br0dSQw22jX81g8brBQwfZLrgtX7jXM+vIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604580258187526.1506856420132; Thu, 5 Nov 2020 04:44:18 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-GRGCbHz2M6igYvOE955OSA-1; Thu, 05 Nov 2020 07:44:13 -0500 Received: by mail-wr1-f69.google.com with SMTP id e11so658414wrw.14 for ; Thu, 05 Nov 2020 04:44:13 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u3sm2431544wro.33.2020.11.05.04.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 04:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580257; 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=bepWcvGQ0bfdYX/qi1p2dH7ehIvF5dT/hahyqVRGcmk=; b=YPgFuNY9Lu9lIfpnETFVlmdYMAo3HUWu/X8RVdXzW/dI+9UoaAQZ4qG9CxB33cRFKmC6t0 iM1t1mkID8ILxIXlF3pWfJyE37r9BpsO31xa3CfFlTE/aG1oqKbkp89EygNxN8kIW1FBqp HK7zunoVIy4w0UGPTY4N63vxHwmhRx8= X-MC-Unique: GRGCbHz2M6igYvOE955OSA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bepWcvGQ0bfdYX/qi1p2dH7ehIvF5dT/hahyqVRGcmk=; b=RXpltX7YML1WHgD1EVLP0XFK+e2+gTuXQnoY4eV/LHAe7sTam5pbvkWv2XpRkNrogo brBR2x25vjejjN539vcd62mPYWQd3P3TcIN2u4l5MUV39pqIxcTdMi1zTuRCDh/2BPBi d7un05xya+JTbCFL2Uu/o8T0Lygv/6DiF7OSWPnwGMJmE94I+zqksDLLH2jb/IcNGLz4 Yf0EGl6RU7arNobazIz3qlyw0gwvcIqirCw/GmJaYtpJSHZWYuWEtJ0v2dX8zsk9z41o GOgtck61fOe4FrDfb/Wt4idDD04GAUzxYDcr0BoBxQvOgY5DiieoqIBEN6Ubufa5yrS6 Q7MQ== X-Gm-Message-State: AOAM533h+9IEEfFOrp2ThkNegverz2NnX4g0FF1jgTt9LZPbljps73Ne DtC2fiDcGPuuK1IcOAsT5QU03JGJ9udg0I6+A84slfNDykb5OYiFpo6Lu/lSEDxFf9aCoAvAriB VGomtfQ1311KNLA== X-Received: by 2002:a7b:cbcf:: with SMTP id n15mr2506093wmi.156.1604580252670; Thu, 05 Nov 2020 04:44:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdmkvAKcvdYqrzbh8740WVd9v1CEuWQdEjPg1sNnohA4LgmpX4vw1ZWRgvfgh9g25KqCR38w== X-Received: by 2002:a7b:cbcf:: with SMTP id n15mr2506070wmi.156.1604580252496; Thu, 05 Nov 2020 04:44:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Elena Ufimtseva , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , Greg Kurz , Jagannathan Raman , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Wainer dos Santos Moschetta , Stefan Hajnoczi , Thomas Huth , Jason Wang , Cornelia Huck , Paolo Bonzini , Kevin Wolf Subject: [PATCH-for-6.0 3/3] gitlab-ci: Test the --disable-virtio-legacy option Date: Thu, 5 Nov 2020 13:43:53 +0100 Message-Id: <20201105124353.3680057-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105124353.3680057-1-philmd@redhat.com> References: <20201105124353.3680057-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add the recently introduced '--disable-virtio-legacy' configuration to the 'build-disabled' job. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..21fa1a459fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -218,6 +218,7 @@ build-disabled: --disable-strip --disable-tpm --disable-usb-redir --disable-vdi --disable-vhost-crypto --disable-vhost-net --disable-vhost-scsi --disable-vhost-user --disable-vhost-vdpa --disable-vhost-vsock + --disable-virtio-legacy --disable-virglrenderer --disable-vnc --disable-vte --disable-vvfat --disable-xen --disable-zstd TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu --=20 2.26.2