From nobody Fri Apr 26 15:19:26 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568107184; cv=none; d=zoho.com; s=zohoarc; b=YdK9c/mPtfWFVJkS23L8Ot7T0sUq5s78K7MSUezasSDCULeoJUUC/fT3/i8X/8cmbFY8226Xq/ihRvpYPY+Gvq6z6JP26B777kUG04ZhpHnVffR7Jqmoxcp3pYrWAZzOuFgzrM13Xh6pAffSowV7Opkt+YPQVc4dSyiiOiINAs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568107184; 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:ARC-Authentication-Results; bh=KCyZBQU8rLMEYjqtaXR80RyktPkTCdKhcmC4b0p+GgQ=; b=aiFWeg3pyqu9QesfZ0F0KNDpJrEYSY3TPQ6A1sIOCDvYx4DbvHrioK5HUiOF8Vc4qakKatqho+v8uvmFSLbjxeQ+NflN851XUWlB34vFGVDv0qv5df+07+iP+fT+2/RjLJVZLEq0RjvhqVKSeg5bnWr4UWfSXtC8IHw0k2uyObk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1568107184755621.4756919811293; Tue, 10 Sep 2019 02:19:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D018A3767A; Tue, 10 Sep 2019 09:19:43 +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 7912760166; Tue, 10 Sep 2019 09:19:42 +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 09249180BA98; Tue, 10 Sep 2019 09:19:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8A9I6F8025646 for ; Tue, 10 Sep 2019 05:18:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id D09246092F; Tue, 10 Sep 2019 09:18:06 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 590376061E for ; Tue, 10 Sep 2019 09:18:06 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 10 Sep 2019 11:17:59 +0200 Message-Id: <4c4a21a9cc635f4bb4c823697fa461eb0f9c21a4.1568107000.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/2] qemu: Enable slirp-helper iff dbus-vmstate present 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-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 10 Sep 2019 09:19:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The fact that qemu is capable -netdev socket is not enough to start a migratable domain. It also needs dbus-vmstate capability. Since there are already some qemu releases which have net-socket-dgram capability and don't have dbus-vmstate we need to check for dbus-vmstate. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 2 +- tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvtest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bd8868b0f7..c31b2928e4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1329,7 +1329,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, =20 case VIR_DOMAIN_NET_TYPE_USER: if (!priv->disableSlirp && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NET_SOCKET_DGRAM)) { + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { qemuSlirpPtr slirp =3D qemuInterfacePrepareSlirp(driver, net); =20 if (!slirp) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 955ba4de4c..0b2afe6841 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5756,7 +5756,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, goto cleanup; } else if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_USER && !priv->disableSlirp && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NET_SOCKET_DGR= AM)) { + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE))= { qemuSlirpPtr slirp =3D qemuInterfacePrepareSlirp(driver, net); =20 QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp =3D slirp; diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemu= xml2argvdata/net-user.x86_64-4.0.0.args index d51653dcdd..3fb745c212 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args @@ -29,7 +29,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 \ --netdev socket,fd=3D42,id=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1f2ae5958a..0773455b98 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -533,7 +533,7 @@ testCompareXMLToArgv(const void *data) virDomainNetDefPtr net =3D vm->def->nets[i]; =20 if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_USER && - virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_NET_SOCKET_DGRAM)= ) { + virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { qemuSlirpPtr slirp =3D qemuSlirpNew(); slirp->fd[0] =3D 42; QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp =3D slirp; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 15:19:26 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568107189; cv=none; d=zoho.com; s=zohoarc; b=Rt1pLVX9L90DVkkcVdoDZOC3T37KisbJvyZv5qmmvWnCxfqKbyr2tG6FWw8lYbfUewqkdDBTtwb2LXW/KKApWQvNM8x1pVXlXI1mlvtAW1v7RklpZ8Qt4cTdOzXB/6afKLmjYOHTK4QReuq5PCRLi7KeP4dmiUGMCYaGISj9N+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568107189; 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:ARC-Authentication-Results; bh=PpoOiVayO2lU99wC4tmTbfU9oFducnDmfA1jF68noP8=; b=Xy1pTp8dnN3kr+a3MY/TS1Y0Lzt1J0hGeCmEs59wu0CyTfBXeoAgwhfigRonGWOAR8y4ucNM8VaPVTzj8J4nRBdxCPTchOLlbWNYxo/cemTn0pJNGlyPam4p+Z5NQ3eccC5jyKRCzJ5C9i3HSf6yrok1ZQchHlKRrWRdKmuGJZI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1568107189609929.3823615461182; Tue, 10 Sep 2019 02:19:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 521A3305FD51; Tue, 10 Sep 2019 09:19:47 +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 273CC60A35; Tue, 10 Sep 2019 09:19:47 +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 E34BC2551D; Tue, 10 Sep 2019 09:19:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8A9I7pb025656 for ; Tue, 10 Sep 2019 05:18:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E10D6061E; Tue, 10 Sep 2019 09:18:07 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27C4B6092F for ; Tue, 10 Sep 2019 09:18:06 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 10 Sep 2019 11:18:00 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/2] Revert "qemu: add socket datagram capability" 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-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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 10 Sep 2019 09:19:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This reverts commit 0cebb6422a63f5a8289ae43a36f8f33eb9956a4c. This capability is not used anywhere and also it is not contained in any release so it's safe to just remove it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 5 ----- src/qemu/qemu_capabilities.h | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - 9 files changed, 13 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 136999ad0d..94a8e581df 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -537,7 +537,6 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 335 */ "bochs-display", "migration-file-drop-cache", - "net-socket-dgram", "dbus-vmstate", ); =20 @@ -4394,10 +4393,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCap= s) ARCH_IS_PPC64(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT); } - - /* -net socket,fd=3D with dgram socket (for ex, with slirp helper) */ - if (qemuCaps->version >=3D 4000000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NET_SOCKET_DGRAM); } =20 =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 54f91151c6..fe80fb5391 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -518,7 +518,6 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 335 */ QEMU_CAPS_DEVICE_BOCHS_DISPLAY, /* -device bochs-display */ QEMU_CAPS_MIGRATION_FILE_DROP_CACHE, /* migration with disk cache on i= s safe for type=3D'file' disks */ - QEMU_CAPS_NET_SOCKET_DGRAM, /* -net socket,fd=3D with dgram socket */ QEMU_CAPS_DBUS_VMSTATE, /* -object dbus-vmstate */ =20 QEMU_CAPS_LAST /* this must always be the last item */ diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 1627b2cb5e..20f119665b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -165,7 +165,6 @@ - 4000000 0 61700758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 73859becab..9ea6f4d046 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -170,7 +170,6 @@ - 4000000 0 42900758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index ab6a774c3f..7503c2dbcd 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -168,7 +168,6 @@ - 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index f731e7b4fa..4a94179ee7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -168,7 +168,6 @@ - 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 6cad000a11..ef802f3d1f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -132,7 +132,6 @@ - 4000000 0 39100758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 79593c467a..87c95f4d18 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -207,7 +207,6 @@ - 4000000 0 43100758 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 05e6538e37..f4583d7fe7 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -209,7 +209,6 @@ - 4000050 0 43100759 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list