Implement VirtIO GPU and input devices

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
       run: |
             brew install make dtc expect e2fsprogs
     - name: default build
-      run: make
+      run: make ENABLE_SDL=0
       shell: bash
     - name: automated test
       run: .ci/autorun.sh

Makefile

@@ -3,6 +3,7 @@ include mk/common.mk
 CC ?= gcc
 CFLAGS := -O2 -g -Wall -Wextra
 CFLAGS += -include common.h
+LDFLAGS :=
 
 # clock frequency
 CLOCK_FREQ ?= 65000000
@@ -13,6 +14,8 @@ OBJS_EXTRA :=
 # command line option
 OPTS :=
 
+LDFLAGS += -lpthread
+
 # virtio-blk
 ENABLE_VIRTIOBLK ?= 1
 $(call set-feature, VIRTIOBLK)
@@ -31,6 +34,13 @@ ifeq ($(call has, VIRTIOBLK), 1)
     endif
 endif
 
+# virtio-rng
+ENABLE_VIRTIORNG ?= 1
+$(call set-feature, VIRTIORNG)
+ifeq ($(call has, VIRTIORNG), 1)
+    OBJS_EXTRA += virtio-rng.o
+endif
+
 NETDEV ?= tap
 # virtio-net
 ENABLE_VIRTIONET ?= 1
@@ -43,6 +53,52 @@ ifeq ($(call has, VIRTIONET), 1)
     OBJS_EXTRA += netdev.o
 endif
 
+# virtio-input
+ENABLE_VIRTIOINPUT ?= 1
+ifneq ($(UNAME_S),Linux)
+    ENABLE_VIRTIOINPUT := 0
+endif
+$(call set-feature, VIRTIOINPUT)
+ifeq ($(call has, VIRTIOINPUT), 1)
+    OBJS_EXTRA += virtio-input.o
+endif
+
+# virtio-gpu
+ENABLE_VIRTIOGPU ?= 1
+ifneq ($(UNAME_S),Linux)
+    ENABLE_VIRTIOGPU := 0
+endif
+
+# VirGL
+ENABLE_VIRGL ?= 1
+ifneq (ENABLE_VIRTIOGPU,0)
+    CFLAGS += $(shell pkg-config virglrenderer --cflags)
+    LDFLAGS += $(shell pkg-config virglrenderer --libs)
+endif
+
+$(call set-feature, VIRGL)
+
+# SDL2
+ENABLE_SDL ?= 1
+ifeq (, $(shell which sdl2-config))
+    $(warning No sdl2-config in $$PATH. Check SDL2 installation in advance)
+    override ENABLE_SDL := 0
+endif
+
+ifeq ($(ENABLE_SDL),1)
+    CFLAGS += $(shell sdl2-config --cflags)
+    LDFLAGS += $(shell sdl2-config --libs)
+else
+    override ENABLE_VIRTIOGPU := 0
+endif
+
+ifeq ($(ENABLE_VIRTIOGPU),1)
+    OBJS_EXTRA += window.o
+    OBJS_EXTRA += virtio-gpu.o
+endif
+
+$(call set-feature, VIRTIOGPU)
+
 BIN = semu
 all: $(BIN) minimal.dtb
 

common.h

@@ -2,6 +2,9 @@
 
 #include "feature.h"
 
+#define BITS_PER_CHAR 8
+#define BITS_PER_LONG (BITS_PER_CHAR * sizeof(long))
+
 #define unlikely(x) __builtin_expect((x), 0)
 #define likely(x) __builtin_expect((x), 1)
 
@@ -17,6 +20,16 @@ static inline int ilog2(int x)
     return 31 - __builtin_clz(x | 1);
 }
 
+static inline void set_bit(unsigned long bit, unsigned long *word)
+{
+    *word |= (1 << bit);
+}
+
+static inline void bitmap_set_bit(unsigned long *map, unsigned long bit)
+{
+    set_bit(bit % BITS_PER_LONG, &map[bit / BITS_PER_LONG]);
+}
+
 /* Range check
  * For any variable range checking:
  *     if (x >= minx && x <= maxx) ...