Skip to content
Snippets Groups Projects
Commit 8af24a9f authored by Guido Günther's avatar Guido Günther
Browse files

Update patches.

Dropped

   Define-SANLK_INQ_WAIT-if-missing-in-headers.patch - fixed upstream
parent 3f704df0
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@ Subject: Allow xen toolstack to find it's binaries
Closes: #685749
---
docs/schemas/capability.rng | 4 ++--
src/xen/xen_hypervisor.c | 6 +++---
src/xen/xen_hypervisor.c | 6 ++----
tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
tests/xencapsdata/xen-i686-pae.xml | 2 +-
tests/xencapsdata/xen-i686.xml | 2 +-
......@@ -16,13 +16,13 @@ Closes: #685749
tests/xencapsdata/xen-ppc64.xml | 2 +-
tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
tests/xencapsdata/xen-x86_64.xml | 2 +-
12 files changed, 25 insertions(+), 25 deletions(-)
12 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 8c928bc..b1930ba 100644
index 53fb04a..cb0bab2 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -241,13 +241,13 @@
@@ -253,13 +253,13 @@
<define name='emulator'>
<element name='emulator'>
......@@ -39,17 +39,17 @@ index 8c928bc..b1930ba 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 60f60ed..02393f4 100644
index 979cf3d..0966cb1 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2360,10 +2360,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
guest_archs[i].model,
guest_archs[i].bits,
(STREQ(hostmachine, "x86_64") ?
@@ -2359,11 +2359,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
if ((guest = virCapabilitiesAddGuest(caps,
guest_archs[i].hvm ? "hvm" : "xen",
guest_archs[i].arch,
- (hostarch == VIR_ARCH_X86_64 ?
- "/usr/lib64/xen/bin/qemu-dm" :
- "/usr/lib/xen/bin/qemu-dm"),
+ "qemu-dm" :
+ "qemu-dm"),
+ "qemu-dm",
(guest_archs[i].hvm ?
- "/usr/lib/xen-default/boot/hvmloader" :
+ "hvmloader" :
......
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Thu, 13 Dec 2012 17:21:54 +0100
Subject: Define SANLK_INQ_WAIT if missing in headers
so we can build with older sanlock (like 2.2)
---
src/locking/lock_driver_sanlock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index a072343..fe3a52f 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -334,6 +334,9 @@ retry:
if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) {
if (-rv == EINPROGRESS && --retries) {
#ifdef HAVE_SANLOCK_INQ_LOCKSPACE
+# ifndef SANLK_INQ_WAIT
+# define SANLK_INQ_WAIT 0x00000001
+# endif
/* we have this function which blocks until lockspace change the
* state. It returns 0 if lockspace has been added, -ENOENT if it
* hasn't. */
......@@ -8,7 +8,7 @@ until we debugged the interaction with pbuilder
1 file changed, 2 insertions(+)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e31f19a..c0fab45 100644
index aaa6acb..4caae06 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -496,10 +496,12 @@ mymain(void)
......
......@@ -7,12 +7,12 @@ Subject: Don't fail if we can't setup avahi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 6a5a53a..f0da93f 100644
index 95333d0..6809567 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -1079,8 +1079,7 @@ void virNetServerRun(virNetServerPtr srv)
@@ -1066,8 +1066,7 @@ void virNetServerRun(virNetServerPtr srv)
virNetServerLock(srv);
virObjectLock(srv);
- if (srv->mdns &&
- virNetServerMDNSStart(srv->mdns) < 0)
......
......@@ -6,14 +6,14 @@ This isn't a proper fix but it will make virt-manager at least start.
Closes: #663931
---
src/util/util.c | 2 +-
src/util/virutil.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/util.c b/src/util/util.c
index 05e7ca7..21b9333 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -3031,7 +3031,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 24ba954..4a42bad 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -3039,7 +3039,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
......
......@@ -10,10 +10,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 53ec9da..20050fa 100644
index 070a089..0fa184b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2005,9 +2005,6 @@ if WITH_NETWORK
@@ -2037,9 +2037,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
......@@ -24,10 +24,10 @@ index 53ec9da..20050fa 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
index 66857da..ec76a1b 100644
index 93a1069..9cc91e8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7343,9 +7343,6 @@ install-data-local: install-init install-systemd
@@ -7444,9 +7444,6 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
......
......@@ -13,7 +13,7 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 237a6ab..60f60ed 100644
index bfee56d..979cf3d 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2363,7 +2363,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
......
......@@ -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 3687a4d..21d95eb 100644
index e2a2aec..32382ea 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
......
......@@ -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 fa10600..a4b5e7b 100644
index 6506f9d..8737cbc 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1593,7 +1593,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment