From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 0829387CF3; Fri, 30 Sep 2022 12:50:25 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 542C987D44; Fri, 30 Sep 2022 12:50:22 +0000 (UTC) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by atuin.qyliss.net (Postfix) with ESMTPS id 9C0BD87D3F for ; Fri, 30 Sep 2022 12:50:20 +0000 (UTC) Received: by mail-ej1-x636.google.com with SMTP id sb3so8785319ejb.9 for ; Fri, 30 Sep 2022 05:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=M5G15VeAfI09r9W6PoHzYL4STN0a4wYfVBnaKOjaAIY=; b=UIRjzXNfkib5p2gecs/gm2FSXp62Xe/MwCuh//MADvSOqUVlKfgQvIMhKeTkuzXbU8 PJ+bpmb/n2+DaCmaabZD/il/6EZuzxqmXWk0mLw88Kh1f5PP29UEUkAN3BcdOd/EIS2j gwS/UA+qJ3tkzzXBAA/2i0g8vu+NYR+HfcxFsdLB+DJnX8t/uFi4S7XS4TKNrPmyAa0z EuQzsXSljv/Jb8TdUJj0GLt5PQKVQUFesIzdQOuJBgqSxW7opY7w1vIYKOqembXUox+q llGZg2U0F/kdBb+Jxy9fVdRsRjFxLD4gla1GO1KkD68ieeJtHwNaYML6NnkiqJti00lm kKIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=M5G15VeAfI09r9W6PoHzYL4STN0a4wYfVBnaKOjaAIY=; b=TCfLO8L602BTsp/tNmrP93eFzPs+ISyHa6uKbeHQXA2zef0x2pN96dWeuJPigm0j1R zaIYfOqqTHa9ow6O5LZdkYh0bGVe+r/K520AROBK9HgRxEYlSe7Dw3zo+GGd1/WHtbfC M9chWeDvuEaZZ3XyRHBG9vARnHVWm//0JedyZrKLVddLOG4TeBtICU7V4FLCLFoRQsRe brmdyWbegxHwO/fOIzHqsrdZUbIi3w7aDlIz9cvUR6CnKOBFUbot2nz4iOzIVhf/BC5U usDBUxNaPj3cTY7BVF9ukSoTH9Fdff+tSoY/Xx19pFaMbHGQNBj1BjZtS4Aej6nRdXMy Jv3A== X-Gm-Message-State: ACrzQf3nxhcsKLkCWudI6YRVYAAZdi8hMV9rRiagiUpetZ0vzuM+sniS 9tJObZ5HXksLqnbgnDJWlnd4v+ZOLdvNg4HK X-Google-Smtp-Source: AMsMyM55nKzWjPeok9SeaKQtXGbjdcXmq34m5/sA+2QUHAnYcr8z3BnOUMVXFcOff9qp5c/qH9CN9w== X-Received: by 2002:a17:907:1c9b:b0:783:43c:10b with SMTP id nb27-20020a1709071c9b00b00783043c010bmr6400564ejc.320.1664542220444; Fri, 30 Sep 2022 05:50:20 -0700 (PDT) Received: from x220.qyliss.net (p54b8e692.dip0.t-ipconnect.de. [84.184.230.146]) by smtp.gmail.com with ESMTPSA id c5-20020a50d645000000b004580b26e32esm1615122edj.81.2022.09.30.05.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 05:50:20 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 01A55559; Fri, 30 Sep 2022 12:49:49 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH 06/10] img/app: add support for testing in crosvm Date: Fri, 30 Sep 2022 12:49:36 +0000 Message-Id: <20220930124940.1013577-7-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220930124940.1013577-1-alyssa.ross@unikie.com> References: <20220930124940.1013577-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HTEGUWQEKXCHPOQPO5REBRSZRNZU7QHI X-Message-ID-Hash: HTEGUWQEKXCHPOQPO5REBRSZRNZU7QHI X-MailFrom: alyssa.ross@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Puck Meerburg , Ville Ilvonen X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is useful because it allows comparing how our patched cloud-hypervisor behaves against crosvm's implementation. Signed-off-by: Alyssa Ross --- img/app/Makefile | 12 ++++++++++++ img/app/shell.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/img/app/Makefile b/img/app/Makefile index 145001c..9f70032 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -8,6 +8,7 @@ QEMU_KVM = qemu-kvm CLOUD_HYPERVISOR = cloud-hypervisor CROSVM = crosvm CROSVM_DEVICE_GPU = $(CROSVM) device gpu +CROSVM_RUN = $(CROSVM) run prefix = /usr/local imgdir = $(prefix)/img @@ -135,6 +136,17 @@ run-cloud-hypervisor: build/host/appvm/blk/root.img start-vhost-user-gpu --serial pty .PHONY: run-cloud-hypervisor +run-crosvm: build/host/appvm/blk/root.img start-vhost-user-gpu + $(CROSVM_RUN) \ + --disk build/host/appvm/blk/root.img \ + --disk $(RUN_IMG) \ + -p "console=ttyS0 root=PARTLABEL=root" \ + --vhost-user-gpu vhost-user-gpu.sock \ + --serial type=file,hardware=serial,path=/tmp/crosvm.log \ + --serial type=stdout,hardware=virtio-console,stdin=true \ + $(KERNEL) +.PHONY: run-crosvm + run: run-$(VMM) .PHONY: run diff --git a/img/app/shell.nix b/img/app/shell.nix index d6b627c..c9ed1a6 100644 --- a/img/app/shell.nix +++ b/img/app/shell.nix @@ -12,7 +12,7 @@ with config.pkgs; { nativeBuildInputs = nativeBuildInputs ++ [ - cloud-hypervisor jq qemu_kvm reuse + cloud-hypervisor crosvm jq qemu_kvm reuse ]; KERNEL = "${passthru.kernel.dev}/vmlinux"; -- 2.37.1