From nobody Tue Feb 10 00:58:15 2026 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=1562569873; cv=none; d=zoho.com; s=zohoarc; b=HV3zCoyozw2hmMy1pwOZ0Rm+pqi4QFEi5Q91MGfwyIPO1Nk87/cfcj5N2BhsfZslG1/Dl31PTTeApagkj7uZbVZCIH37kldSdWWNUtjnepk8LSQaJjPqGLDxpoCx6xSvy1aYL9rx09waEVKzDhdxeCWEyJGNPeKRhXNDLJb4nt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562569873; h=Content-Type:Content-Transfer-Encoding:Cc: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=B7TN7cXD3FwWDCV8HUmFB98Pxmiy8x8kVjx0HIJJzPo=; b=g7feqfDhIO0VLwVGaaWSqvg8btQsmW/eN9p4a8ne9mJVB/fsbUbZiHrJYVmx92VVASelGm5gvjVz2uNCb9ROyBSBvX5jNIc1ZdwAuJy1YekZw9IDPJKLyykd2FC/edM7dAMiAGS3JMWzaNxTYhNkb419pKbRuTWAWfvsi//qG9o= 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 1562569873403427.274953820865; Mon, 8 Jul 2019 00:11:13 -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 DD24F3086217; Mon, 8 Jul 2019 07:11:11 +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 BA85DD1FC; Mon, 8 Jul 2019 07:11:11 +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 75FE1206D5; Mon, 8 Jul 2019 07:11:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x687BAEr007079 for ; Mon, 8 Jul 2019 03:11:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E0E92B9F7; Mon, 8 Jul 2019 07:11:10 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F51D53E0A; Mon, 8 Jul 2019 07:11:04 +0000 (UTC) From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Date: Mon, 8 Jul 2019 11:07:41 +0400 Message-Id: <20190708070747.1962-18-marcandre.lureau@redhat.com> In-Reply-To: <20190708070747.1962-1-marcandre.lureau@redhat.com> References: <20190708070747.1962-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [libvirt] [PATCH 17/23] qemu: add a flag to the cookie to prevent slirp-helper setup 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 08 Jul 2019 07:11:12 +0000 (UTC) From: Marc-Andr=C3=A9 Lureau For VM started and migrated/saved without slirp-helpers, let's prevent the automatic setup (as it would fail to migrate otherwise). Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_domain.c | 12 ++++++++++-- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 11 +++++++++-- src/qemu/qemu_process.c | 6 ++++-- src/qemu/qemu_process.h | 1 + 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bc34cdb3bf..bb719fc3c4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13962,7 +13962,7 @@ qemuDomainSaveCookieDispose(void *obj) =20 =20 qemuDomainSaveCookiePtr -qemuDomainSaveCookieNew(virDomainObjPtr vm ATTRIBUTE_UNUSED) +qemuDomainSaveCookieNew(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainSaveCookiePtr cookie =3D NULL; @@ -13976,7 +13976,10 @@ qemuDomainSaveCookieNew(virDomainObjPtr vm ATTRIBU= TE_UNUSED) if (priv->origCPU && !(cookie->cpu =3D virCPUDefCopy(vm->def->cpu))) goto error; =20 - VIR_DEBUG("Save cookie %p, cpu=3D%p", cookie, cookie->cpu); + cookie->hasSlirpHelper =3D qemuDomainHasSlirp(vm); + + VIR_DEBUG("Save cookie %p, cpu=3D%p, hasSlirpHelper=3D%d", + cookie, cookie->cpu, cookie->hasSlirpHelper); =20 return cookie; =20 @@ -14002,6 +14005,8 @@ qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt A= TTRIBUTE_UNUSED, &cookie->cpu) < 0) goto error; =20 + cookie->hasSlirpHelper =3D virXPathBoolean("boolean(./hasSlirpHelper)"= , ctxt) > 0; + *obj =3D (virObjectPtr) cookie; return 0; =20 @@ -14021,6 +14026,9 @@ qemuDomainSaveCookieFormat(virBufferPtr buf, virCPUDefFormatBufFull(buf, cookie->cpu, NULL) < 0) return -1; =20 + if (cookie->hasSlirpHelper) + virBufferAddLit(buf, "\n"); + return 0; } =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d35c800064..9a56a90a9a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -560,6 +560,7 @@ struct _qemuDomainSaveCookie { virObject parent; =20 virCPUDefPtr cpu; + bool hasSlirpHelper; }; =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9c05ab4ad1..dda9389776 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6788,6 +6788,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; + unsigned int flags; =20 if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie, virDomainXMLOptionGetSaveCookie(driver->x= mlopt)) < 0) @@ -6819,11 +6820,14 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, qemuDomainFixupCPUs(vm, &cookie->cpu) < 0) goto cleanup; =20 + flags =3D VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_GEN_V= MID; + if (!cookie->hasSlirpHelper) + flags |=3D VIR_QEMU_PROCESS_START_NO_SLIRP; + if (qemuProcessStart(conn, driver, vm, cookie ? cookie->cpu : NULL, asyncJob, "stdio", *fd, path, NULL, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, - VIR_QEMU_PROCESS_START_PAUSED | - VIR_QEMU_PROCESS_START_GEN_VMID) =3D=3D 0) + flags) =3D=3D 0) restored =3D true; =20 if (intermediatefd !=3D -1) { @@ -16298,6 +16302,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, =20 start_flags |=3D VIR_QEMU_PROCESS_START_PAUSED; =20 + if (!cookie->hasSlirpHelper) + start_flags |=3D VIR_QEMU_PROCESS_START_NO_SLIRP; + /* Transitions 2, 3, 5, 6, 8, 9 */ /* When using the loadvm monitor command, qemu does not know * whether to pause or run the reverted domain, and just stays diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5e8184b0e2..93e06104f4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6680,7 +6680,8 @@ qemuProcessLaunch(virConnectPtr conn, VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY | VIR_QEMU_PROCESS_START_NEW | - VIR_QEMU_PROCESS_START_GEN_VMID, -1); + VIR_QEMU_PROCESS_START_GEN_VMID | + VIR_QEMU_PROCESS_START_NO_SLIRP, -1); =20 cfg =3D virQEMUDriverGetConfig(driver); =20 @@ -7092,7 +7093,8 @@ qemuProcessStart(virConnectPtr conn, virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD | VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY | - VIR_QEMU_PROCESS_START_GEN_VMID, cleanup); + VIR_QEMU_PROCESS_START_GEN_VMID | + VIR_QEMU_PROCESS_START_NO_SLIRP, cleanup); =20 if (!migrateFrom && !snapshot) flags |=3D VIR_QEMU_PROCESS_START_NEW; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 1d62319092..09ef124838 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -81,6 +81,7 @@ typedef enum { VIR_QEMU_PROCESS_START_GEN_VMID =3D 1 << 5, /* Generate a new VMID= */ VIR_QEMU_PROCESS_START_STANDALONE =3D 1 << 6, /* Require CLI args to= be usable standalone, ie no FD passing and = the like */ + VIR_QEMU_PROCESS_START_NO_SLIRP =3D 1 << 7, /* do not setup slirp-= helpers */ } qemuProcessStartFlags; =20 int qemuProcessStart(virConnectPtr conn, --=20 2.22.0.214.g8dca754b1e -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list