From nobody Thu Apr 25 23:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1557818959; cv=none; d=zoho.com; s=zohoarc; b=KjDX3B7Bg0onLl8yZhDjhCUJb41e7IJ9CKGLKjHICQRRChZGItVZ+O3ELtITlMrnHVpZMr9Zmi5VyAPVc7iMf1tySUmJ6OlaG9bbI2Q7Y8r5XP58KCjjjZICU2hXcoX3rYzJpU5L9AoFwNF/mwzg3SRdZBtXVL2k2f2XP0MQb0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557818959; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=jW6lVWQANGdywtuNAFBWohFuEsSg39Rn/G3pzQQpzPM=; b=JvC8QrwQ5KmiGN9KWSf0/RBxNDn2/WzYCMpuvshstzzLHI3H0u77iYTO2lenuSf+Ku/pJ34mBQb+guvO3VhIqaSF3waf5zr25DUnwhNWx+T3p5SxIceN00cKOakWEY4qdtGyYsg4WM5Et+J4IlLWluuE1ajigac+jEMx7flBcxA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1557818958292945.4123692549882; Tue, 14 May 2019 00:29:18 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQRqu-00054Y-5o; Tue, 14 May 2019 07:27:56 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQRqt-00054T-25 for xen-devel@lists.xenproject.org; Tue, 14 May 2019 07:27:55 +0000 Received: from mo6-p00-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5300::1]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id c8789d40-7619-11e9-8980-bc764e045a96; Tue, 14 May 2019 07:27:53 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 44.20 DYNA|AUTH) with ESMTPSA id U080cav4E7Rh4AY (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Tue, 14 May 2019 09:27:43 +0200 (CEST) X-Inumbo-ID: c8789d40-7619-11e9-8980-bc764e045a96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1557818871; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=Z+/W6qAnPWdbvmNiT7UZIi6BFUT8XPMx97FjAvRopH8=; b=Z2K0OHAhTHk0skLTsGnRT3scj2NnIz7AFu1MyP/b8z3z3AHF+B10sIKbAQ5tarNtFG TpaUhCRH7lAWWLIsyKwtThaMvFGsOAFYDKun/jTjzE+uML9JLaeXb3PEnsRB+xfd4bTY nOq8iMnNmn2n+zEoNl7IcVbIxT7c65XA2fm+kEpM3A+vMh+V7dHlDUB1RrTKFPLtwrlU Vaw+mltYKJG0FbSMA76pxNOjXihTF7tHm2D78F55wt6qCDSnGeBi/np/2euPNXseg6k4 QKqDR3Dq8UYyOJlhZ3sJRnsRsbU5jlRYeYmJglpso42APNcHLAhA6Im/zC37FWAZmhdW AffQ== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS3GpFjw==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Tue, 14 May 2019 09:27:41 +0200 Message-Id: <20190514072741.11760-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v1] libxl: add helper function to set device_model_version X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Olaf Hering , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) An upcoming change will set the value of device_model_version properly also for the non-HVM case. Move existing code to new function libxl__domain_set_device_model. Move also initialization for device_model_stubdomain to that function. Make sure libxl__domain_build_info_setdefault is called with device_model_version set. Update libxl__spawn_stub_dm() and initiate_domain_create() to call the new function prior libxl__domain_build_info_setdefault() because device_mode_version is expected to be initialzed. libxl_domain_need_memory() needs no update because it does not have a d_config available anyway, and the callers provide a populated b_info. Signed-off-by: Olaf Hering Acked-by: Wei Liu Reviewed-by: Roger Pau Monn=C3=A9 --- tools/libxl/libxl_create.c | 90 +++++++++++++++++++++++++++-------------= ---- tools/libxl/libxl_dm.c | 2 + tools/libxl/libxl_internal.h | 2 + 3 files changed, 59 insertions(+), 35 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 89fe80fc9c..3f0431cc84 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -27,6 +27,53 @@ =20 #include =20 +int libxl__domain_set_device_model(libxl__gc *gc, libxl_domain_config *d_c= onfig) +{ + libxl_domain_build_info *b_info =3D &d_config->b_info; + int ret; + + libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + + if (b_info->device_model_version) + return 0; + + switch (b_info->type) { + case LIBXL_DOMAIN_TYPE_HVM: + if (libxl_defbool_val(b_info->device_model_stubdomain)) { + b_info->device_model_version =3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + b_info->device_model_version =3D libxl__default_device_model(g= c); + } + break; + default: + b_info->device_model_version =3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + break; + } + + if (b_info->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEM= U_XEN) { + const char *dm; + + dm =3D libxl__domain_device_model(gc, b_info); + ret =3D access(dm, X_OK); + if (ret < 0) { + /* qemu-xen unavailable, use qemu-xen-traditional */ + if (errno =3D=3D ENOENT) { + LOGE(INFO, "qemu-xen is unavailable" + ", using qemu-xen-traditional instead"); + b_info->device_model_version =3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + LOGE(ERROR, "qemu-xen access error"); + return ERROR_FAIL; + } + } + } + + return 0; +} + int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_domain_create_info *c_info) { @@ -73,6 +120,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, return ERROR_INVAL; } =20 + assert(b_info->device_model_version); + /* Copy deprecated options to it's new position. */ rc =3D libxl__domain_build_info_copy_deprecated(CTX, b_info); if (rc) { @@ -80,45 +129,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, return rc; } =20 - libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); - if (libxl_defbool_val(b_info->device_model_stubdomain) && !b_info->device_model_ssidref) b_info->device_model_ssidref =3D SECINITSID_DOMDM; =20 - if (!b_info->device_model_version) { - if (b_info->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - if (libxl_defbool_val(b_info->device_model_stubdomain)) { - b_info->device_model_version =3D - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - b_info->device_model_version =3D libxl__default_device_mod= el(gc); - } - } else { - b_info->device_model_version =3D - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - } - if (b_info->device_model_version - =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - const char *dm; - - dm =3D libxl__domain_device_model(gc, b_info); - rc =3D access(dm, X_OK); - if (rc < 0) { - /* qemu-xen unavailable, use qemu-xen-traditional */ - if (errno =3D=3D ENOENT) { - LOGE(INFO, "qemu-xen is unavailable" - ", using qemu-xen-traditional instead"); - b_info->device_model_version =3D - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - LOGE(ERROR, "qemu-xen access error"); - return ERROR_FAIL; - } - } - } - } - if (b_info->blkdev_start =3D=3D NULL) b_info->blkdev_start =3D libxl__strdup(NOGC, "xvda"); =20 @@ -938,6 +952,12 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } =20 + ret =3D libxl__domain_set_device_model(gc, d_config); + if (ret) { + LOGD(ERROR, domid, "Unable to set domain device model"); + goto error_out; + } + ret =3D libxl__domain_create_info_setdefault(gc, &d_config->c_info); if (ret) { LOGD(ERROR, domid, "Unable to set domain create info defaults"); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 2f19786bdd..086e566311 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2168,6 +2168,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stu= b_dm_spawn_state *sdss) dm_config->c_info.run_hotplug_scripts =3D guest_config->c_info.run_hotplug_scripts; =20 + ret =3D libxl__domain_set_device_model(gc, dm_config); + if (ret) goto out; ret =3D libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; ret =3D libxl__domain_build_info_setdefault(gc, &dm_config->b_info); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 44e0221284..25f113404b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1374,6 +1374,8 @@ _hidden int libxl__device_nextid(libxl__gc *gc, uint3= 2_t domid, _hidden int libxl__resolve_domid(libxl__gc *gc, const char *name, uint32_t *domid); =20 +_hidden int libxl__domain_set_device_model(libxl__gc *gc, + libxl_domain_config *d_config); /* * For each aggregate type which can be used as an input we provide: * _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel