rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase non-upstream patch to fix qemu -machine option.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-08-19 12:57:25 +01:00
parent 648a97cc73
commit f010e7ca4f
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
View File

@ -1,19 +1,7 @@
From 2ae7aa73308d911fa9916d6ec03e2a52a16f7737 Mon Sep 17 00:00:00 2001 --- libguestfs-1.13.6.old/src/launch.c 2011-08-18 18:02:56.000000000 +0100
From: "Richard W.M. Jones" <rjones@redhat.com> +++ libguestfs-1.13.6/src/launch.c 2011-08-19 12:56:00.131758605 +0100
Date: Mon, 25 Jul 2011 10:45:13 +0100 @@ -76,10 +76,10 @@
Subject: [PATCH] Fix qemu -machine option for latest qemu (thanks Markus static void print_qemu_command_line (guestfs_h *g, char **argv);
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);
static int connect_unix_socket (guestfs_h *g, const char *sock); static int connect_unix_socket (guestfs_h *g, const char *sock);
static int qemu_supports (guestfs_h *g, const char *option); static int qemu_supports (guestfs_h *g, const char *option);
- -
@ -25,7 +13,7 @@ index 56aa288..933e3fd 100644
static void compile_regexps (void) __attribute__((constructor)); static void compile_regexps (void) __attribute__((constructor));
static void free_regexps (void) __attribute__((destructor)); static void free_regexps (void) __attribute__((destructor));
@@ -96,13 +96,15 @@ compile_regexps (void) @@ -97,13 +97,15 @@
abort (); \ abort (); \
} \ } \
} while (0) } while (0)
@ -42,7 +30,7 @@ index 56aa288..933e3fd 100644
/* Add a string to the current command line. */ /* Add a string to the current command line. */
static void static void
@@ -516,14 +518,19 @@ launch_appliance (guestfs_h *g) @@ -517,14 +519,19 @@
if (qemu_supports (g, "-nodefconfig")) if (qemu_supports (g, "-nodefconfig"))
add_cmdline (g, "-nodefconfig"); add_cmdline (g, "-nodefconfig");
@ -67,7 +55,7 @@ index 56aa288..933e3fd 100644
/* qemu sometimes needs this option to enable hardware /* qemu sometimes needs this option to enable hardware
* virtualization, but some versions of 'qemu-kvm' will use KVM * virtualization, but some versions of 'qemu-kvm' will use KVM
* regardless (even where this option appears in the help text). * regardless (even where this option appears in the help text).
@@ -1159,7 +1166,6 @@ qemu_supports (guestfs_h *g, const char *option) @@ -1153,7 +1160,6 @@
return strstr (g->qemu_help, option) != NULL; return strstr (g->qemu_help, option) != NULL;
} }
@ -75,7 +63,7 @@ index 56aa288..933e3fd 100644
/* As above but using a regex instead of a fixed string. */ /* As above but using a regex instead of a fixed string. */
static int static int
qemu_supports_re (guestfs_h *g, const pcre *option_regex) qemu_supports_re (guestfs_h *g, const pcre *option_regex)
@@ -1171,7 +1177,6 @@ qemu_supports_re (guestfs_h *g, const pcre *option_regex) @@ -1165,7 +1171,6 @@
return match (g, g->qemu_help, option_regex); return match (g, g->qemu_help, option_regex);
} }
@ -83,6 +71,3 @@ index 56aa288..933e3fd 100644
/* Check if a file can be opened. */ /* Check if a file can be opened. */
static int static int
--
1.7.5.2

5
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.13.6 Version: 1.13.6
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -875,8 +875,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Aug 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.6-1 * Fri Aug 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.6-2
- New upstream version 1.13.6. - New upstream version 1.13.6.
- Rebase non-upstream patch to fix qemu -machine option.
* Wed Aug 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.5-1 * Wed Aug 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.5-1
- New upstream version 1.13.5. - New upstream version 1.13.5.