- Remove upstream patches.

0001-launch-direct-Omit-locking-option-for-non-file-disks.patch

@@ -1,36 +0,0 @@
-From 35320dd0edb94d09d231bcded57aa883a5e7c784 Mon Sep 17 00:00:00 2001
-From: Lars Seipel <ls@slrz.net>
-Date: Thu, 23 Nov 2017 06:15:28 +0100
-Subject: [PATCH] launch: direct: Omit locking option for non-file disks
- (RHBZ#1516094)
-
-QEMU does not accept options unrecognized by the block driver
-in use. Disable locking only for read-only disks that are
-file-backed, as that's the only block driver it is supported
-with.
-
-Signed-off-by: Lars Seipel <ls@slrz.net>
----
- lib/launch-direct.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/launch-direct.c b/lib/launch-direct.c
-index 87ac121c7..678c8c68d 100644
---- a/lib/launch-direct.c
-+++ b/lib/launch-direct.c
-@@ -260,7 +260,11 @@ add_drive_standard_params (guestfs_h *g, struct backend_direct_data *data,
-     append_list ("cache=unsafe");
-     if (drv->disk_label)
-       append_list_format ("serial=%s", drv->disk_label);
--    if (data->qemu_mandatory_locking)
-+
-+    /* Add the file-specific locking option only for files, as qemu
-+     * won't accept options unknown to the block driver in use.
-+     */
-+    if (data->qemu_mandatory_locking && drv->src.protocol == drive_protocol_file)
-       append_list ("file.backing.file.locking=off");
-   }
- 
--- 
-2.15.1
-

0001-lib-libvirt-stop-using-shareable-for-appliance-disk-.patch

@@ -1,47 +0,0 @@
-From 614f680dc67d98d16eb21a131cc43db24d08b758 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <ptoscano@redhat.com>
-Date: Tue, 5 Dec 2017 15:36:34 +0100
-Subject: [PATCH] lib: libvirt: stop using <shareable/> for appliance disk
- (RHBZ#1518517)
-
-Commit aa9e0057b19e29f76c9a81f9aebeeb1cb5bf1fdb made the libvirt backend
-use <shareable/> for the disk of the appliance, since at that time all
-the instances were using the disk directly.
-OTOH, commit 3ad44c866042919374e2d840502e53da2ed8aef0 switched to
-overlays for read-only disks, including the appliance, so effectively
-protecting the appliance.
-
-Because of this, the libvirt backend does not need <shareable/> anymore.
-
-Thanks to: Daniel Berrange, Richard W.M. Jones,  Peter Krempa.
----
- lib/launch-libvirt.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
-index e5121799e..5aae1b611 100644
---- a/lib/launch-libvirt.c
-+++ b/lib/launch-libvirt.c
-@@ -985,10 +985,6 @@ static int construct_libvirt_xml_appliance (guestfs_h *g, const struct libvirt_x
-     }						\
-   } while (0)
- 
--/* <element/> */
--#define empty_element(element)					\
--  do { start_element(element) {} end_element (); } while (0)
--
- /* key=value attribute of the current element. */
- #define attribute(key,value)                                            \
-   if (xmlTextWriterWriteAttribute (xo, BAD_CAST (key), BAD_CAST (value)) == -1){ \
-@@ -1787,8 +1783,6 @@ construct_libvirt_xml_appliance (guestfs_h *g,
-         == -1)
-       return -1;
- 
--    empty_element ("shareable");
--
-   } end_element ();
- 
-   return 0;
--- 
-2.13.2
-

libguestfs.spec

@@ -60,12 +60,6 @@ Source6:       yum.conf.in
 Source7:       libguestfs.keyring
 %endif
 
-# Upstream patch to fix locking on NBD drives.
-Patch1:        0001-launch-direct-Omit-locking-option-for-non-file-disks.patch
-
-# Upstream patch to remove <shareable/> for libvirt >= 3.10.
-Patch2:        0001-lib-libvirt-stop-using-shareable-for-appliance-disk-.patch
-
 # Basic build requirements for the library and virt tools.
 BuildRequires: gcc
 BuildRequires: supermin-devel >= 5.1.18
@@ -1399,6 +1393,7 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 %changelog
 * Sun Dec 10 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.37.35-1
 - New upstream version 1.37.35.
+- Remove upstream patches.
 
 * Thu Dec  7 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.37.34-4
 - Remove <shareable/> for libvirt >= 3.10.