- Update to stable branch, version 1.20.0

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=169

1000-force-virtio_blk-in-old-guest-kernel.patch

@@ -1,4 +1,4 @@
-From 345ae9b244b4327c5b3a55326d9487d1d4c0617a Mon Sep 17 00:00:00 2001
+From 1b0c7cedf7020a0ac20c60c25f9ca1822768be40 Mon Sep 17 00:00:00 2001
 From: Olaf Hering <olaf@aepfle.de>
 Date: Mon, 3 Sep 2012 19:50:44 +0200
 Subject: [PATCH] force virtio_blk in old guest kernel
@@ -69,7 +69,7 @@ index 5729dd4..fb33ca1 100644
    len = strlen (ret);
    if (part_num > 0)
 diff --git a/fish/options.c b/fish/options.c
-index 0db790e..54190bc 100644
+index 40671b5..8a7b8cf 100644
 --- a/fish/options.c
 +++ b/fish/options.c
 @@ -27,6 +27,8 @@
@@ -101,10 +101,10 @@ index 0db790e..54190bc 100644
        exit (EXIT_FAILURE);
      }
 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 07689ff..71e0321 100644
+index df52f74..471a467 100644
 --- a/src/guestfs-internal.h
 +++ b/src/guestfs-internal.h
-@@ -350,6 +350,8 @@ struct guestfs_h
+@@ -354,6 +354,8 @@ struct guestfs_h
      virDomainPtr dom;           /* libvirt domain */
    } virt;
  #endif
@@ -114,10 +114,10 @@ index 07689ff..71e0321 100644
  
  /* Per-filesystem data stored for inspect_os. */
 diff --git a/src/handle.c b/src/handle.c
-index fd7db69..d9ecc5d 100644
+index 685571a..efcbcf4 100644
 --- a/src/handle.c
 +++ b/src/handle.c
-@@ -210,6 +210,22 @@ parse_environment (guestfs_h *g,
+@@ -215,6 +215,22 @@ parse_environment (guestfs_h *g,
        return -1;
    }
  
@@ -141,10 +141,10 @@ index fd7db69..d9ecc5d 100644
  }
  
 diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
-index a48d176..b2d6766 100644
+index 8d3e6b0..97b355b 100644
 --- a/src/inspect-fs-unix.c
 +++ b/src/inspect-fs-unix.c
-@@ -1411,7 +1411,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
+@@ -1412,7 +1412,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
      return 0;
  
    /* Make the partition name and check it exists. */
@@ -153,7 +153,7 @@ index a48d176..b2d6766 100644
    if (!is_partition (g, device)) {
      free (device);
      return 0;
-@@ -1488,7 +1488,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
+@@ -1489,7 +1489,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
      if (disk_i != -1 && disk_i <= 26 &&
          slice_i > 0 && slice_i <= 1 /* > 4 .. see comment above */ &&
          part_i >= 0 && part_i < 26) {
@@ -163,11 +163,11 @@ index a48d176..b2d6766 100644
    }
    else if ((part = match1 (g, spec, re_diskbyid)) != NULL) {
 diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index f5647cf..5e4113f 100644
+index 4f21db7..e8e91d5 100644
 --- a/src/launch-appliance.c
 +++ b/src/launch-appliance.c
-@@ -847,6 +847,9 @@ qemu_supports_virtio_scsi (guestfs_h *g)
+@@ -940,6 +940,9 @@ qemu_supports_virtio_scsi (guestfs_h *g)
-       g->app.virtio_scsi = 3;
+     }
    }
  
 +  if (g->use_virtio_blk)
@@ -177,10 +177,10 @@ index f5647cf..5e4113f 100644
  }
  
 diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
-index 8e9b5ad..c0a648a 100644
+index 2a3bc7f..d23edf5 100644
 --- a/src/launch-libvirt.c
 +++ b/src/launch-libvirt.c
-@@ -150,6 +150,13 @@ launch_libvirt (guestfs_h *g, const char *libvirt_uri)
+@@ -175,6 +175,13 @@ launch_libvirt (guestfs_h *g, const char *libvirt_uri)
      return -1;
    }
  
@@ -195,42 +195,27 @@ index 8e9b5ad..c0a648a 100644
    TRACE0 (launch_libvirt_start);
  
 diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
-index abbb1c5..cd60bc4 100644
+index 9db086b..d44b9fa 100644
 --- a/test-tool/test-tool.c
 +++ b/test-tool/test-tool.c
-@@ -35,6 +35,7 @@
+@@ -103,6 +103,16 @@ main (int argc, char *argv[])
- 
- #include <guestfs.h>
- 
-+static int use_virtio_blk;
- #define _(str) dgettext(PACKAGE, (str))
- //#define N_(str) dgettext(PACKAGE, (str))
- 
-@@ -103,7 +104,11 @@ main (int argc, char *argv[])
    int i;
    struct guestfs_version *vers;
    char *p;
 +  char *disk_name, *partition_name;
- 
++  int use_virtio_blk = 0;
++
 +#ifdef GUESTFS_QEMU_NO_VIRTIO_BLK
 +  use_virtio_blk = 1;
 +#endif
-   /* Create the handle. */
-   g = guestfs_create ();
-   if (g == NULL) {
-@@ -118,6 +123,11 @@ main (int argc, char *argv[])
-     exit (EXIT_FAILURE);
-   }
- 
 +  if (asprintf(&disk_name, "/dev/%s", use_virtio_blk ? "vda" : "sda") < 0)
 +    exit (EXIT_FAILURE);
 +  if (asprintf(&partition_name, "%s1", disk_name) < 0)
 +    exit (EXIT_FAILURE);
-+
+ 
    for (;;) {
      c = getopt_long (argc, argv, options, long_options, &option_index);
-     if (c == -1) break;
+@@ -275,19 +285,19 @@ main (int argc, char *argv[])
-@@ -258,19 +268,19 @@ main (int argc, char *argv[])
    fflush (stdout);
  
    /* Create the filesystem and mount everything. */
@@ -254,5 +239,5 @@ index abbb1c5..cd60bc4 100644
               _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n"));
      exit (EXIT_FAILURE);
 -- 
-1.8.0
+1.8.0.1
 

libguestfs-1.19.64.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7b453a6e1950ff38d61762d5d0bed6984e3be4612fcd7456f417f7a721cd714
-size 9014434

libguestfs-1.20.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac258fc4d5ac3e014ccd579bf6ea0983a060c2bbbcc5baaa4e66577cfca12fba
+size 9302632

libguestfs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 13 17:09:48 CET 2012 - ohering@suse.de
+
+- Update to stable branch, version 1.20.0
+
 -------------------------------------------------------------------
 Tue Dec 11 17:54:19 CET 2012 - ohering@suse.de
 

libguestfs.spec

@@ -102,7 +102,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        GPL-2
 Group:          System/Filesystems
-Version:        1.19.64
+Version:        1.20.0
 Release:        0
 Patch5:         libguestfs-1.13.14-ruby.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch