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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 67F0FC4332F for ; Fri, 16 Dec 2022 00:46:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5ynj-0005SM-8F; Thu, 15 Dec 2022 19:42:11 -0500 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 1p5ynC-0005Dl-CQ for qemu-devel@nongnu.org; Thu, 15 Dec 2022 19:41:40 -0500 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5yn8-0006aN-5n for qemu-devel@nongnu.org; Thu, 15 Dec 2022 19:41:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=xrCGpMsmPqcCvSEu1E/dWqCyDDejxgMyqrmnLObBC88=; b=vQlj9cD2a92QpyxmmSaPHMBR1M WnQjdaYz85ev52gM9/A164xnx9QqnBnMoW9n7kGwh3UqFo5B+8czyzfPX4fxMpPyDyi1Aw/W+YjGB 8sMEThJy2gpoAJaznJqSuSrmqdmmfEOHTdSHMMBJIYKC3/ub5Nf5uKT03ioLJ+ebcgMXmof3AU9EX Bo7Zth5BlkxQyy9zuNEKWRtzq1AicIBcUVUvD+TgkaqE9MZXWxGwlxTMP5g6U2scn896e9C0XCf0N +LlBuG2OXkASWlCBKDapDHdoANaR+L4oZV+a7kU9pS4NqYkZt7ZRCANORN5ahrdPdsy+N5KTtZ2gK bM75kqug==; Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5yn6-00EvV4-7U; Fri, 16 Dec 2022 00:41:34 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5ymv-003cOE-Mh; Fri, 16 Dec 2022 00:41:21 +0000 From: David Woodhouse To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Paul Durrant , Joao Martins , Ankur Arora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr . David Alan Gilbert" , Claudio Fontana Subject: [RFC PATCH v3 03/38] xen: Add XEN_DISABLED mode and make it default Date: Fri, 16 Dec 2022 00:40:42 +0000 Message-Id: <20221216004117.862106-4-dwmw2@infradead.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221216004117.862106-1-dwmw2@infradead.org> References: <20221216004117.862106-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Received-SPF: none client-ip=2001:8b0:10b:1236::1; envelope-from=BATV+64e888c4aa1bfc596c85+7054+infradead.org+dwmw2@casper.srs.infradead.org; helo=casper.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: David Woodhouse Also check for XEN_ATTACH mode in xen_init() Suggested-by: Paolo Bonzini Signed-off-by: David Woodhouse --- accel/xen/xen-all.c | 4 ++++ include/hw/xen/xen.h | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 69aa7d018b..109d2e84bc 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -158,6 +158,10 @@ static int xen_init(MachineState *ms) { MachineClass *mc = MACHINE_GET_CLASS(ms); + if (xen_mode != XEN_ATTACH) { + xen_pv_printf(NULL, 0, "xen requires --xen-attach mode\n"); + return -1; + } xen_xc = xc_interface_open(0, 0, 0); if (xen_xc == NULL) { xen_pv_printf(NULL, 0, "can't open xen interface\n"); diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index afdf9c436a..82347e76a4 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -12,8 +12,9 @@ /* xen-machine.c */ enum xen_mode { - XEN_EMULATE = 0, // xen emulation, using xenner (default) - XEN_ATTACH // attach to xen domain created by libxl + XEN_DISABLED = 0, // xen support disabled (default) + XEN_ATTACH, // attach to xen domain created by libxl + XEN_EMULATE, }; extern uint32_t xen_domid; -- 2.35.3