SHA256
1
0
forked from pool/libguestfs
Olaf Hering 2012-10-19 12:33:23 +00:00 committed by Git OBS Bridge
parent bef4468770
commit 458fae6516

View File

@ -1,4 +1,4 @@
From 984ff0e1dcb992363c8f16c282fa07510c7047b0 Mon Sep 17 00:00:00 2001 From cc07a2762371abf8959a0c1ff8954dce11a4af2c Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de> From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 3 Sep 2012 19:50:44 +0200 Date: Mon, 3 Sep 2012 19:50:44 +0200
Subject: [PATCH] force virtio_blk in old guest kernel Subject: [PATCH] force virtio_blk in old guest kernel
@ -114,12 +114,12 @@ index 2cfa35b..cb0cbb9 100644
/* Per-filesystem data stored for inspect_os. */ /* Per-filesystem data stored for inspect_os. */
diff --git a/src/guestfs.c b/src/guestfs.c diff --git a/src/guestfs.c b/src/guestfs.c
index e755ffa..21e774d 100644 index e755ffa..7e1d242 100644
--- a/src/guestfs.c --- a/src/guestfs.c
+++ b/src/guestfs.c +++ b/src/guestfs.c
@@ -126,6 +126,22 @@ guestfs_create_flags (unsigned flags, ...) @@ -222,6 +222,22 @@ parse_environment (guestfs_h *g,
return -1;
g->memsize = 500; }
+/* +/*
+ * Currently virtio_scsi is forced if qemu in the host supports this + * Currently virtio_scsi is forced if qemu in the host supports this
@ -137,9 +137,9 @@ index e755ffa..21e774d 100644
+ debug (g, "SuSE: %s not in environment, preventing virtio-scsi usage in old guest kernel.", env_string); + debug (g, "SuSE: %s not in environment, preventing virtio-scsi usage in old guest kernel.", env_string);
+#endif +#endif
+ +
/* Start with large serial numbers so they are easy to spot return 0;
* inside the protocol. }
*/
diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
index 33c5ee9..c7d5398 100644 index 33c5ee9..c7d5398 100644
--- a/src/inspect-fs-unix.c --- a/src/inspect-fs-unix.c