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 66911726D7; Fri, 30 Sep 2022 21:36:17 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 0ABDF72725; Fri, 30 Sep 2022 21:36:14 +0000 (UTC) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by atuin.qyliss.net (Postfix) with ESMTPS id 315637268E for ; Fri, 30 Sep 2022 21:36:11 +0000 (UTC) Received: by mail-ed1-x533.google.com with SMTP id y100so7069805ede.6 for ; Fri, 30 Sep 2022 14:36:11 -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=KLOflaAVSQOYvpxAeItWcHQK090QdfTEUnY3OMGk6T8=; b=gJpma6vfWXcWJNyIU8ZgY9mEMjRXfyRdTZlPARYo/c0/9/SJD/x0i1JmhyedrL6VpG pjzDjzJXMspWC7W/rvh/CErA+uzYFtmzb060KS2xV85PZJ3R9ziLn7+IiATyKoEQyrua RC+/Dw2OxeFedBnE9Xyb6PP3VwO18W72//SsBuQz+XaS8fCnZm+VspnueU8HEH7llcfn 8Ycw1FoiaEcUBTMXIb1DJeOTEOZ+oksSaXeTgqRB3Q49ciarTsJHwnEIHljFBzZmcucr Sztm0k56vKMCzMBNEyV7001RjiRpicNnET5b7aXVlu8dwd3V+Mizo9Pqhl1KwhZJQZNC Pmww== 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=KLOflaAVSQOYvpxAeItWcHQK090QdfTEUnY3OMGk6T8=; b=j8RLOqbonUg4Yv/SRRSMT+GmxI4M70LQ/mRiX1vVxVaOfb8v/CDMiJBCbZo7aN/Qyc FVkjXY7tbWBJv70E8ky9Znf4Oyfpj6pNL2Y5NR7mMh0n64kT27a9T3wnf3Hmg6VSOe9z b0ClMv4GhcphNAtESOFPfKuCUG16RXocaotu5L/NGiUCdfL5tE/tw99lwqDQuAuE6HNi TM3NkO5MA/ujV6K7NQDVOMyKqsTuuCReKQ4sFtWzS8PeL10iIDLDtFRMWuDCVHk3lrEg xUuP0Ogzn8kIKJGEMRlnNwJvainyWIJu69Mg8CmzPD6p7xhoWGhM5NJnQUKwp9mOrx+J qlOw== X-Gm-Message-State: ACrzQf2+pa1fGjzh8p20mODW5HTaJzQVznpo3SdKWUfGI0Q9Mkteoc0E ty88PODqATlyLO6CK16j59d0tg== X-Google-Smtp-Source: AMsMyM6u03/XCaPR0H6ciFM47u3Xf34tn55KPanw/9rne+WhQgemeoyqDpltmWR1HEz3MGQ+IoKktQ== X-Received: by 2002:a05:6402:42d0:b0:457:d16e:283d with SMTP id i16-20020a05640242d000b00457d16e283dmr9305184edc.395.1664573770626; Fri, 30 Sep 2022 14:36:10 -0700 (PDT) Received: from x220.qyliss.net (p200300ed67079c010000000000000003.dip0.t-ipconnect.de. [2003:ed:6707:9c01::3]) by smtp.gmail.com with ESMTPSA id la3-20020a170907780300b00781dbdb292asm1696931ejc.155.2022.09.30.14.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 14:36:10 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id E311660D; Fri, 30 Sep 2022 21:36:09 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH v2 06/10] img/app: add support for testing in crosvm Date: Fri, 30 Sep 2022 21:35:29 +0000 Message-Id: <20220930213533.1710618-7-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220930213533.1710618-1-alyssa.ross@unikie.com> References: <20220930213533.1710618-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: WX6CSFQ4JIWFXIQDWPXRI5NKD6SISLE7 X-Message-ID-Hash: WX6CSFQ4JIWFXIQDWPXRI5NKD6SISLE7 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 42ed51d..e01aa82 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