Merge "Enable rutabaga" into emu-devemu-dev

10 files changed, 40 insertions, 25 deletions

diff --git a/google/toolchain/src/aemu/configure/darwin_builder.py b/google/toolchain/src/aemu/configure/darwin_builder.py
index 53568cf99c..1c43e04704 100644
--- a/google/toolchain/src/aemu/configure/darwin_builder.py
+++ b/google/toolchain/src/aemu/configure/darwin_builder.py
@@ -134,7 +134,7 @@ class DarwinBuilder(QemuBuilder):
             "-Drbd=disabled",
             "-Drdma=disabled",
             "-Dreplication=disabled",
-            "-Drutabaga_gfx=disabled",
+            "-Drutabaga_gfx=enabled",
             "-Dsdl_image=disabled",
             "-Dsdl=disabled",
             "-Dseccomp=disabled",
@@ -212,16 +212,16 @@ class DarwinBuilder(QemuBuilder):
         ]
 
         return [
-            # BazelLib(
-            #     "//hardware/google/gfxstream/host:gfxstream_backend",
-            #     "0.1.2",
-            #     {},
-            # ),
-            # CargoLib(
-            #     "/external/crosvm/rutabaga_gfx/ffi:rutabaga_gfx_ffi",
-            #     "0.1.2",
-            #     {"archive": "rutabaga_gfx_ffi"},
-            # ),  # Must be after libgxstream!
+            BazelLib(
+                "//hardware/google/gfxstream/host:gfxstream_backend",
+                "0.1.2",
+                {},
+            ),
+            CargoLib(
+                "/external/crosvm/rutabaga_gfx/ffi:rutabaga_gfx_ffi",
+                "0.1.2",
+                {"archive": "rutabaga_gfx_ffi"},
+            ),  # Must be after libgxstream!
             BazelLib("//external/dtc:libfdt", "1.6.0", {}),
             BazelLib(
                 "@glib//:gmodule-static",
diff --git a/google/toolchain/src/aemu/configure/linux_builder.py b/google/toolchain/src/aemu/configure/linux_builder.py
index 51be576240..4092d8541f 100644
--- a/google/toolchain/src/aemu/configure/linux_builder.py
+++ b/google/toolchain/src/aemu/configure/linux_builder.py
@@ -102,7 +102,7 @@ class LinuxBuilder(QemuBuilder):
             "-Drbd=disabled",
             "-Drdma=disabled",
             "-Dreplication=disabled",
-            "-Drutabaga_gfx=disabled",
+            "-Drutabaga_gfx=enabled",
             "-Dsdl=disabled",
             "-Dsdl_image=disabled",
             "-Dseccomp=disabled",
diff --git a/google/toolchain/src/aemu/configure/windows_builder.py b/google/toolchain/src/aemu/configure/windows_builder.py
index a517edd81a..91d915df7b 100644
--- a/google/toolchain/src/aemu/configure/windows_builder.py
+++ b/google/toolchain/src/aemu/configure/windows_builder.py
@@ -183,7 +183,7 @@ class WindowsBuilder(QemuBuilder):
             "-Drbd=disabled",
             "-Drdma=disabled",
             "-Dreplication=disabled",
-            "-Drutabaga_gfx=disabled",  # b/324640237
+            "-Drutabaga_gfx=enabled",
             "-Dsdl=disabled",
             "-Dsdl_image=disabled",
             "-Dseccomp=disabled",
diff --git a/google/toolchain/src/aemu/toolchain.py b/google/toolchain/src/aemu/toolchain.py
index 418ded0b58..6f087e3a50 100755
--- a/google/toolchain/src/aemu/toolchain.py
+++ b/google/toolchain/src/aemu/toolchain.py
@@ -106,7 +106,9 @@ def gen_toolchain(
         logging.info("Mapping %s -> %s", target, TARGET_ALIAS[target])
         target = TARGET_ALIAS[target]
 
-    return builder_map[target](Path(aosp), Path(dest), Path(toolchain_dir), ccache, toolchain)
+    return builder_map[target](
+        Path(aosp), Path(dest), Path(toolchain_dir), ccache, toolchain
+    )
 
 
 def mkdirs(out: Path, force: bool):
@@ -215,10 +217,11 @@ def release_command(args):
 def bazel_command(args):
     bazel_out = Path(args.out)
     bazel_out.mkdir(parents=True, exist_ok=True)
-    build_dir = Path(args.build)
+
+    build_dir = args.build
     temp_build = None
     if not build_dir:
-        temp_build = tempfile.TemporaryDirectory()
+        temp_build = tempfile.TemporaryDirectory(prefix="shadow")
         build_dir = Path(temp_build.__enter__()).resolve()
         builder = gen_toolchain(
             args.target,
@@ -230,7 +233,7 @@ def bazel_command(args):
         )
         builder.configure_meson([])
 
-    with tempfile.TemporaryDirectory() as bazel_build_dir:
+    with tempfile.TemporaryDirectory(prefix="bazel") as bazel_build_dir:
         # Make sure there are no accidently symlinks that cause
         # issues when trying to find dependencies
         build_dir = Path(build_dir).resolve()
@@ -249,7 +252,7 @@ def bazel_command(args):
             / "qemu"
             / f"qemu-{platform.system().lower()}-shim.jsonc"
             if not args.shim
-            else args.shim
+            else Path(args.shim)
         ).absolute()
         builder.configure_meson(
             [
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 2b6291ad8d..2c0f1117ad 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1142,6 +1142,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
     int bios_size, isa_bios_size;
     ssize_t ret;
 
+    printf("Init rom \n");
     /* BIOS load */
     bios_name = ms->firmware ?: default_firmware;
     filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
diff --git a/qemu-darwin-shim.jsonc b/qemu-darwin-shim.jsonc
index 73c052aacb..e9bfae4d38 100644
--- a/qemu-darwin-shim.jsonc
+++ b/qemu-darwin-shim.jsonc
@@ -178,7 +178,9 @@
     "libfdt": [
       "//external/dtc:libfdt"
     ],
-    "rutabaga_gfx_ffi": []
+    "rutabaga_gfx_ffi": [
+      "//external/crosvm/rutabaga_gfx/ffi:c_ffi"
+    ]
   },
   // The actual set of targets you wish to generate bazel targets for.
   // These are the targets that will be exported.
@@ -192,7 +194,8 @@
     "hw-display-virtio-gpu",
     "hw-display-virtio-vga",
     "hw-display-virtio-vga-gl",
-    "hw-display-virtio-gpu-pci"
+    "hw-display-virtio-gpu-pci",
+    "hw-display-virtio-gpu-rutabaga"
   ],
   "exclude": [
     "vhost-user",
diff --git a/qemu-linux-shim.jsonc b/qemu-linux-shim.jsonc
index 73a794274c..ed9d8ebdd1 100644
--- a/qemu-linux-shim.jsonc
+++ b/qemu-linux-shim.jsonc
@@ -191,7 +191,9 @@
     "libvhost-user-glib": [
       "//external/qemu/subprojects/libvhost-user:vhost-user-glib"
     ],
-    "rutabaga_gfx_ffi": []
+    "rutabaga_gfx_ffi": [
+      "//external/crosvm/rutabaga_gfx/ffi:c_ffi"
+    ]
   },
   // The actual set of targets you wish to generate bazel targets for.
   // These are the targets that will be exported.
@@ -207,7 +209,8 @@
     "hw-display-virtio-gpu",
     "hw-display-virtio-vga",
     "hw-display-virtio-vga-gl",
-    "hw-display-virtio-gpu-pci"
+    "hw-display-virtio-gpu-pci",
+    "hw-display-virtio-gpu-rutabaga"
   ],
   "exclude": [
     "vhost-user",
diff --git a/qemu-windows-shim.jsonc b/qemu-windows-shim.jsonc
index 5a29b99f4f..14af2f3abd 100644
--- a/qemu-windows-shim.jsonc
+++ b/qemu-windows-shim.jsonc
@@ -224,7 +224,9 @@
     "vhost-user-glib": [
       "//external/qemu/subprojects/libvhost-user:vhost-user-glib"
     ],
-    "rutabaga_gfx_ffi": []
+    "rutabaga_gfx_ffi": [
+      "//external/crosvm/rutabaga_gfx/ffi:c_ffi"
+    ]
   },
   // The actual set of targets you wish to generate bazel targets for.
   // These are the targets that will be exported.
@@ -235,10 +237,11 @@
     "qemu-img",
     // Here we have the windows modules:
     "accel-tcg-x86_64",
-    "hw-display-virtio-gpu-pci",
     "hw-display-virtio-gpu",
+    "hw-display-virtio-vga",
     "hw-display-virtio-vga-gl",
-    "hw-display-virtio-vga"
+    "hw-display-virtio-gpu-pci",
+    "hw-display-virtio-gpu-rutabaga"
   ],
   "exclude": [
     "vhost-user",
diff --git a/system/datadir.c b/system/datadir.c
index c9237cb5d4..69cd6767ff 100644
--- a/system/datadir.c
+++ b/system/datadir.c
@@ -55,6 +55,7 @@ char *qemu_find_file(int type, const char *name)
 
     for (i = 0; i < data_dir_idx; i++) {
         buf = g_strdup_printf("%s/%s%s", data_dir[i], subdir, name);
+        printf("Trying: %s\n", name);
         if (access(buf, R_OK) == 0) {
             trace_load_file(name, buf);
             return buf;
diff --git a/util/module.c b/util/module.c
index 32e263163c..f0b55b84f5 100644
--- a/util/module.c
+++ b/util/module.c
@@ -282,6 +282,7 @@ int module_load(const char *prefix, const char *name, Error **errp)
     for (i = 0; i < n_dirs; i++) {
         char *fname = g_strdup_printf("%s/%s%s",
                                       dirs[i], module_name, CONFIG_HOST_DSOSUF);
+        printf("Looking for %s\n", fname);
         int ret = access(fname, F_OK);
         if (ret != 0 && (errno == ENOENT || errno == ENOTDIR)) {
             /*