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 lists1p.gnu.org (lists1p.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 4108CC5B567 for ; Mon, 10 Aug 2026 18:01:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtUJE-0001Ts-4C; Mon, 10 Aug 2026 14:01:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtUJB-0001Tg-IF for qemu-devel@nongnu.org; Mon, 10 Aug 2026 14:01:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtUJ9-0008RB-Rk for qemu-devel@nongnu.org; Mon, 10 Aug 2026 14:01:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1786384867; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=464HP0koFmUxpEyl4BpzzDMEE6w+Hn2bQS9dQHOtNfI=; b=DBadmL1HK/fKS0R877t3x3m8yywA1FNXxsarrzPF1jNADLghAq96gE1CXfrprdbmpoVtAT L2kZAYCur7zJfxodvSV8QDx1/wO0gG9pRzakHvGxxPTPWNsJG5bHFsJn5h252Z4ORPzyC6 7ujIYsghe9nssqHzeRnlWAH4pMy0oA0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-126-7tNLQuP_OJydI5I0-us_SA-1; Mon, 10 Aug 2026 14:01:02 -0400 X-MC-Unique: 7tNLQuP_OJydI5I0-us_SA-1 X-Mimecast-MFC-AGG-ID: 7tNLQuP_OJydI5I0-us_SA_1786384862 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AD03F195606B; Mon, 10 Aug 2026 18:01:01 +0000 (UTC) Received: from redhat.com (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 09A6B195DF95; Mon, 10 Aug 2026 18:00:59 +0000 (UTC) Date: Mon, 10 Aug 2026 19:00:57 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Markus Armbruster Subject: Re: [PATCH v2 13/39] python, tests: switch usernet queries from HMP to QMP Message-ID: References: <20260626-qemu-no-hmp-v2-0-8af31bc54c61@redhat.com> <20260626-qemu-no-hmp-v2-13-8af31bc54c61@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260626-qemu-no-hmp-v2-13-8af31bc54c61@redhat.com> User-Agent: Mutt/2.4.0 (2026-06-19) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.746, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Jun 26, 2026 at 01:19:14AM +0400, Marc-André Lureau wrote: > Replace human-monitor-command "info usernet" calls with the structured > x-query-usernet QMP command in get_usernet_hostfwd_port() and the VM > test runner boot path. > > Since x-query-usernet returns a list of UsernetInfo entries, callers > now iterate over the result and extract the port from each entry's > "info" field. Also switch get_info_usernet_hostfwd_port() from > split('\r\n') to splitlines(), since QMP strings use \n rather than > the HMP monitor's \r\n line endings. > > Signed-off-by: Marc-Andre Lureau > --- > python/qemu/utils/__init__.py | 5 +++-- > tests/functional/qemu_test/utils.py | 8 ++++++-- > tests/vm/basevm.py | 13 ++++++++----- > 3 files changed, 17 insertions(+), 9 deletions(-) Reviewed-by: Daniel P. Berrangé > > diff --git a/python/qemu/utils/__init__.py b/python/qemu/utils/__init__.py > index be5daa83634..e32911d4c6d 100644 > --- a/python/qemu/utils/__init__.py > +++ b/python/qemu/utils/__init__.py > @@ -46,10 +46,11 @@ def get_info_usernet_hostfwd_port(info_usernet_output: str) -> Optional[int]: > """ > Returns the port given to the hostfwd parameter via info usernet > > - :param info_usernet_output: output generated by hmp command "info usernet" > + :param info_usernet_output: output generated by "info usernet" or > + the "info" field from x-query-usernet > :return: the port number allocated by the hostfwd option > """ > - for line in info_usernet_output.split('\r\n'): > + for line in info_usernet_output.splitlines(): > regex = r'TCP.HOST_FORWARD.*127\.0\.0\.1\s+(\d+)\s+10\.' > match = re.search(regex, line) > if match is not None: > diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_test/utils.py > index 826c267785b..0992db49ab2 100644 > --- a/tests/functional/qemu_test/utils.py > +++ b/tests/functional/qemu_test/utils.py > @@ -14,8 +14,12 @@ > > > def get_usernet_hostfwd_port(vm): > - res = vm.cmd('human-monitor-command', command_line='info usernet') > - return get_info_usernet_hostfwd_port(res) > + res = vm.cmd('x-query-usernet') I think there's an error handling behaviour difference here. HMP has no concept of errors, just stuffing messages onto stderr. So in !CONFIG_SLIRP scenarios this "info usernet" command probably didn't return an error that this code would detect. I think get_info_usernet_hostfwd_port() simply wouldn't find a port number. x-query-usernet by contrast will have clear error handling, so should raise an exception in !CONFIG_SLIRP scenarios which will break callers of this method I expect > + for entry in res: > + port = get_info_usernet_hostfwd_port(entry['info']) > + if port is not None: > + return port > + return None > > def pow2ceil(x): > """ > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 9e879e966a3..198b04e8c37 100644 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -312,12 +312,15 @@ def boot(self, img, extra_args=[]): > self._guest = guest > # Init console so we can start consuming the chars. > self.console_init() > - usernet_info = guest.cmd("human-monitor-command", > - command_line="info usernet") > - self.ssh_port = get_info_usernet_hostfwd_port(usernet_info) > + res = guest.cmd("x-query-usernet") Same concern here about likely breaking in !CONFIG_SLIRP scenarios > + for entry in res: > + port = get_info_usernet_hostfwd_port(entry['info']) > + if port is not None: > + self.ssh_port = port > + break > if not self.ssh_port: > - raise Exception("Cannot find ssh port from 'info usernet':\n%s" % \ > - usernet_info) > + raise Exception("Cannot find ssh port from" > + " 'x-query-usernet': %s" % res) > > def console_init(self, timeout = None): > if timeout == None: > > -- > 2.54.0 > With regards, Daniel -- |: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|