[Pkg-libvirt-commits] [libvirt] 03/09: Rediff patches
Guido Guenther
agx at moszumanska.debian.org
Fri Dec 4 17:31:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.3.0_rc1-1
in repository libvirt.
commit f4cbf4a55e9b0f49ea2c7e5b2d7f27d61dfa1fa7
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Dec 4 11:12:59 2015 +0100
Rediff patches
Dropped Disable-service-timeout-for-libvirt-guests.patch: Applied upstream
Dropped qemu-Handle-default-IDE-controller-on-other-machine-types.patch: Fixed upstream
---
...isable-service-timeout-for-libvirt-guests.patch | 21 ----
...duce-udevadm-settle-timeout-to-10-seconds.patch | 4 +-
.../debian/Debianize-systemd-service-files.patch | 2 +-
.../Don-t-enable-default-network-on-boot.patch | 8 +-
debian/patches/debian/remove-RHism.diff.patch | 2 +-
...ult-IDE-controller-on-other-machine-types.patch | 121 ---------------------
debian/patches/series | 2 -
7 files changed, 8 insertions(+), 152 deletions(-)
diff --git a/debian/patches/Disable-service-timeout-for-libvirt-guests.patch b/debian/patches/Disable-service-timeout-for-libvirt-guests.patch
deleted file mode 100644
index fc5d601..0000000
--- a/debian/patches/Disable-service-timeout-for-libvirt-guests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 17 Nov 2015 17:05:30 +0100
-Subject: Disable service timeout for libvirt-guests
-
-Closes: #803714
----
- tools/libvirt-guests.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index fc353f0..cb1d7bd 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -13,6 +13,7 @@ ExecStop=@libexecdir@/libvirt-guests.sh stop
- Type=oneshot
- RemainAfterExit=yes
- StandardOutput=journal+console
-+TimeoutStopSec=0
-
- [Install]
- WantedBy=multi-user.target
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 46bd9c6..f18c655 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 cddc78a..e99a86e 100644
+index fe65faf..d8e83ef 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1486,7 +1486,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1519,7 +1519,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 56504e6..765467e 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -23,7 +23,7 @@ index 9e67e43..d9b0841 100644
KillMode=process
Restart=on-failure
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index cc04b6d..fc353f0 100644
+index c31f663..cb1d7bd 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
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 72cabe1..9dc12c6 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 99b4993..f1df9ac 100644
+index 7219f7c..87f25de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2840,9 +2840,6 @@ if WITH_NETWORK
+@@ -2984,9 +2984,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 99b4993..f1df9ac 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index d178262..36e699d 100644
+index 75ad6f0..2e53de7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -10564,9 +10564,6 @@ install-data-local: install-init install-systemd
+@@ -10841,9 +10841,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 81ce9b5..2fea63e 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 0212e7a..3739f9d 100644
+index 21ae4a3..3951c11 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/qemu-Handle-default-IDE-controller-on-other-machine-types.patch b/debian/patches/qemu-Handle-default-IDE-controller-on-other-machine-types.patch
deleted file mode 100644
index 0114a08..0000000
--- a/debian/patches/qemu-Handle-default-IDE-controller-on-other-machine-types.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 18 Nov 2015 19:37:47 +0100
-Subject: qemu: Handle default IDE controller on other machine types as well
-
-like ppc g3beige, sparc64s sun4u and qemu: MIPS{,64} malta
-
-Closes: #805189
----
- src/qemu/qemu_command.c | 34 ++++++++++++++++++++++++----------
- src/qemu/qemu_domain.c | 21 +++++++++++++++++++++
- src/qemu/qemu_domain.h | 3 +++
- 3 files changed, 48 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 8824541..018544c 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -1084,11 +1084,15 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- */
- return virAsprintf(&controller->info.alias, "pci.%d", controller->idx);
- } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) {
-- /* for any machine based on I440FX, the first (and currently
-- * only) IDE controller is an integrated controller hardcoded
-- * with id "ide"
-+ /* for any machine based on I440FX, G3Beige, Sun4u or Malta, the
-+ * first (and currently only) IDE controller is an integrated
-+ * controller hardcoded with id "ide"
- */
-- if (qemuDomainMachineIsI440FX(domainDef) && controller->idx == 0)
-+ if ((qemuDomainMachineIsI440FX(domainDef) ||
-+ qemuDomainMachineIsSun4u(domainDef) ||
-+ qemuDomainMachineIsMalta(domainDef) ||
-+ qemuDomainMachineIsG3Beige(domainDef)) &&
-+ controller->idx == 0)
- return VIR_STRDUP(controller->info.alias, "ide");
- } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) {
- /* for any Q35 machine, the first SATA controller is the
-@@ -4952,11 +4956,17 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
- break;
-
- case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
-- /* Since we currently only support the integrated IDE controller
-- * on 440fx, if we ever get to here, it's because some other
-- * machinetype had an IDE controller specified, or a 440fx had
-- * multiple ide controllers.
-+ /* Since we currently only support the integrated IDE
-+ * controller on 440fx, G3Beige, Sun4u and Malta, if we ever
-+ * get to here, it's because some other machinetype had an IDE
-+ * controller specified, or a 440fx had multiple ide
-+ * controllers.
- */
-+ if (qemuDomainMachineIsG3Beige(domainDef) ||
-+ qemuDomainMachineIsMalta(domainDef) ||
-+ qemuDomainMachineIsSun4u(domainDef))
-+ break;
-+
- if (qemuDomainMachineIsI440FX(domainDef))
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Only a single IDE controller is unsupported "
-@@ -10062,9 +10072,13 @@ qemuBuildCommandLine(virConnectPtr conn,
- cont->idx == 0 && qemuDomainMachineIsQ35(def))
- continue;
-
-- /* first IDE controller on i440fx machines is implicit */
-+ /* first IDE controller on i440fx, G3Beige, Sun4u and
-+ * Malta machines is implicit */
- if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
-- cont->idx == 0 && qemuDomainMachineIsI440FX(def))
-+ cont->idx == 0 && (qemuDomainMachineIsI440FX(def) ||
-+ qemuDomainMachineIsSun4u(def) ||
-+ qemuDomainMachineIsMalta(def) ||
-+ qemuDomainMachineIsG3Beige(def)))
- continue;
-
- if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 890d8ed..5e4b5c3 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3552,6 +3552,27 @@ qemuDomainMachineIsS390CCW(const virDomainDef *def)
- }
-
-
-+bool
-+qemuDomainMachineIsG3Beige(const virDomainDef *def)
-+{
-+ return STREQ(def->os.machine, "g3beige");
-+}
-+
-+
-+bool
-+qemuDomainMachineIsSun4u(const virDomainDef *def)
-+{
-+ return STREQ(def->os.machine, "sun4u");
-+}
-+
-+
-+bool
-+qemuDomainMachineIsMalta(const virDomainDef *def)
-+{
-+ return STREQ(def->os.machine, "malta");
-+}
-+
-+
- /**
- * qemuDomainUpdateCurrentMemorySize:
- *
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 64cd7e1..7ea685f 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -478,6 +478,9 @@ bool qemuDomainMachineIsQ35(const virDomainDef *def);
- bool qemuDomainMachineIsI440FX(const virDomainDef *def);
- bool qemuDomainMachineNeedsFDC(const virDomainDef *def);
- bool qemuDomainMachineIsS390CCW(const virDomainDef *def);
-+bool qemuDomainMachineIsG3Beige(const virDomainDef *def);
-+bool qemuDomainMachineIsSun4u(const virDomainDef *def);
-+bool qemuDomainMachineIsMalta(const virDomainDef *def);
-
- int qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver,
- virDomainObjPtr vm);
diff --git a/debian/patches/series b/debian/patches/series
index 6b25944..a1b31c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,5 +13,3 @@ debian/Use-upstreams-polkit-rule.patch
Allow-access-to-libnl-3-config-files.patch
debian/apparmor_profiles_local_include.patch
debian/libsystemd.patch
-Disable-service-timeout-for-libvirt-guests.patch
-qemu-Handle-default-IDE-controller-on-other-machine-types.patch
--
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