Attachment 682200 Details for Bug 901439 – ad-hoc patch to disable using virtio-scsi

[patch] ad-hoc patch to disable using virtio-scsi

launch-applicance.c.patch (text/plain), 1.07 KB, created by Etsuji Nakai on 2013-01-18 08:09:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etsuji Nakai

Created: 2013-01-18 08:09:36 UTC

Size: 1.07 KB

patch

obsolete

>--- ./src/launch-appliance.c.orig	2013-01-18 16:02:15.173241872 +0900
>+++ ./src/launch-appliance.c	2013-01-18 16:03:51.324330071 +0900
>@@ -912,35 +912,8 @@
> static int
> qemu_supports_virtio_scsi (guestfs_h *g)
> {
>-  int r;
>-
>-  if (!g->app.qemu_help) {
>-    if (test_qemu (g) == -1)
>-      return 0;                 /* safe option? */
>-  }
>-
>-  /* g->app.virtio_scsi has these values:
>-   *   0 = untested (after handle creation)
>-   *   1 = supported
>-   *   2 = not supported (use virtio-blk)
>-   *   3 = test failed (use virtio-blk)
>-   */
>-  if (g->app.virtio_scsi == 0) {
>-    /* qemu 1.1 claims to support virtio-scsi but in reality it's broken. */
>-    if (g->app.qemu_version_major == 1 && g->app.qemu_version_minor < 2)
>-      g->app.virtio_scsi = 2;
>-    else {
>-      r = qemu_supports_device (g, "virtio-scsi-pci");
>-      if (r > 0)
>-        g->app.virtio_scsi = 1;
>-      else if (r == 0)
>-        g->app.virtio_scsi = 2;
>-      else
>-        g->app.virtio_scsi = 3;
>-    }
>-  }
>-
>-  return g->app.virtio_scsi == 1;
>+  g->app.virtio_scsi = 2;
>+  return 0;
> }
> 
> static char *
>

Actions: View | Diff

Attachments on bug 901439: 682200 | 682329