>From 1556cc9e8056a0e72c6ad945e45804c30e06da0b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Nov 2012 18:45:59 +0000 Subject: [PATCH 2/2] DEBIAN 7: FORCE VIRTIO-BLK, DISABLE VIRTIO-SCSI. Ancient KVM on Debian 7 means virtio-scsi isn't working. --- src/launch-appliance.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/launch-appliance.c b/src/launch-appliance.c index 17e90d9..6cc9e97 100644 --- a/src/launch-appliance.c +++ b/src/launch-appliance.c @@ -39,7 +39,9 @@ static int is_openable (guestfs_h *g, const char *path, int flags); static void print_qemu_command_line (guestfs_h *g, char **argv); static int qemu_supports (guestfs_h *g, const char *option); +#if 0 static int qemu_supports_device (guestfs_h *g, const char *device_name); +#endif static int qemu_supports_virtio_scsi (guestfs_h *g); static char *qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index); @@ -826,6 +828,7 @@ qemu_supports (guestfs_h *g, const char *option) return strstr (g->app.qemu_help, option) != NULL; } +#if 0 /* Test if device is supported by qemu (currently just greps the -device ? * output). */ @@ -839,6 +842,7 @@ qemu_supports_device (guestfs_h *g, const char *device_name) return strstr (g->app.qemu_devices, device_name) != NULL; } +#endif /* Check if a file can be opened. */ static int @@ -857,6 +861,7 @@ is_openable (guestfs_h *g, const char *path, int flags) static int qemu_supports_virtio_scsi (guestfs_h *g) { +#if 0 int r; /* g->app.virtio_scsi has these values: @@ -876,6 +881,8 @@ qemu_supports_virtio_scsi (guestfs_h *g) } return g->app.virtio_scsi == 1; +#endif + return 0; } static char * -- 1.7.10.4