Compare commits

..

3 Commits
v7.17 ... v7.20

Author SHA1 Message Date
Kroese
43ffa18a5f fix: Remove scsi parameter from virtio-blk-pci (#824) 2024-10-01 21:49:31 +02:00
Kroese
b131a32d0c buid: Pin Debian version (#818) 2024-09-27 14:40:56 +02:00
D-Jy
c81787b837 feat: Allow custom rendernode (#817) 2024-09-17 23:30:58 +02:00
3 changed files with 14 additions and 9 deletions

View File

@@ -7,7 +7,7 @@ FROM qemux/qemu-host:2.05 AS builder
# RUN go mod download # RUN go mod download
# RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /qemu-host.bin . # RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /qemu-host.bin .
FROM debian:trixie-slim FROM debian:trixie-20240926-slim
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG VERSION_ARG="0.0" ARG VERSION_ARG="0.0"

View File

@@ -385,7 +385,7 @@ createDevice () {
;; ;;
"blk" | "virtio-blk" ) "blk" | "virtio-blk" )
result+=",if=none \ result+=",if=none \
-device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}" -device virtio-blk-pci,drive=${DISK_ID},bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}"
echo "$result" echo "$result"
;; ;;
"scsi" | "virtio-scsi" ) "scsi" | "virtio-scsi" )

View File

@@ -6,6 +6,7 @@ set -Eeuo pipefail
: "${GPU:="N"}" # GPU passthrough : "${GPU:="N"}" # GPU passthrough
: "${VGA:="virtio"}" # VGA adaptor : "${VGA:="virtio"}" # VGA adaptor
: "${DISPLAY:="none"}" # Display type : "${DISPLAY:="none"}" # Display type
: "${RENDERNODE:="/dev/dri/renderD128"}" # Render node
if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
@@ -15,20 +16,24 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
fi fi
DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128" DISPLAY_OPTS="-display egl-headless,rendernode=$RENDERNODE"
DISPLAY_OPTS+=" -vga $VGA" DISPLAY_OPTS+=" -vga $VGA"
[ ! -d /dev/dri ] && mkdir -m 755 /dev/dri [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri
if [ ! -c /dev/dri/card0 ]; then # Extract the card number from the render node
if mknod /dev/dri/card0 c 226 0; then CARD_NUMBER=$(echo "$RENDERNODE" | grep -oP '(?<=renderD)\d+')
chmod 666 /dev/dri/card0 CARD_DEVICE="/dev/dri/card$((CARD_NUMBER - 128))"
if [ ! -c "$CARD_DEVICE" ]; then
if mknod "$CARD_DEVICE" c 226 $((CARD_NUMBER - 128)); then
chmod 666 "$CARD_DEVICE"
fi fi
fi fi
if [ ! -c /dev/dri/renderD128 ]; then if [ ! -c "$RENDERNODE" ]; then
if mknod /dev/dri/renderD128 c 226 128; then if mknod "$RENDERNODE" c 226 "$CARD_NUMBER"; then
chmod 666 /dev/dri/renderD128 chmod 666 "$RENDERNODE"
fi fi
fi fi