From nobody Mon Feb 9 12:29:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628780098; cv=none; d=zohomail.com; s=zohoarc; b=GozaCjOe3rxAKOZkcC0s/FLx8GTWjDuuuwxGm5xAIFtWJ6zTHG4iaFhmfJiwqq7ohnLM1cYGP8vBbAlFeXH1nd/UDtGNzsAS96F4PAXM152naHthMz7R7vY/bT1K3hZaKRfXNbFRMgkb8mJtndog4ys2rjPInMhLDepmIbcOsYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628780098; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7xaHrLyd8q7PjnqkGqQ7V1l0FX+WoadoEpq7vzozy6k=; b=HIeti36GD4NnqjBW0r5gTMxYFW1+3t5lTk6RqyjSzSv0aKfZWp2dJ1rbDdk+ijLvfsmm8ZHw7nHtoxcDCwkZ1p2QBHQP9q1in4peEqHtJnZM4W4PbJEJSHcejRpprU0i8Lqvv0aWY/5wo41cZ3f40rD2tMmEg1/pV7feHsNpf/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628780098987951.642743847619; Thu, 12 Aug 2021 07:54:58 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-133-Hnj5pMDUPHikQfOkWbUbYw-1; Thu, 12 Aug 2021 10:54:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9FEB1082924; Thu, 12 Aug 2021 14:54:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82D3C5D9D5; Thu, 12 Aug 2021 14:54:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 27BAD181A0F8; Thu, 12 Aug 2021 14:54:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17CEnNs4008376 for ; Thu, 12 Aug 2021 10:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id A87D319D9F; Thu, 12 Aug 2021 14:49:23 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1698A19C44 for ; Thu, 12 Aug 2021 14:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628780098; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7xaHrLyd8q7PjnqkGqQ7V1l0FX+WoadoEpq7vzozy6k=; b=AM1b513tvcU7bJ7gg1a5MZ58PaaFF5WGJdwlJPGm01f+sL4YFiwqBIwMOKzfBPIQbPrswi nMyTSt9+I5Gewfts4P6v2EQKwlE1S8WkoyecQj5wTybfD3KhdHhWjl8jORsUgDqunVKjce zyXMDA8YvtfEtC8FpaaYwOi8nAOPDgQ= X-MC-Unique: Hnj5pMDUPHikQfOkWbUbYw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/22] virQEMUCapsCommandLine: Group by commandline argument name alphabetically Date: Thu, 12 Aug 2021 16:48:55 +0200 Message-Id: <06d0847a139c748c834a916db800786ed5730861.1628778754.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628780100293100001 Content-Type: text/plain; charset="utf-8" Further commits will be refactoring and minimizing capabilities being parsed from 'query-command-line-options'. Group the struct driving the detection by argument name so it's easier to spot options belonging together. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9558938866..0d8c9667f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3223,39 +3223,39 @@ struct virQEMUCapsCommandLineProps { }; static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] =3D { - { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, - { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, - { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT }, - { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABL= E }, - { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, - { "numa", NULL, QEMU_CAPS_NUMA }, - { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, - { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, - { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "chardev", "append", QEMU_CAPS_CHARDEV_FILE_APPEND }, - { "spice", "gl", QEMU_CAPS_SPICE_GL }, { "chardev", "logfile", QEMU_CAPS_CHARDEV_LOGFILE }, - { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS }, - { "name", "guest", QEMU_CAPS_NAME_GUEST }, - { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, + { "chardev", "reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, + { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS }, + { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, + { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, + { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, { "drive", "throttling.bps-total-max-length", QEMU_CAPS_DRIVE_IOTUNE_M= AX_LENGTH }, { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP }, - { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, + { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, + { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also c= hecked fsdev->dmode */ + { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, + { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, + { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, + { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP }, { "machine", "loadparm", QEMU_CAPS_LOADPARM }, - { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS }, - { "chardev", "reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, + { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, + { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS }, + { "name", "guest", QEMU_CAPS_NAME_GUEST }, + { "numa", NULL, QEMU_CAPS_NUMA }, + { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX }, { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST }, - { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS }, - { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "smp-opts", "dies", QEMU_CAPS_SMP_DIES }, - { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, - { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, - { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also c= hecked fsdev->dmode */ + { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABL= E }, + { "spice", "gl", QEMU_CAPS_SPICE_GL }, + { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, + { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, + { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS }, { "vnc", "display", QEMU_CAPS_VNC_OPTS }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, --=20 2.31.1