From patchwork Thu Nov 9 11:37:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 1861950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=m8koTAGt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SR0MH1SqQz1yQK for ; Thu, 9 Nov 2023 22:38:19 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r13Lv-0004Dm-Eb; Thu, 09 Nov 2023 06:37:39 -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 1r13Lu-0004DV-1N for qemu-devel@nongnu.org; Thu, 09 Nov 2023 06:37:38 -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 1r13Lr-0004te-Lf for qemu-devel@nongnu.org; Thu, 09 Nov 2023 06:37:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=MIME-Version:Content-Type:Date:Cc:To: From:Subject:Message-ID:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=yPY64dWm3fpnyVuWNGLSOCcJ7Svao+SXA46BlBSp/A4=; b=m8koTAGtU8qkNPHK1YDq4RWFnz Es2IIzaMQSFriPmjz0rcpSaTMJYxgj3/qZ9S5y0THEG9nLUTLpfTVvm/E4fqPhkuzEOSHJokVG1Hl jLkDX367zJyXLtkQuWxSxADrFx5EV5xe4K5t3jX+WGNbt3d9K0H90Csl9lWf5x7jjNz+fkCeSaoCw Tg25V1wiyF4SPknl5b2qwBQ3CLIsgCjmE9fN3lLX7vrLtITonnXHzHntfvkJPsJigIwF+laDnrRAj U9Xtfa7aJviDlS5fLlX//Wpz4nSHuy7fNzMBrbRlvMN3OXA70RWfEfXOzaIzPl6IJVJiMysArjyGh gOLESHAQ==; Received: from [2001:8b0:10b:5:e60c:fbc4:6b73:8eff] (helo=u3832b3a9db3152.ant.amazon.com) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1r13Ln-0070tA-F7; Thu, 09 Nov 2023 11:37:32 +0000 Message-ID: <44fb0420a60dc4e4ca2666a676a0055a1a5f1b51.camel@infradead.org> Subject: [PATCH 8.2 bugfix] vl: disable default serial when xen-console is enabled From: David Woodhouse To: =?iso-8859-1?q?Marc-Andr=E9?= Lureau , qemu-devel Cc: Gerd Hoffmann , Paolo Bonzini , Thomas Huth , stefanha Date: Thu, 09 Nov 2023 11:37:31 +0000 User-Agent: Evolution 3.44.4-0ubuntu2 MIME-Version: 1.0 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+c182118e23cc89d32fc1+7382+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, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: David Woodhouse If a Xen console is configured on the command line, do not add a default serial port. Fixes: 1bec1cc0da4 ("ui/console: allow to override the default VC") Signed-off-by: David Woodhouse --- (Bonus points for adding a Xen console by default for Xen guests instead of a serial port, but I'll look at that for 8.3.) Without this, the example command lines in the documentation at https://qemu-project.gitlab.io/qemu/system/i386/xen.html fail: $ ./qemu-system-x86_64 --accel kvm,xen-version=0x40011,kernel-irqchip=split \ -display none -chardev stdio,mux=on,id=char0,signal=off -mon char0 \ -device xen-console,chardev=char0 -drive file=${GUEST_IMAGE},if=xen qemu-system-x86_64: cannot use stdio by multiple character devices qemu-system-x86_64: could not connect serial device to character backend 'stdio' Maybe that Fixes: tag is a little harsh; I think the two pull requests were outstanding at the same time... but mine was pulled first :)  system/vl.c | 1 +  1 file changed, 1 insertion(+) diff --git a/system/vl.c b/system/vl.c index 5af7ced2a1..8109231834 100644 --- a/system/vl.c +++ b/system/vl.c @@ -198,6 +198,7 @@ static const struct {      const char *driver;      int *flag;  } default_list[] = { +    { .driver = "xen-console",          .flag = &default_serial    },      { .driver = "isa-serial",           .flag = &default_serial    },      { .driver = "isa-parallel",         .flag = &default_parallel  },      { .driver = "isa-fdc",              .flag = &default_floppy    },