[Pkg-libvirt-commits] [libvirt] 02/05: Rebase patches.
Guido Guenther
agx at moszumanska.debian.org
Sat May 3 14:46:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.2.4_rc2-1
in repository libvirt.
commit 278d3b6f3523b66ea22b1e33dec9332b23ba8cb7
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat May 3 10:57:37 2014 +0200
Rebase patches.
Dropped
libvirt-guests-avoid-bashism.patch
tests-Don-t-crash-when-creating-the-config-object-fa.patch
fixed upstream
Modified:
tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
to better suite upstream.
---
...duce-udevadm-settle-timeout-to-10-seconds.patch | 4 +-
debian/patches/Skip-vircgrouptest.patch | 2 +-
.../patches/debian/Debianize-libvirt-guests.patch | 4 +-
.../Don-t-enable-default-network-on-boot.patch | 8 +--
debian/patches/debian/remove-RHism.diff.patch | 2 +-
debian/patches/libvirt-guests-avoid-bashism.patch | 29 ----------
...onitorTextGetMigrationStatus-to-intercept.patch | 2 +-
debian/patches/series | 4 +-
...-crash-when-creating-the-config-object-fa.patch | 37 -------------
...use-privileged-mode-if-Qemu-user-and-grou.patch | 61 +++++-----------------
10 files changed, 24 insertions(+), 129 deletions(-)
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index cd84c99..f6767dc 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 9be1590..1e6400d 100644
+index 95d1ff9..a675b9e 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1450,7 +1450,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1473,7 +1473,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/Skip-vircgrouptest.patch b/debian/patches/Skip-vircgrouptest.patch
index b392cc7..362b4f3 100644
--- a/debian/patches/Skip-vircgrouptest.patch
+++ b/debian/patches/Skip-vircgrouptest.patch
@@ -9,7 +9,7 @@ without sysfs mounted.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index dd078c1..eadc9b6 100644
+index 35ac0c0..57ed32a 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -22,7 +22,7 @@
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index b705782..c6bef8a 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -9,7 +9,7 @@ Origin: vendor
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 4bbd4e4..116b232 100644
+index a158b62..62ee35f 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -1,5 +1,17 @@
@@ -81,7 +81,7 @@ index 4bbd4e4..116b232 100644
RETVAL=0
-@@ -538,8 +550,7 @@ gueststatus() {
+@@ -540,8 +552,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index fe97c5c..d7e8914 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 55427ed..73f8ecd 100644
+index e9dc9e0..97172fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2619,9 +2619,6 @@ if WITH_NETWORK
+@@ -2630,9 +2630,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
$(DESTDIR)$(confdir)/qemu/networks/default.xml && \
rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index 55427ed..73f8ecd 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index 683d491..b24bafe 100644
+index df58b92..d9669c8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -9899,9 +9899,6 @@ install-data-local: install-init install-systemd
+@@ -9949,9 +9949,6 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 5f21b64..69a3017 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index ba2da20..638016f 100644
+index abd2e93..dc3d63d 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/libvirt-guests-avoid-bashism.patch b/debian/patches/libvirt-guests-avoid-bashism.patch
deleted file mode 100644
index bc0b596..0000000
--- a/debian/patches/libvirt-guests-avoid-bashism.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 7 Apr 2014 11:11:07 +0200
-Subject: libvirt-guests: avoid bashism
-
----
- tools/libvirt-guests.sh.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 116b232..62ee35f 100644
---- a/tools/libvirt-guests.sh.in
-+++ b/tools/libvirt-guests.sh.in
-@@ -101,13 +101,15 @@ test_connect()
- {
- uri=$1
-
-- for ((i = 0; i < ${CONNECT_RETRIES}; i++)); do
-+ i=${CONNECT_RETRIES}
-+ while [ $i -gt 0 ]; do
- run_virsh "$uri" connect 2>/dev/null
- if [ $? -eq 0 ]; then
- return 0;
- fi
- sleep ${RETRIES_SLEEP}
- eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i"
-+ i=$(($i-1))
- done
- eval_gettext "Can't connect to \$uri. Skipping."
- echo
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 82d74b5..21c39ff 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index ad63140..203a0cb 100644
+index bd604f0..da7e78b 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1543,7 +1543,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
diff --git a/debian/patches/series b/debian/patches/series
index 848d053..87decd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,5 @@ Reduce-udevadm-settle-timeout-to-10-seconds.patch
debian/Debianize-systemd-service-files.patch
Allow-xen-toolstack-to-find-it-s-binaries.patch
Skip-vircgrouptest.patch
-tests-Don-t-crash-when-creating-the-config-object-fa.patch
-tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
-libvirt-guests-avoid-bashism.patch
Include-param.h-on-kFreeBSD.patch
+tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
diff --git a/debian/patches/tests-Don-t-crash-when-creating-the-config-object-fa.patch b/debian/patches/tests-Don-t-crash-when-creating-the-config-object-fa.patch
deleted file mode 100644
index 33abba3..0000000
--- a/debian/patches/tests-Don-t-crash-when-creating-the-config-object-fa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 7 Apr 2014 08:53:26 +0200
-Subject: tests: Don't crash when creating the config object fails
-
----
- tests/qemuargv2xmltest.c | 3 +++
- tests/qemuxml2argvtest.c | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
-index 6d7e23e..4cc3749 100644
---- a/tests/qemuargv2xmltest.c
-+++ b/tests/qemuargv2xmltest.c
-@@ -128,6 +128,9 @@ mymain(void)
- int ret = 0;
-
- driver.config = virQEMUDriverConfigNew(false);
-+ if (driver.config == NULL)
-+ return EXIT_FAILURE;
-+
- if ((driver.caps = testQemuCapsInit()) == NULL)
- return EXIT_FAILURE;
-
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 56854dc..13ed4f6 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -501,6 +501,9 @@ mymain(void)
- }
-
- driver.config = virQEMUDriverConfigNew(true);
-+ if (driver.config == NULL)
-+ return EXIT_FAILURE;
-+
- VIR_FREE(driver.config->spiceListen);
- VIR_FREE(driver.config->vncListen);
-
diff --git a/debian/patches/tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch b/debian/patches/tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
index d3c9237..b018907 100644
--- a/debian/patches/tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
+++ b/debian/patches/tests-Only-use-privileged-mode-if-Qemu-user-and-grou.patch
@@ -1,63 +1,26 @@
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 7 Apr 2014 09:25:37 +0200
-Subject: tests: Only use privileged mode if Qemu user and group exists
+Date: Sat, 3 May 2014 13:04:58 +0200
+Subject: tests: Only use privileged mode if Qemu user and group
-When building packages in a clean chroot the QEMU_USER and QEMU_GROUP
-don't exist making VirQemuDriverConfigNew fail with privileged=true.
-
-Avoid that by not requiring priviliged mode and skipping tests that need
-it.
+Better version as proposed upstream
---
- tests/qemuxml2argvtest.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
+ tests/qemuxml2argvtest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 13ed4f6..f25ef0b 100644
+index a1ef2b8..14482fd 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
-@@ -484,7 +484,10 @@ mymain(void)
- {
- int ret = 0;
- char *map = NULL;
-+ uid_t user;
-+ gid_t group;
- bool skipLegacyCPUs = false;
-+ bool privileged = true;
-
- abs_top_srcdir = getenv("abs_top_srcdir");
- if (!abs_top_srcdir)
-@@ -500,7 +503,11 @@ mymain(void)
+@@ -499,9 +499,11 @@ mymain(void)
return EXIT_FAILURE;
}
- driver.config = virQEMUDriverConfigNew(true);
-+ if (virGetUserID(QEMU_USER, &user) < 0 ||
-+ virGetGroupID(QEMU_GROUP, &group) < 0)
-+ privileged = false;
-+
-+ driver.config = virQEMUDriverConfigNew(privileged);
++ driver.config = virQEMUDriverConfigNew(false);
if (driver.config == NULL)
return EXIT_FAILURE;
++ else
++ driver.config->privileged = true;
-@@ -1160,13 +1167,14 @@ mymain(void)
- DO_TEST_FAILURE("cpu-host-passthrough", NONE);
- DO_TEST_FAILURE("cpu-qemu-host-passthrough",
- QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
--
-- DO_TEST("memtune", QEMU_CAPS_NAME);
-- DO_TEST("memtune-unlimited", QEMU_CAPS_NAME);
-- DO_TEST("blkiotune", QEMU_CAPS_NAME);
-- DO_TEST("blkiotune-device", QEMU_CAPS_NAME);
-- DO_TEST("cputune", QEMU_CAPS_NAME);
-- DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME);
-+ if (privileged) {
-+ DO_TEST("memtune", QEMU_CAPS_NAME);
-+ DO_TEST("memtune-unlimited", QEMU_CAPS_NAME);
-+ DO_TEST("blkiotune", QEMU_CAPS_NAME);
-+ DO_TEST("blkiotune-device", QEMU_CAPS_NAME);
-+ DO_TEST("cputune", QEMU_CAPS_NAME);
-+ DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME);
-+ }
- DO_TEST("numatune-memory", NONE);
- DO_TEST("numatune-auto-nodeset-invalid", NONE);
- DO_TEST("numad", NONE);
+ VIR_FREE(driver.config->spiceListen);
+ VIR_FREE(driver.config->vncListen);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list