From nobody Wed Nov 27 04:51:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700568033362652.1615550198575; Tue, 21 Nov 2023 04:00:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5PQM-0002vT-5U; Tue, 21 Nov 2023 07:00:18 -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 1r5PQD-0002vA-Mu for qemu-devel@nongnu.org; Tue, 21 Nov 2023 07:00:06 -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 1r5PQ9-0005rM-TX for qemu-devel@nongnu.org; Tue, 21 Nov 2023 07:00:04 -0500 Received: from [2001:8b0:10b:1::ebe] (helo=i7.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1r5PQ6-005YXW-9j; Tue, 21 Nov 2023 11:59:58 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96.2 #2 (Red Hat Linux)) id 1r5PQ5-005fd4-2V; Tue, 21 Nov 2023 11:59:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description; bh=JzRV6ny3++3xkn4fW6mQjP91R+P7TBzpc3OKwAaM7LQ=; b=Os6KVaO+j7b6+vQBogxHDw5NDX F2HeJJWRkdvM3/vaSAlgH5XkLBBQb+3hD7psNoEOU8Z1L1MHTdlj5PZHEGzZfPLywOsbLdBvipVRo hGuZ/gpZviRBlyijFJqsmZnI20t6rVUy7408fVU1hvmcq2KJhlB3Y7gR/1KEMNOCdfNP0KgCAFigA gGxXSIOxmmcAWGQ77sUMi15qVO+ghXdjIzp6e/4aQEzAN+bKthEmj+I1zg/aITWEzqMHRR0ex1L/Z EZnetwMRkM+02zMJ0FRYffgM7pxlzlkozXiAv36ylqnOzaXtElRQt+z45sELD0SpvCkUV8YCNUfO/ qoI9Xh+Q==; From: David Woodhouse To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant Subject: [PULL for-8.2 1/2] vl: disable default serial when xen-console is enabled Date: Tue, 21 Nov 2023 11:59:56 +0000 Message-ID: <20231121115957.1351656-2-dwmw2@infradead.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121115957.1351656-1-dwmw2@infradead.org> References: <20231121115957.1351656-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2001:8b0:10b:1236::1; envelope-from=BATV+dd65dc28b6171b1f8060+7394+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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1700568036484100003 From: David Woodhouse If a Xen console is configured on the command line, do not add a default serial port. Signed-off-by: David Woodhouse Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paul Durrant --- 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[] =3D { + { .driver =3D "xen-console", .flag =3D &default_serial }, { .driver =3D "isa-serial", .flag =3D &default_serial }, { .driver =3D "isa-parallel", .flag =3D &default_parallel }, { .driver =3D "isa-fdc", .flag =3D &default_floppy }, --=20 2.41.0 From nobody Wed Nov 27 04:51:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700568067441357.87147197751926; Tue, 21 Nov 2023 04:01:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5PQa-0002y2-W7; Tue, 21 Nov 2023 07:00:29 -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 1r5PQG-0002vL-U7 for qemu-devel@nongnu.org; Tue, 21 Nov 2023 07:00:10 -0500 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5PQD-0005ra-Up for qemu-devel@nongnu.org; Tue, 21 Nov 2023 07:00:08 -0500 Received: from [2001:8b0:10b:1::ebe] (helo=i7.infradead.org) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1r5PQ7-00BQUf-0T; Tue, 21 Nov 2023 11:59:59 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96.2 #2 (Red Hat Linux)) id 1r5PQ5-005fd8-2e; Tue, 21 Nov 2023 11:59:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=S2rxj4tGYfiSjRTzAA0gVxxr1WmbaLvxmp6exqiHiuc=; b=rVpQxKgZJNF4QIchshpRU2sEZh eDC0PXqK/RnzwZsUbMuiTQjmgO+o2UNfrmD0weg2of543ihngxrFOxJIgepxF6pLU2pmKfd5OjLsh srmPL5EhvnYhe5Xs1CzuR5YohcDlHB7F7Hcse2+5rlgdnq93/RtY8q9rQeP8QRXPwTfbFBEZDgpK5 ldPWfsUBtj066E1i2YTlHhg8muqx6n5oDg48DjAXD72vxwJ8Nln3cAU8TpN5RaSQw89ylPehUtmDt XAgp83uK0LxQh7BW5ORSjYFU2An8nO2I4lSODw24oSItIn+Xl2m3yFQQA8I+DAj2AJJVI8Elv2FA9 PtxeaYEA==; From: David Woodhouse To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant Subject: [PULL for-8.2 2/2] hw/xen: clean up xen_block_find_free_vdev() to avoid Coverity false positive Date: Tue, 21 Nov 2023 11:59:57 +0000 Message-ID: <20231121115957.1351656-3-dwmw2@infradead.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121115957.1351656-1-dwmw2@infradead.org> References: <20231121115957.1351656-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by desiato.infradead.org. See http://www.infradead.org/rpr.html Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; envelope-from=BATV+b5dddee4e6bb4f7a8ff0+7394+infradead.org+dwmw2@desiato.srs.infradead.org; helo=desiato.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1700568069085100007 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Coverity couldn't see that nr_existing was always going to be zero when qemu_xen_xs_directory() returned NULL in the ENOENT case (CID 1523906). Perhaps more to the point, neither could Peter at first glance. Improve the code to hopefully make it clearer to Coverity and human reviewers alike. Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- hw/block/xen-block.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 6d64ede94f..aed1d5c330 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -91,9 +91,27 @@ static bool xen_block_find_free_vdev(XenBlockDevice *blo= ckdev, Error **errp) =20 existing_frontends =3D qemu_xen_xs_directory(xenbus->xsh, XBT_NULL, fe= _path, &nr_existing); - if (!existing_frontends && errno !=3D ENOENT) { - error_setg_errno(errp, errno, "cannot read %s", fe_path); - return false; + if (!existing_frontends) { + if (errno =3D=3D ENOENT) { + /* + * If the frontend directory doesn't exist because there are + * no existing vbd devices, that's fine. Just ensure that we + * don't dereference the NULL existing_frontends pointer, by + * checking that nr_existing is zero so the loop below is not + * entered. + * + * In fact this is redundant since nr_existing is initialized + * to zero, but setting it again here makes it abundantly clear + * to Coverity, and to the human reader who doesn't know the + * semantics of qemu_xen_xs_directory() off the top of their + * head. + */ + nr_existing =3D 0; + } else { + /* All other errors accessing the frontend directory are fatal= . */ + error_setg_errno(errp, errno, "cannot read %s", fe_path); + return false; + } } =20 memset(used_devs, 0, sizeof(used_devs)); --=20 2.41.0