From nobody Mon Feb 9 19:30:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1633621394; cv=none; d=zohomail.com; s=zohoarc; b=AREeiTsLU3owKhimEquxgrzd+8UAMg9c2H1gEl/OL8DMqaCv908x20pwiPmmh+Owoxe4V4xRvdINkfw4ihNNDRlY5Ew9W2B6tCBgflUYapLcddUx1LQNamNPaBs06fSBw+UnitF3S+PFvJ3/VdT4rWV3YzPLk9GGoomwZZ6b4NU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633621394; 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=TXflecpvp8+umzjGv/+LRrI0Sl35GHLWbWjtwpab0Ew=; b=X63JgBOCGf1bMNwfYBVAQRZfMWRJ9gMxX9V6Va4Qrciv+LamSG6b5D6tcx6NBzLRBFv3Q3EafbhROcjzqCQPS3PnQXT73rx7pWsU6uL6bcM9n/x8zvH+gtGV9LbnTYGMt0AAIcJE/6SxYRigXteTv3jOTvTQi/FIKPO+xYlFY88= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1633621394117240.3107640162341; Thu, 7 Oct 2021 08:43:14 -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-438-ZfdqCrzEOXeAa2GF6jFJYA-1; Thu, 07 Oct 2021 11:43:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93731192BF54; Thu, 7 Oct 2021 15:32:58 +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 616C712FCC4D; Thu, 7 Oct 2021 15:32:58 +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 2ABEC1806D04; Thu, 7 Oct 2021 15:32:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FLDZh024547 for ; Thu, 7 Oct 2021 11:21:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id ABD805F4EE; Thu, 7 Oct 2021 15:21:13 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A2505F4E8 for ; Thu, 7 Oct 2021 15:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633621393; 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=TXflecpvp8+umzjGv/+LRrI0Sl35GHLWbWjtwpab0Ew=; b=D0jE8dqOcmyd5iRQtzXC/9xr/jk6FHDvuQCljmlyolo1oF+Y9bQ6xwEPZWtw5+UohIOyOz rSACSJ6g6K8iCcAaZD6c/pGDZg+ttcLzsc3wFr5/+Zwhj4asyM76J5NgNb3iz50Pwm+HFp 5h63EOJ8q7YVqR/E5C63XDpp+NX/Rgs= X-MC-Unique: ZfdqCrzEOXeAa2GF6jFJYA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 091/103] qemuBuildChrDeviceCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:18:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.22 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: 1633621396044100001 Content-Type: text/plain; charset="utf-8" Build commandlines for character devices via JSON. For devices using 'VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL' address type 'qemuBuildDeviceAddressProps' will now generate the address. The only special property is 'nr'. QEMU declares it as: nr=3D - (default: 4294967295) The test fallout is caused by formatting addresses as decimal numbers instead of hex as described in the commit which added 'qemuBuildDeviceAddressProps'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 224 ++++++++++-------- src/qemu/qemu_command.h | 10 +- src/qemu/qemu_hotplug.c | 8 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- .../pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- .../pseries-panic-missing.args | 2 +- .../pseries-panic-no-address.args | 2 +- .../pseries-serial-native.args | 2 +- .../qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- .../pseries-vio-user-assigned.args | 4 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- .../qemuxml2argvdata/s390-panic-missing.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../tpm-emulator-spapr.ppc64-latest.args | 4 +- 27 files changed, 163 insertions(+), 133 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 81b1eb5980..954513ce83 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -745,8 +745,27 @@ qemuBuildDeviceAddressProps(virJSONValue *props, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: return qemuBuildDeviceAddresDriveProps(props, domainDef, info); + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: { + const char *contAlias; + g_autofree char *bus =3D NULL; + + if (!(contAlias =3D virDomainControllerAliasFind(domainDef, + VIR_DOMAIN_CONTROLL= ER_TYPE_VIRTIO_SERIAL, + info->addr.vioseria= l.controller))) + return -1; + + bus =3D g_strdup_printf("%s.%d", contAlias, info->addr.vioserial.b= us); + + if (virJSONValueObjectAdd(props, + "s:bus", bus, + "i:nr", info->addr.vioserial.port, + NULL) < 0) + return -1; + + return 0; + } + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: @@ -5658,19 +5677,21 @@ qemuBuildMonitorCommandLine(virLogManager *logManag= er, } -static char * -qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, - virDomainChrDef *dev) +static virJSONValue * +qemuBuildVirtioSerialPortDevProps(const virDomainDef *def, + virDomainChrDef *dev) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - const char *contAlias; + g_autoptr(virJSONValue) props =3D NULL; + const char *driver; + const char *targetname =3D NULL; + g_autofree char *chardev =3D NULL; switch (dev->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: - virBufferAddLit(&buf, "virtconsole"); + driver =3D "virtconsole"; break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - virBufferAddLit(&buf, "virtserialport"); + driver =3D "virtserialport"; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -5687,14 +5708,6 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *= def, return NULL; } - contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROL= LER_TYPE_VIRTIO_SERIAL, - dev->info.addr.vioserial.= controller); - if (!contAlias) - return NULL; - - virBufferAsprintf(&buf, ",bus=3D%s.%d,nr=3D%d", contAlias, - dev->info.addr.vioserial.bus, - dev->info.addr.vioserial.port); } if (dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && @@ -5707,29 +5720,50 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef = *def, return NULL; } - virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", - dev->info.alias, dev->info.alias); + if (virJSONValueObjectCreate(&props, + "s:driver", driver, + NULL) < 0) + return NULL; + + if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) + return NULL; + + chardev =3D g_strdup_printf("char%s", dev->info.alias); + if (dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && (dev->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEVMC || dev->target.name)) { - virBufferAsprintf(&buf, ",name=3D%s", dev->target.name - ? dev->target.name : "com.redhat.spice.0"); + if (dev->target.name) + targetname =3D dev->target.name; + else + targetname =3D "com.redhat.spice.0"; } - return virBufferContentAndReset(&buf); + if (virJSONValueObjectAdd(props, + "s:chardev", chardev, + "s:id", dev->info.alias, + "S:name", targetname, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); } -static char * -qemuBuildSclpDevStr(virDomainChrDef *dev) + +static virJSONValue * +qemuBuildSclpDevProps(virDomainChrDef *dev) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *chardev =3D g_strdup_printf("char%s", dev->info.alias= ); + const char *driver =3D NULL; + if (dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE) { switch (dev->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: - virBufferAddLit(&buf, "sclpconsole"); + driver =3D "sclpconsole"; break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: - virBufferAddLit(&buf, "sclplmconsole"); + driver =3D "sclplmconsole"; break; } } else { @@ -5737,10 +5771,15 @@ qemuBuildSclpDevStr(virDomainChrDef *dev) _("Cannot use slcp with devices other than console"= )); return NULL; } - virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", - dev->info.alias, dev->info.alias); - return virBufferContentAndReset(&buf); + if (virJSONValueObjectCreate(&props, + "s:driver", driver, + "s:chardev", chardev, + "s:id", dev->info.alias, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); } @@ -9460,12 +9499,14 @@ qemuBuildChrDeviceCommandLine(virCommand *cmd, virDomainChrDef *chr, virQEMUCaps *qemuCaps) { - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) props =3D NULL; - if (qemuBuildChrDeviceStr(&devstr, def, chr, qemuCaps) < 0) + if (!(props =3D qemuBuildChrDeviceProps(def, chr, qemuCaps))) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) return -1; - virCommandAddArgList(cmd, "-device", devstr, NULL); return 0; } @@ -10914,16 +10955,13 @@ qemuBuildCommandLine(virQEMUDriver *driver, } -/* This function generates the correct '-device' string for character - * devices of each architecture. - */ -static int -qemuBuildSerialChrDeviceStr(char **deviceStr, - const virDomainDef *def, - virDomainChrDef *serial, - virQEMUCaps *qemuCaps) +static virJSONValue * +qemuBuildSerialChrDeviceProps(const virDomainDef *def, + virDomainChrDef *serial, + virQEMUCaps *qemuCaps) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *chardev =3D g_strdup_printf("char%s", serial->info.al= ias); virQEMUCapsFlags caps; switch ((virDomainChrSerialTargetModel) serial->targetModel) { @@ -10940,7 +10978,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("'%s' is not supported in this QEMU binary"), virDomainChrSerialTargetModelTypeToString(seria= l->targetModel)); - return -1; + return NULL; } break; @@ -10954,27 +10992,37 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, * branch and we will not have ended up here. */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid target model for serial device")); - return -1; + return NULL; } - virBufferAsprintf(&buf, "%s,chardev=3Dchar%s,id=3D%s", - virDomainChrSerialTargetModelTypeToString(serial->ta= rgetModel), - serial->info.alias, serial->info.alias); + if (virJSONValueObjectCreate(&props, + "s:driver", virDomainChrSerialTargetModel= TypeToString(serial->targetModel), + "s:chardev", chardev, + "s:id", serial->info.alias, + NULL) < 0) + return NULL; - if (qemuBuildDeviceAddressStr(&buf, def, &serial->info) < 0) - return -1; + if (qemuBuildDeviceAddressProps(props, def, &serial->info) < 0) + return NULL; - *deviceStr =3D virBufferContentAndReset(&buf); - return 0; + return g_steal_pointer(&props); } -static int -qemuBuildParallelChrDeviceStr(char **deviceStr, - virDomainChrDef *chr) + +static virJSONValue * +qemuBuildParallelChrDeviceProps(virDomainChrDef *chr) { - *deviceStr =3D g_strdup_printf("isa-parallel,chardev=3Dchar%s,id=3D%s", - chr->info.alias, chr->info.alias); - return 0; + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *chardev =3D g_strdup_printf("char%s", chr->info.alias= ); + + if (virJSONValueObjectCreate(&props, + "s:driver", "isa-parallel", + "s:chardev", chardev, + "s:id", chr->info.alias, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); } @@ -11013,48 +11061,38 @@ qemuBuildChannelGuestfwdNetdevProps(virDomainChrD= ef *chr) } -static int -qemuBuildChannelChrDeviceStr(char **deviceStr, - const virDomainDef *def, - virDomainChrDef *chr) +static virJSONValue * +qemuBuildChannelChrDeviceProps(const virDomainDef *def, + virDomainChrDef *chr) { switch ((virDomainChrChannelTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) - return -1; - break; + return qemuBuildVirtioSerialPortDevProps(def, chr); case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: /* guestfwd is as a netdev handled separately */ case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST: - return -1; + break; } - return 0; + return NULL; } -static int -qemuBuildConsoleChrDeviceStr(char **deviceStr, - const virDomainDef *def, - virDomainChrDef *chr) +static virJSONValue * +qemuBuildConsoleChrDeviceProps(const virDomainDef *def, + virDomainChrDef *chr) { switch ((virDomainChrConsoleTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: - if (!(*deviceStr =3D qemuBuildSclpDevStr(chr))) - return -1; - break; + return qemuBuildSclpDevProps(chr); case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) - return -1; - break; + return qemuBuildVirtioSerialPortDevProps(def, chr); case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: - break; - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML: @@ -11064,42 +11102,36 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported console target type %s"), NULLSTR(virDomainChrConsoleTargetTypeToString(chr->= targetType))); - return -1; + break; } - return 0; + return NULL; } -int -qemuBuildChrDeviceStr(char **deviceStr, - const virDomainDef *vmdef, - virDomainChrDef *chr, - virQEMUCaps *qemuCaps) -{ - int ret =3D -1; +virJSONValue * +qemuBuildChrDeviceProps(const virDomainDef *vmdef, + virDomainChrDef *chr, + virQEMUCaps *qemuCaps) +{ switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: - ret =3D qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCap= s); - break; + return qemuBuildSerialChrDeviceProps(vmdef, chr, qemuCaps); case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: - ret =3D qemuBuildParallelChrDeviceStr(deviceStr, chr); - break; + return qemuBuildParallelChrDeviceProps(chr); case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - ret =3D qemuBuildChannelChrDeviceStr(deviceStr, vmdef, chr); - break; + return qemuBuildChannelChrDeviceProps(vmdef, chr); case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: - ret =3D qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr); - break; + return qemuBuildConsoleChrDeviceProps(vmdef, chr); case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: - return ret; + break; } - return ret; + return NULL; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index cf57fc9a41..65e896b634 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -79,12 +79,10 @@ int qemuBuildTLSx509BackendProps(const char *tlspath, int qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) G_GNUC_NO_I= NLINE; -/* Generate '-device' string for chardev device */ -int -qemuBuildChrDeviceStr(char **deviceStr, - const virDomainDef *vmdef, - virDomainChrDef *chr, - virQEMUCaps *qemuCaps); +virJSONValue * +qemuBuildChrDeviceProps(const virDomainDef *vmdef, + virDomainChrDef *chr, + virQEMUCaps *qemuCaps); virJSONValue * qemuBuildChannelGuestfwdNetdevProps(virDomainChrDef *chr); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f55cedc784..c7da38b49b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2181,7 +2181,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; virErrorPtr orig_err; virDomainDef *vmdef =3D vm->def; - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) devprops =3D NULL; g_autoptr(virJSONValue) netdevprops =3D NULL; virDomainChrSourceDef *dev =3D chr->source; g_autofree char *charAlias =3D NULL; @@ -2224,7 +2224,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, if (!(netdevprops =3D qemuBuildChannelGuestfwdNetdevProps(chr))) goto cleanup; } else { - if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0) + if (!(devprops =3D qemuBuildChrDeviceProps(vmdef, chr, priv->qemuC= aps))) goto cleanup; } @@ -2251,8 +2251,8 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, goto exit_monitor; } - if (devstr) { - if (qemuMonitorAddDevice(priv->mon, devstr) < 0) + if (devprops) { + if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; } diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index dde5d44d45..8a6f0a94fb 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index a4aaea7571..2362c5a057 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index a8b22d3e48..ed62c92c12 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc= 64-latest.args index 576f97261b..5b9d07c46e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc= 64-latest.args index e3ca4a8465..7324e69410 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc= 64-latest.args index 1762e8f5f5..6591810bf8 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 2d3be80be3..61a9c458d4 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:a2:44:92= ,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index e46978c0d2..819ad483a4 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev id=3Daudio1,driver=3Dnone \ diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argv= data/pseries-basic.args index 241850399f..ebb289fe31 100644 --- a/tests/qemuxml2argvdata/pseries-basic.args +++ b/tests/qemuxml2argvdata/pseries-basic.args @@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args b/tests/= qemuxml2argvdata/pseries-cpu-compat-power9.args index 29dd9bc29e..abc3421565 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args @@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml= 2argvdata/pseries-cpu-compat.args index c54088c505..18dbc62dc5 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args @@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2= argvdata/pseries-cpu-exact.args index 1d11f5fa93..7ee7ee4b34 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args @@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2arg= vdata/pseries-cpu-le.args index 1247f3af8e..1325a0edd2 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/pseries-cpu-le.args @@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemu= xml2argvdata/pseries-panic-missing.args index 241850399f..ebb289fe31 100644 --- a/tests/qemuxml2argvdata/pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/pseries-panic-missing.args @@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/q= emuxml2argvdata/pseries-panic-no-address.args index 241850399f..ebb289fe31 100644 --- a/tests/qemuxml2argvdata/pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args @@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemu= xml2argvdata/pseries-serial-native.args index 9c2e3c156a..1c89689f9f 100644 --- a/tests/qemuxml2argvdata/pseries-serial-native.args +++ b/tests/qemuxml2argvdata/pseries-serial-native.args @@ -25,5 +25,5 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -boot strict=3Don \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxm= l2argvdata/pseries-usb-default.args index b3b57320c5..dadab3fe10 100644 --- a/tests/qemuxml2argvdata/pseries-usb-default.args +++ b/tests/qemuxml2argvdata/pseries-usb-default.args @@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2ar= gvdata/pseries-usb-kbd.args index 7e0623eef8..a650420cff 100644 --- a/tests/qemuxml2argvdata/pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args @@ -26,6 +26,6 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -device usb-kbd,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2= argvdata/pseries-usb-multi.args index 2d4ef84838..34651b8ec4 100644 --- a/tests/qemuxml2argvdata/pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/pseries-usb-multi.args @@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -device pci-ohci,id=3Dusb1,bus=3Dpci.0,addr=3D0x2 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/= qemuxml2argvdata/pseries-vio-user-assigned.args index dfc3ad0d1b..80ded18692 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args @@ -30,7 +30,7 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi1-0-= 0-0 \ -device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi1-0-0-0,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x20000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D536870912 \ -chardev pty,id=3Dcharserial1 \ --device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D0x30001000 \ +-device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvda= ta/pseries-vio.args index a8e18fae5a..e266d4c01b 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio.args @@ -30,7 +30,7 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi1-0-= 0-0 \ -device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi1-0-0-0,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev pty,id=3Dcharserial1 \ --device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D0x30001000 \ +-device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml= 2argvdata/s390-panic-missing.args index be0873ced9..a1c1731f0c 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.args @@ -26,6 +26,6 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0000 \ -chardev pty,id=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-device virtconsole,devno=3Dfe.0.0001,chardev=3Dcharconsole0,id=3Dconsole0= \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0002 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/= qemuxml2argvdata/serial-dev-chardev-iobase.args index ecaa342a26..27de77305e 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,iobase=3D0x3f8,irq= =3D0x4 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,iobase=3D1016,irq=3D= 4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 04d632c091..c8dc4c74fe 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -32,9 +32,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev pty,id=3Dcharserial1 \ --device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D0x30001000 \ +-device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device tpm-spapr,tpmdev=3Dtpm-tpm0,id=3Dtpm0,reg=3D0x00005000 \ --=20 2.31.1