[libguestfs/f16] Rebase patch.
Richard W.M. Jones
rjones at fedoraproject.org
Sun Aug 28 10:06:08 UTC 2011
commit 3e70dd001479a4cdd628922451ec37c380b34798
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sun Aug 28 11:05:26 2011 +0100
Rebase patch.
...chine-option-for-latest-qemu-thanks-Marku.patch | 32 +++++--------------
libguestfs.spec | 5 ++-
2 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch b/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
index b14bb86..f8e9141 100644
--- a/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
+++ b/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
@@ -1,19 +1,8 @@
-From 2ae7aa73308d911fa9916d6ec03e2a52a16f7737 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Mon, 25 Jul 2011 10:45:13 +0100
-Subject: [PATCH] Fix qemu -machine option for latest qemu (thanks Markus
- Armbruster).
-
----
- src/launch.c | 25 +++++++++++++++----------
- 1 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/src/launch.c b/src/launch.c
-index 56aa288..933e3fd 100644
---- a/src/launch.c
-+++ b/src/launch.c
-@@ -75,10 +75,10 @@ static int launch_appliance (guestfs_h *g);
- static int64_t timeval_diff (const struct timeval *x, const struct timeval *y);
+diff -ur libguestfs-1.12.5.old/src/launch.c libguestfs-1.12.5/src/launch.c
+--- libguestfs-1.12.5.old/src/launch.c 2011-08-28 09:19:27.000000000 +0100
++++ libguestfs-1.12.5/src/launch.c 2011-08-28 11:04:27.349272807 +0100
+@@ -76,10 +76,10 @@
+ static void print_qemu_command_line (guestfs_h *g, char **argv);
static int connect_unix_socket (guestfs_h *g, const char *sock);
static int qemu_supports (guestfs_h *g, const char *option);
-
@@ -25,7 +14,7 @@ index 56aa288..933e3fd 100644
static void compile_regexps (void) __attribute__((constructor));
static void free_regexps (void) __attribute__((destructor));
-@@ -96,13 +96,15 @@ compile_regexps (void)
+@@ -97,13 +97,15 @@
abort (); \
} \
} while (0)
@@ -42,7 +31,7 @@ index 56aa288..933e3fd 100644
/* Add a string to the current command line. */
static void
-@@ -516,14 +518,19 @@ launch_appliance (guestfs_h *g)
+@@ -517,14 +519,19 @@
if (qemu_supports (g, "-nodefconfig"))
add_cmdline (g, "-nodefconfig");
@@ -67,7 +56,7 @@ index 56aa288..933e3fd 100644
/* qemu sometimes needs this option to enable hardware
* virtualization, but some versions of 'qemu-kvm' will use KVM
* regardless (even where this option appears in the help text).
-@@ -1159,7 +1166,6 @@ qemu_supports (guestfs_h *g, const char *option)
+@@ -1165,7 +1172,6 @@
return strstr (g->qemu_help, option) != NULL;
}
@@ -75,7 +64,7 @@ index 56aa288..933e3fd 100644
/* As above but using a regex instead of a fixed string. */
static int
qemu_supports_re (guestfs_h *g, const pcre *option_regex)
-@@ -1171,7 +1177,6 @@ qemu_supports_re (guestfs_h *g, const pcre *option_regex)
+@@ -1177,7 +1183,6 @@
return match (g, g->qemu_help, option_regex);
}
@@ -83,6 +72,3 @@ index 56aa288..933e3fd 100644
/* Check if a file can be opened. */
static int
---
-1.7.5.2
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 1c63fb7..aef5a23 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.12.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -863,11 +863,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Aug 28 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.5-1
+* Sun Aug 28 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.5-2
- New upstream stable branch version 1.12.5.
- configure --with-extra version string contains Fedora release.
- Build with make V=1 to display full compile commands.
- Remove /usr/sbin PATH setting, not used for a very long time.
+- Rebase patch.
* Wed Aug 17 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.4-3
- New upstream stable branch version 1.12.4.
More information about the scm-commits
mailing list