From nobody Fri Dec 19 21:51:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744116160663730.3348446463367; Tue, 8 Apr 2025 05:42:40 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.942008.1341349 (Exim 4.92) (envelope-from ) id 1u28HI-0000vN-9p; Tue, 08 Apr 2025 12:42:08 +0000 Received: by outflank-mailman (output) from mailman id 942008.1341349; Tue, 08 Apr 2025 12:42:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u28HI-0000vG-6f; Tue, 08 Apr 2025 12:42:08 +0000 Received: by outflank-mailman (input) for mailman id 942008; Tue, 08 Apr 2025 12:42:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u28BK-0003x9-Gh for xen-devel@lists.xenproject.org; Tue, 08 Apr 2025 12:35:58 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 052cb0cf-1476-11f0-9eaa-5ba50f476ded; Tue, 08 Apr 2025 14:35:57 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5028B1F38E; Tue, 8 Apr 2025 12:35:57 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2D51413691; Tue, 8 Apr 2025 12:35:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4bypCS0Y9Wc9IgAAD6G6ig (envelope-from ); Tue, 08 Apr 2025 12:35:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 052cb0cf-1476-11f0-9eaa-5ba50f476ded Authentication-Results: smtp-out2.suse.de; none From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Samuel Thibault Subject: [PATCH v2 5/6] stubdom: remove ancient stubdom-dm script Date: Tue, 8 Apr 2025 14:35:23 +0200 Message-ID: <20250408123526.14613-6-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250408123526.14613-1-jgross@suse.com> References: <20250408123526.14613-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spam-Level: X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU] X-Spam-Score: -4.00 X-Spam-Flag: NO X-Rspamd-Queue-Id: 5028B1F38E X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-ZM-MESSAGEID: 1744116162079019000 Content-Type: text/plain; charset="utf-8" The stubdom-dm script is still using "xm" instead of "xl", so it is probably unused since more than 10 years now. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- stubdom/stubdom-dm | 182 --------------------------------------------- 1 file changed, 182 deletions(-) delete mode 100644 stubdom/stubdom-dm diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm deleted file mode 100644 index 05d07ac0d1..0000000000 --- a/stubdom/stubdom-dm +++ /dev/null @@ -1,182 +0,0 @@ -#!/bin/bash -# -# Copyright 2007-2008 Samuel Thibault -# -# dm script around stubdomains. -# - -DIR=3D`dirname $0` -. "${DIR}/stubdompath.sh" -stubdom_configdir=3D"${XEN_CONFIG_DIR}/stubdoms" - -# To fit xterms nicely -height=3D339 - -# Parse arguments - -domid=3D -domname=3D -vncviewer=3D0 -vncpid=3D -extra=3D -sdl=3D0 -opengl=3D1 -vnc=3D0 -vncunused=3D0 -while [ "$#" -gt 0 ]; -do - if [ "$#" -ge 2 ]; - then - case "$1" in - -d) - domid=3D$2; - extra=3D"$extra -d $domid"; - shift - ;; - -domain-name) - domname=3D$2; - shift - ;; - -vnc) - vnc=3D1 - op=3D${2%,*} - ip=3D${op%:*}; - vnc_port=3D${op#*:}; - shift - ;; - -vncunused) - vncunused=3D1 - shift - ;; - -loadvm) - extra=3D"$extra -loadvm $2"; - shift - ;; - -k) - keymap=3D$2 - shift - ;; - -serial) - serial=3D"$2" - shift - ;; - -monitor) - monitor=3D"$2" - shift - ;; - esac - fi - case "$1" in - -vncviewer) vncviewer=3D1 ;; - -sdl) sdl=3D1 ;; - -disable-opengl) opengl=3D0 ;; - esac - shift -done - -[ -z "$domid" ] && { echo "couldn't find domain ID" ; exit 1; } -[ -z "$domname" ] && { echo "couldn't find domain name" ; exit 1; } - -# Termination handler - -term() { - [ -n "$vncpid" ] && kill -9 $vncpid - rm -f /tmp/domname-dm - rm ${stubdom_configdir}/$domname-dm - exit 0 -} - -trap term SIGHUP - -############ -# stubdomain -# Wait for any previous stubdom to terminate -while xm list | grep -w $domname-dm -do - sleep 1 -done - -# Generate stubdom config file -mkdir -p ${stubdom_configdir} &>/dev/null -echo "#This file is autogenerated, edit $domname instead!" > ${stubdom_con= figdir}/$domname-dm -echo "kernel =3D '${XENFIRMWAREDIR}/ioemu-stubdom.gz'" >> ${stubdom_config= dir}/$domname-dm - -vfb=3D"sdl=3D$sdl, opengl=3D$opengl" -test "$DISPLAY" && vfb=3D"$vfb, display=3D$DISPLAY" -test "$XAUTHORITY" && vfb=3D"$vfb, xauthority=3D$XAUTHORITY" -test $vnc !=3D 0 && vfb=3D"$vfb, vnc=3D$vnc, vncdisplay=3D$vnc_port, vncli= sten=3D$ip, vncunused=3D$vncunused" -vncpasswd=3D`xenstore-read /local/domain/0/backend/vfb/$domid/0/vncpasswd = 2>/dev/null` -test "$vncpasswd" && vfb=3D"$vfb, vncpasswd=3D$vncpasswd" -test "$keymap" && vfb=3D"$vfb, keymap=3D$keymap" -test "$monitor" && vfb=3D"$vfb, monitor=3D$monitor" -test "$serial" && vfb=3D"$vfb, serial=3D$serial" -echo "vfb =3D ['$vfb']" >> ${stubdom_configdir}/$domname-dm - -echo -n "disk =3D [ " >> ${stubdom_configdir}/$domname-dm -j=3D0 -for i in `xenstore-ls /local/domain/$domid/device/vbd | grep 'backend =3D'= | awk '{print $3}'` -do - i=3D${i%\"} - i=3D${i#\"} - vbd_mode=3D`xenstore-read $i/mode` - vbd_disk=3D`xenstore-read $i/params` - vbd_type=3D`xenstore-read $i/type` - vbd_dev=3D`xenstore-read $i/dev` - vbd_front=3D`xenstore-read $i/frontend` - vbd_devtype=3D`xenstore-read $vbd_front/device-type` - if [ $j -ne 0 ] - then - echo -n "," >> ${stubdom_configdir}/$domname-dm - fi - echo -n "'$vbd_type:$vbd_disk,$vbd_dev:$vbd_devtype,$vbd_mode'" >> ${s= tubdom_configdir}/$domname-dm - j=3D$(( $j + 1 )) -done -echo " ] " >> ${stubdom_configdir}/$domname-dm -echo -n "vif =3D [ " >> ${stubdom_configdir}/$domname-dm -j=3D0 -for i in `xenstore-ls /local/domain/$domid/device/vif | grep 'backend =3D'= | awk '{print $3}'` -do - i=3D${i%\"} - i=3D${i#\"} - vif_mac=3D`xenstore-read $i/mac` - vif_bridge=3D`xenstore-read $i/bridge` - if [ $j -ne 0 ] - then - echo -n "," >> ${stubdom_configdir}/$domname-dm - fi - echo -n "'mac=3D$vif_mac" >> ${stubdom_configdir}/$domname-dm - if [ "$vif_bridge" ] - then - echo -n ",bridge=3D$vif_bridge'" >> ${stubdom_configdir}/$domname-= dm - else - echo -n "'" >> ${stubdom_configdir}/$domname-dm - fi - j=3D$(( $j + 1 )) -done -echo " ] " >> ${stubdom_configdir}/$domname-dm - -mkfifo /tmp/$domname-dm -xm create -c ${stubdom_configdir}/$domname-dm target=3D$domid memory=3D32 = extra=3D"$extra" < /tmp/$domname-dm & -exec 4>/tmp/$domname-dm - - -########### -# vncviewer -if [ "$vncviewer" =3D 1 ] -then - # Wait for vnc server to appear - while ! vnc_port=3D`xenstore-read /local/domain/$domid/console/vnc-por= t` - do - # Check that the stubdom job is still alive - kill -0 $consolepid || term - sleep 1 - done - - vncviewer $ip:$vnc_port & - vncpid=3D$! -fi - -# wait for SIGHUP or stubdom termination -wait - -term --=20 2.43.0