scripts: Replace DISPLAY with GFX

The DISPLAY variable may interfere the X11 DISPLAY env.

Signed-off-by: Gary Lin <[email protected]>

Author: lcp

scripts/general.sh

@@ -31,14 +31,14 @@ CPU="-smp 4"
 
 # SPICE
 SPICE_PORT=5901
-DISPLAY="-vga qxl \
-	-spice port=${SPICE_PORT},addr=127.0.0.1,disable-ticketing=on"
+GFX="-vga qxl \
+     -spice port=${SPICE_PORT},addr=127.0.0.1,disable-ticketing=on"
 #  Set up vdagent for copy&paste between host and guest, dynamic resolution
 #  changes, etc.
-DISPLAY="${DISPLAY} \
-	-device virtio-serial \
-	-chardev spicevmc,id=vdagent,debug=0,name=vdagent \
-	-device virtserialport,chardev=vdagent,name=com.redhat.spice.0"
+GFX="${GFX} \
+     -device virtio-serial \
+     -chardev spicevmc,id=vdagent,debug=0,name=vdagent \
+     -device virtserialport,chardev=vdagent,name=com.redhat.spice.0"
 
 HDD_IMG="disk.img"
 
@@ -75,7 +75,7 @@ qemu-system-x86_64 $KVM \
 		   $UEFI_VARS \
 		   $CPU \
 		   $MACH \
-		   $DISPLAY \
+		   $GFX \
 		   $HARDDRIVE \
 		   $MEMORY \
 		   $TPM \

scripts/multipath.sh

@@ -29,14 +29,14 @@ CPU="-smp 4"
 
 # SPICE
 SPICE_PORT=5901
-DISPLAY="-vga qxl \
-	-spice port=${SPICE_PORT},addr=127.0.0.1,disable-ticketing=on"
+GFX="-vga qxl \
+     -spice port=${SPICE_PORT},addr=127.0.0.1,disable-ticketing=on"
 #  Set up vdagent for copy&paste between host and guest, dynamic resolution
 #  changes, etc.
-DISPLAY="${DISPLAY} \
-	-device virtio-serial \
-	-chardev spicevmc,id=vdagent,debug=0,name=vdagent \
-	-device virtserialport,chardev=vdagent,name=com.redhat.spice.0"
+GFX="${GFX} \
+     -device virtio-serial \
+     -chardev spicevmc,id=vdagent,debug=0,name=vdagent \
+     -device virtserialport,chardev=vdagent,name=com.redhat.spice.0"
 
 HDD_IMG="disk.img"
 MPIO_IMG="mpio.img"
@@ -80,7 +80,7 @@ qemu-system-x86_64 $KVM \
 		   $UEFI_VARS \
 		   $CPU \
 		   $MACH \
-		   $DISPLAY \
+		   $GFX \
 		   $HARDDRIVE \
 		   $MEMORY \
 		   $TPM \