From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9919CC433E0 for ; Thu, 18 Mar 2021 10:03:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCA5564F30 for ; Thu, 18 Mar 2021 10:03:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCA5564F30 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMpVB-0006ke-Dv for qemu-devel@archiver.kernel.org; Thu, 18 Mar 2021 06:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMpTt-0005SX-3n for qemu-devel@nongnu.org; Thu, 18 Mar 2021 06:02:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMpTo-00057r-Li for qemu-devel@nongnu.org; Thu, 18 Mar 2021 06:02:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616061731; 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=kjRTQkw8Od7kTKZ67idDh0xH+jFA6ps7HE1La8SI9vE=; b=JHzHc53kPT0JdpnwpscDApK+nDM/hy5suxaqU93BC1RRv7QKHfAdJblbQeSf4XPojutH/R qWVY/kVgLtoyiLWuE2WWqx1wv86T8lLLZiyITMdCYzh9Mm6eJbzEdbdYS4vlGtxNeCTrj5 jEXJ81ZDkk1fqdeKlvccHPoKqVgmyas= 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-557-xCyFUb38NlOfKpk835_wOw-1; Thu, 18 Mar 2021 06:02:09 -0400 X-MC-Unique: xCyFUb38NlOfKpk835_wOw-1 Received: by mail-wr1-f69.google.com with SMTP id h5so19798404wrr.17 for ; Thu, 18 Mar 2021 03:02:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kjRTQkw8Od7kTKZ67idDh0xH+jFA6ps7HE1La8SI9vE=; b=A+/stcsZfuiSAuV0dWb1AtUX3SNqoDAKoFgueQ7b8tpEml0F1pFNRw3DDR0ak8DDrw kWWzJ0Gtv5AoGrI19vki/RTnCjoQvUuxBElEFv6K+8cMvHxQ5wDasmsFJX69YTKhb3Pv bfwj6U9Wg221xxQi4tE9UsMgZ3PC/8UX/R/Fc/Bn20vZa1qlGPJowcITMhcsA22aVLR0 1x5tnP9OhCFnZ6Pu8MK7Ns5+am46w2EosiIdDXTPXjKHMm6lEFMXlsZUvdd5z4OJtOCh O0sv7jTp3ZrE2e8/d4KjsQKOU2tdnH8IJ1cxkrsdMLdEoOBO3UsYMH+iQgurszNo4Dvs BnEg== X-Gm-Message-State: AOAM532BN0Pp1qBcPv4T+lgtZd5jHYwUas8W++Z1BpPOTCAoQPx70nJA mujBEm+wjnY8nQegPhKJIfqckqZxNO6BjlK0CvQNXt2+fDzitrl6psHjglL7n+5VHrnwbW05EoV AueeI4hgURork8cQ= X-Received: by 2002:a7b:c38d:: with SMTP id s13mr2835479wmj.44.1616061728399; Thu, 18 Mar 2021 03:02:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqXmEfXCDoL6oHAZrULXu2p9zTKGjOH/3qfcSPdw3Avu5a+u3VIVfazIIDZOHb9mMuKp+Z0Q== X-Received: by 2002:a7b:c38d:: with SMTP id s13mr2835460wmj.44.1616061728118; Thu, 18 Mar 2021 03:02:08 -0700 (PDT) Received: from [192.168.1.36] (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id e13sm2666699wrg.72.2021.03.18.03.02.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Mar 2021 03:02:07 -0700 (PDT) Subject: Re: [PULL 5/5] m68k: add Virtual M68k Machine To: Laurent Vivier , qemu-devel@nongnu.org References: <20210315204226.3481044-1-laurent@vivier.eu> <20210315204226.3481044-6-laurent@vivier.eu> <2730eee0-6f1b-2139-f93c-6a0a64727e29@redhat.com> <905c797a-25c3-bb43-5946-54b28d9530c0@vivier.eu> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Thu, 18 Mar 2021 11:02:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <905c797a-25c3-bb43-5946-54b28d9530c0@vivier.eu> 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-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 3/18/21 10:52 AM, Laurent Vivier wrote: > Le 18/03/2021 à 10:19, Philippe Mathieu-Daudé a écrit : >> Hi Laurent, >> >> +Paolo / Thomas >> >> On 3/15/21 9:42 PM, Laurent Vivier wrote: >>> The machine is based on Goldfish interfaces defined by Google >>> for Android simulator. It uses Goldfish-rtc (timer and RTC), >>> Goldfish-pic (PIC) and Goldfish-tty (for serial port and early tty). >>> >>> The machine is created with 128 virtio-mmio bus, and they can >>> be used to use serial console, GPU, disk, NIC, HID, ... >>> >>> Signed-off-by: Laurent Vivier >>> Reviewed-by: Richard Henderson >>> Tested-by: Philippe Mathieu-Daudé >>> Message-Id: <20210312214145.2936082-6-laurent@vivier.eu> >>> --- >>> default-configs/devices/m68k-softmmu.mak | 1 + >>> .../standard-headers/asm-m68k/bootinfo-virt.h | 18 + >>> hw/m68k/virt.c | 313 ++++++++++++++++++ >>> MAINTAINERS | 13 + >>> hw/m68k/Kconfig | 9 + >>> hw/m68k/meson.build | 1 + >>> 6 files changed, 355 insertions(+) >>> create mode 100644 include/standard-headers/asm-m68k/bootinfo-virt.h >>> create mode 100644 hw/m68k/virt.c >> >>> diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig >>> index 60d7bcfb8f2b..f839f8a03064 100644 >>> --- a/hw/m68k/Kconfig >>> +++ b/hw/m68k/Kconfig >>> @@ -23,3 +23,12 @@ config Q800 >>> select ESP >>> select DP8393X >>> select OR_IRQ >>> + >>> +config M68K_VIRT >>> + bool >>> + select M68K_IRQC >>> + select VIRT_CTRL >>> + select GOLDFISH_PIC >>> + select GOLDFISH_TTY >>> + select GOLDFISH_RTC >>> + select VIRTIO_MMIO >> >> I had this error on gitlab: >> >> (qemu) QEMU_PROG: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=virtio: >> 'virtio-blk-pci' is not a valid device model name >> job: check-system-fedora >> https://gitlab.com/philmd/qemu/-/jobs/1106469724 >> >> I bisected locally to this commit. >> >> check-system-fedora uses build-system-fedora: >> >> build-system-fedora: >> CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs >> --enable-fdt=system --enable-slirp=system >> --enable-capstone=system >> >> I'm confused because the machine provides a VIRTIO bus >> via MMIO: >> >> config VIRTIO_MMIO >> bool >> select VIRTIO >> >> I remember I tested your machine with virtio-blk-device. >> >> config VIRTIO_BLK >> bool >> default y >> depends on VIRTIO >> >> Ah, this is virtio-blk-pci, which has: >> >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: >> files('virtio-blk-pci.c')) >> virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) >> >> And VIRTIO_PCI isn't selected... > > This machine doesn't have virtio-pci, but only virtio-mmio buses. Yes. I meant "VIRTIO_PCI isn't selected, which is the correct config for this machine". So the problem isn't the m68k-virt machine addition, but it shows another problem elsewhere. >> Are the tests incorrect then? >> >> libqos isn't restricted to PCI: >> >> tests/qtest/libqos/virtio-blk.c:24:#include "virtio-blk.h" >> tests/qtest/libqos/virtio-blk.c:29:/* virtio-blk-device */ >> tests/qtest/libqos/virtio-blk.c:33: if (!g_strcmp0(interface, >> "virtio-blk")) { >> tests/qtest/libqos/virtio-blk.c:40: fprintf(stderr, "%s not present >> in virtio-blk-device\n", interface); >> tests/qtest/libqos/virtio-blk.c:109: /* virtio-blk-device */ >> tests/qtest/libqos/virtio-blk.c:111: >> qos_node_create_driver("virtio-blk-device", virtio_blk_device_create); >> tests/qtest/libqos/virtio-blk.c:112: >> qos_node_consumes("virtio-blk-device", "virtio-bus", &opts); >> tests/qtest/libqos/virtio-blk.c:113: >> qos_node_produces("virtio-blk-device", "virtio-blk"); >> >> But qemu-iotests / qtests do use virtio-blk-pci. Maybe they should >> use a generic virtio-blk-device instead, hoping it get plugged correctly >> to the virtio bus... > > Yes, it's how the machine work: it has 128 virtio-mmio buses and virtio-devices are plugged directly > in the first free ones. > > I think the fix would be to disable the virtio-blk-pci test for the machines without PCI bus. > > Why is it executed for now? This is probably the problem root cause. Possible fix: -->8 -- diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 66ee9fbf450..d7f3fad51c1 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -217,13 +217,17 @@ 'emc141x-test.c', 'usb-hcd-ohci-test.c', 'virtio-test.c', - 'virtio-blk-test.c', - 'virtio-net-test.c', - 'virtio-rng-test.c', - 'virtio-scsi-test.c', 'virtio-serial-test.c', 'vmxnet3-test.c', ) +if config_all_devices.has_key('CONFIG_VIRTIO_PCI') + qos_test_ss.add( + 'virtio-blk-test.c', + 'virtio-net-test.c', + 'virtio-rng-test.c', + 'virtio-scsi-test.c', + ) +endif if have_virtfs qos_test_ss.add(files('virtio-9p-test.c')) endif --- I'll test that locally but not on Gitlab. Thanks, Phil.