- New upstream version 1.0.81.

- Remove two upstream patches.
- virt-inspector: Make RPM application data more specific (RHBZ#552718).
This commit is contained in:
Richard W.M. Jones 2010-01-13 15:07:32 +00:00
parent b3ab8e1a3b
commit d47d9ebe2d
5 changed files with 9 additions and 128 deletions

View File

@ -1 +1 @@
libguestfs-1.0.80.tar.gz
libguestfs-1.0.81.tar.gz

View File

@ -1,57 +0,0 @@
From 5c6147ecc7ee3cf657edb1e19ad5ab4e973424e0 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Fri, 18 Dec 2009 19:20:37 +0000
Subject: [PATCH] daemon: Work around udevsettle issue (RHBZ#548121).
---
daemon/guestfsd.c | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 520a4a4..0fc0128 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -1038,31 +1038,19 @@ device_name_translation (char *device, const char *func)
* involved. eg. You can create or remove some device, but the /dev
* device node won't appear until some time later. This means that
* you get an error if you run one command followed by another.
+ *
* Use 'udevadm settle' after certain commands, but don't be too
* fussed if it fails.
+ *
+ * 'udevsettle' was the old name for this command (RHEL 5). This was
+ * deprecated in favour of 'udevadm settle'. The old 'udevsettle'
+ * command was left as a symlink. Then in Fedora 13 the old symlink
+ * remained but it stopped working (RHBZ#548121), so we have to be
+ * careful not to assume that we can use 'udevsettle' if it exists.
*/
void
udev_settle (void)
{
- static int which_prog = 0;
-
- if (which_prog == 0) {
- if (access ("/sbin/udevsettle", X_OK) == 0)
- which_prog = 2;
- else if (access ("/sbin/udevadm", X_OK) == 0)
- which_prog = 1;
- else
- which_prog = 3;
- }
-
- switch (which_prog) {
- case 1:
- command (NULL, NULL, "/sbin/udevadm", "settle", NULL);
- break;
- case 2:
- command (NULL, NULL, "/sbin/udevsettle", NULL);
- break;
- default:
- ;
- }
+ (void) command (NULL, NULL, "/sbin/udevadm", "settle", NULL);
+ (void) command (NULL, NULL, "/sbin/udevsettle", NULL);
}
--
1.6.5.2

View File

@ -1,59 +0,0 @@
From b4a4db522fed542f48aa60717e65061c5e83c919 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Thu, 7 Jan 2010 12:21:42 +0000
Subject: [PATCH] qemu: Upstream regression of -stdio serial option.
Best explained by the comment in the code:
/* Newer versions of qemu (from around 2009/12) changed the
* behaviour of monitors so that an implicit '-monitor stdio' is
* assumed if we are in -nographic mode and there is no other
* -monitor option. Only a single stdio device is allowed, so
* this broke the '-serial stdio' option. There is a new flag
* called -nodefaults which gets rid of all this default crud, so
* let's use that to avoid this and any future surprises.
*/
---
src/guestfs.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/guestfs.c b/src/guestfs.c
index 7cc09ce..a3d2762 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1091,15 +1091,28 @@ guestfs__launch (guestfs_h *g)
*/
g->cmdline[0] = g->qemu;
- snprintf (buf, sizeof buf, "%d", g->memsize);
- add_cmdline (g, "-m");
- add_cmdline (g, buf);
+ /* Newer versions of qemu (from around 2009/12) changed the
+ * behaviour of monitors so that an implicit '-monitor stdio' is
+ * assumed if we are in -nographic mode and there is no other
+ * -monitor option. Only a single stdio device is allowed, so
+ * this broke the '-serial stdio' option. There is a new flag
+ * called -nodefaults which gets rid of all this default crud, so
+ * let's use that to avoid this and any future surprises.
+ */
+ if (qemu_supports (g, "-nodefaults"))
+ add_cmdline (g, "-nodefaults");
- add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
add_cmdline (g, "-nographic");
add_cmdline (g, "-serial");
add_cmdline (g, "stdio");
+ snprintf (buf, sizeof buf, "%d", g->memsize);
+ add_cmdline (g, "-m");
+ add_cmdline (g, buf);
+
+ /* Force exit instead of reboot on panic */
+ add_cmdline (g, "-no-reboot");
+
/* These options recommended by KVM developers to improve reliability. */
if (qemu_supports (g, "-no-hpet"))
add_cmdline (g, "-no-hpet");
--
1.6.5.2

View File

@ -4,8 +4,8 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.0.80
Release: 14%{?dist}
Version: 1.0.81
Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -15,12 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.0.79-no-fuse-test.patch
# Work around udevsettle command broken in Fedora 13 (RHBZ#548121).
Patch1: libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch
# Fix regression in qemu -serial stdio option.
Patch2: libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@ -340,8 +334,6 @@ Requires: jpackage-utils
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir -p daemon/m4
@ -617,6 +609,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 13 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-1
- New upstream version 1.0.81.
- Remove two upstream patches.
- virt-inspector: Make RPM application data more specific (RHBZ#552718).
* Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-14
- Reenable tests because RHBZ#553689 is fixed.

View File

@ -1 +1 @@
54ba1464b12c2b070ea9ec50307cb3ab libguestfs-1.0.80.tar.gz
9fda4e497fadd3c24e0e4792313bc228 libguestfs-1.0.81.tar.gz