From nobody Wed May 14 12:41:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15224158044520.33254501245437496; Fri, 30 Mar 2018 06:16:44 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id AE6137D4F1; Fri, 30 Mar 2018 13:16:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76DCD17D57; Fri, 30 Mar 2018 13:16:39 +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 2212F4CAB4; Fri, 30 Mar 2018 13:16:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2UDGQUB010936 for ; Fri, 30 Mar 2018 09:16:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 983CD63537; Fri, 30 Mar 2018 13:16:26 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E65F6352D for ; Fri, 30 Mar 2018 13:16:26 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 30 Mar 2018 15:15:42 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 26/44] Deprecate QEMU_CAPS_DEVICE_SPICEVMC 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 30 Mar 2018 13:16:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The (now assumed) QEMU_CAPS_CHARDEV_SPICEVMC is preferred. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 4 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 71 ++++++++------------= ---- tests/qemuxml2argvdata/channel-spicevmc-old.args | 30 ---------- tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35 ------------ tests/qemuxml2argvtest.c | 4 -- 6 files changed, 25 insertions(+), 121 deletions(-) delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 97c8e0052..867088fcb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1024,7 +1024,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, - { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, @@ -2098,9 +2097,6 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, virStringListFreeCount(values, nvalues); } =20 - /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC); - return 0; } =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5068679a5..23db9796a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,7 +127,7 @@ typedef enum { /* 55 */ QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ + X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=3Dstring */ X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 019843036..4f3420e19 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5364,8 +5364,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManag= er, =20 static char * qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, - virDomainChrDefPtr dev, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr dev) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *contAlias; @@ -5375,13 +5374,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *= def, virBufferAddLit(&buf, "virtconsole"); break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - /* Legacy syntax '-device spicevmc' */ - if (dev->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEVMC && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC)) { - virBufferAddLit(&buf, "spicevmc"); - } else { - virBufferAddLit(&buf, "virtserialport"); - } + virBufferAddLit(&buf, "virtserialport"); break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -5419,19 +5412,13 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef = *def, goto error; } =20 - if (!(dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - dev->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEVMC && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC))) { - virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", - dev->info.alias, 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"); - } - } else { - virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); + virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", + dev->info.alias, 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 (virBufferCheckError(&buf) < 0) goto error; @@ -9152,23 +9139,15 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logMa= nager, break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC) && - channel->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEVMC)= { - /* spicevmc was originally introduced via a -device - * with a backend internal to qemu; although we prefer - * the newer -chardev interface. */ - ; - } else { - if (!(devstr =3D qemuBuildChrChardevStr(logManager, cmd, c= fg, def, - channel->source, - channel->info.alias, - qemuCaps, true, - chardevStdioLogd))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); - } + if (!(devstr =3D qemuBuildChrChardevStr(logManager, cmd, cfg, = def, + channel->source, + channel->info.alias, + qemuCaps, true, + chardevStdioLogd))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); =20 if (qemuBuildChrDeviceCommandLine(cmd, def, channel, qemuCaps)= < 0) return -1; @@ -10188,8 +10167,7 @@ qemuBuildParallelChrDeviceStr(char **deviceStr, static int qemuBuildChannelChrDeviceStr(char **deviceStr, const virDomainDef *def, - virDomainChrDefPtr chr, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr chr) { int ret =3D -1; char *addr =3D NULL; @@ -10210,7 +10188,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr, qem= uCaps))) + if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) goto cleanup; break; =20 @@ -10229,8 +10207,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, static int qemuBuildConsoleChrDeviceStr(char **deviceStr, const virDomainDef *def, - virDomainChrDefPtr chr, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr chr) { int ret =3D -1; =20 @@ -10242,7 +10219,7 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, break; =20 case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr, qem= uCaps))) + if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) goto cleanup; break; =20 @@ -10284,11 +10261,11 @@ qemuBuildChrDeviceStr(char **deviceStr, break; =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - ret =3D qemuBuildChannelChrDeviceStr(deviceStr, vmdef, chr, qemuCa= ps); + ret =3D qemuBuildChannelChrDeviceStr(deviceStr, vmdef, chr); break; =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: - ret =3D qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr, qemuCa= ps); + ret =3D qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr); break; =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: diff --git a/tests/qemuxml2argvdata/channel-spicevmc-old.args b/tests/qemux= ml2argvdata/channel-spicevmc-old.args deleted file mode 100644 index 852c8699e..000000000 --- a/tests/qemuxml2argvdata/channel-spicevmc-old.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-acpi \ --boot c \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device spicevmc,bus=3Dvirtio-serial1.0,nr=3D3,id=3Dchannel0 \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,\ -tls-channel=3Dmain \ --vga cirrus \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/channel-spicevmc-old.xml b/tests/qemuxm= l2argvdata/channel-spicevmc-old.xml deleted file mode 100644 index 95d0c2064..000000000 --- a/tests/qemuxml2argvdata/channel-spicevmc-old.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - -
- - - - -
- - - - - - -
- - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c96e91a3f..246ae669f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1295,10 +1295,6 @@ mymain(void) DO_TEST("channel-spicevmc", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("channel-spicevmc-old", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_SPICEVMC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("channel-virtio-default", QEMU_CAPS_SPICE, NONE); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list