qemu-git: Drop merged patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Sep 26 20:58:27 2017 +0200
Changeset:	3f4f3c73bacfb6bdc5572cc60f5ba52c3c9e844b

Modified Files:
	qemu-git/distinfo
Removed Files:
	qemu-git/patches/patch-hw_scsi_esp.c
	qemu-git/patches/patch-hw_usb_dev-mtp.c
	qemu-git/patches/patch-memory.c

Log Message:
qemu-git: Drop merged patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3f4f3c73bacfb6bdc5572cc60f5ba52c3c9e844b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/distinfo                       |  3 --
 qemu-git/patches/patch-hw_scsi_esp.c    | 49 -------------------
 qemu-git/patches/patch-hw_usb_dev-mtp.c | 15 ------
 qemu-git/patches/patch-memory.c         | 83 ---------------------------------
 4 files changed, 150 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 27e568d148..70e435446a 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,7 +4,4 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-hw_scsi_esp.c) = aa7030ac8d09082bd57044e6a0d4e2fc5c066a45
-SHA1 (patch-hw_usb_dev-mtp.c) = abd0146b4369146bdcd1038906b057c3d0362e80
-SHA1 (patch-memory.c) = 30074f7f93c79dfc22ad4fb745f9e34941f831e6
 SHA1 (patch-tests_Makefile.include) = a1dab206f61947079602d1bafcefc419b5d17881
diff --git a/qemu-git/patches/patch-hw_scsi_esp.c b/qemu-git/patches/patch-hw_scsi_esp.c
deleted file mode 100644
index 84164b4e1e..0000000000
--- a/qemu-git/patches/patch-hw_scsi_esp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
---- hw/scsi/esp.c.orig	2017-08-25 15:26:30.000000000 +0000
-+++ hw/scsi/esp.c
-@@ -593,7 +593,7 @@ const VMStateDescription vmstate_esp = {
- };
- 
- #define TYPE_ESP "esp"
--#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
-+#define QESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
- 
- typedef struct {
-     /*< private >*/
-@@ -644,7 +644,7 @@ void esp_init(hwaddr espaddr, int it_shi
-     ESPState *esp;
- 
-     dev = qdev_create(NULL, TYPE_ESP);
--    sysbus = ESP(dev);
-+    sysbus = QESP(dev);
-     esp = &sysbus->esp;
-     esp->dma_memory_read = dma_memory_read;
-     esp->dma_memory_write = dma_memory_write;
-@@ -672,7 +672,7 @@ static const struct SCSIBusInfo esp_scsi
- 
- static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
- {
--    SysBusESPState *sysbus = ESP(opaque);
-+    SysBusESPState *sysbus = QESP(opaque);
-     ESPState *s = &sysbus->esp;
- 
-     switch (irq) {
-@@ -688,7 +688,7 @@ static void sysbus_esp_gpio_demux(void *
- static void sysbus_esp_realize(DeviceState *dev, Error **errp)
- {
-     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
--    SysBusESPState *sysbus = ESP(dev);
-+    SysBusESPState *sysbus = QESP(dev);
-     ESPState *s = &sysbus->esp;
- 
-     sysbus_init_irq(sbd, &s->irq);
-@@ -706,7 +706,7 @@ static void sysbus_esp_realize(DeviceSta
- 
- static void sysbus_esp_hard_reset(DeviceState *dev)
- {
--    SysBusESPState *sysbus = ESP(dev);
-+    SysBusESPState *sysbus = QESP(dev);
-     esp_hard_reset(&sysbus->esp);
- }
- 
diff --git a/qemu-git/patches/patch-hw_usb_dev-mtp.c b/qemu-git/patches/patch-hw_usb_dev-mtp.c
deleted file mode 100644
index cb15a69e6d..0000000000
--- a/qemu-git/patches/patch-hw_usb_dev-mtp.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- hw/usb/dev-mtp.c.orig	2017-08-25 15:26:30.000000000 +0000
-+++ hw/usb/dev-mtp.c
-@@ -26,6 +26,10 @@
- #include "hw/usb.h"
- #include "hw/usb/desc.h"
- 
-+#ifndef NAME_MAX
-+#define NAME_MAX 255
-+#endif
-+
- /* ----------------------------------------------------------------------- */
- 
- enum mtp_container_type {
diff --git a/qemu-git/patches/patch-memory.c b/qemu-git/patches/patch-memory.c
deleted file mode 100644
index 0ef2d0f5ee..0000000000
--- a/qemu-git/patches/patch-memory.c
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD$
-
---- memory.c.orig	2017-08-25 15:26:31.000000000 +0000
-+++ memory.c
-@@ -2701,10 +2701,10 @@ typedef struct MemoryRegionList MemoryRe
- 
- struct MemoryRegionList {
-     const MemoryRegion *mr;
--    QTAILQ_ENTRY(MemoryRegionList) queue;
-+    QTAILQ_ENTRY(MemoryRegionList) mrqueue;
- };
- 
--typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
-+typedef QTAILQ_HEAD(mrqueue, MemoryRegionList) MemoryRegionListHead;
- 
- #define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \
-                            int128_sub((size), int128_one())) : 0)
-@@ -2746,7 +2746,7 @@ static void mtree_print_mr(fprintf_funct
-         bool found = false;
- 
-         /* check if the alias is already in the queue */
--        QTAILQ_FOREACH(ml, alias_print_queue, queue) {
-+        QTAILQ_FOREACH(ml, alias_print_queue, mrqueue) {
-             if (ml->mr == mr->alias) {
-                 found = true;
-             }
-@@ -2755,7 +2755,7 @@ static void mtree_print_mr(fprintf_funct
-         if (!found) {
-             ml = g_new(MemoryRegionList, 1);
-             ml->mr = mr->alias;
--            QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
-+            QTAILQ_INSERT_TAIL(alias_print_queue, ml, mrqueue);
-         }
-         mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx
-                    " (prio %d, %s): alias %s @%s " TARGET_FMT_plx
-@@ -2783,26 +2783,26 @@ static void mtree_print_mr(fprintf_funct
-     QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
-         new_ml = g_new(MemoryRegionList, 1);
-         new_ml->mr = submr;
--        QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
-+        QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) {
-             if (new_ml->mr->addr < ml->mr->addr ||
-                 (new_ml->mr->addr == ml->mr->addr &&
-                  new_ml->mr->priority > ml->mr->priority)) {
--                QTAILQ_INSERT_BEFORE(ml, new_ml, queue);
-+                QTAILQ_INSERT_BEFORE(ml, new_ml, mrqueue);
-                 new_ml = NULL;
-                 break;
-             }
-         }
-         if (new_ml) {
--            QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue);
-+            QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, mrqueue);
-         }
-     }
- 
--    QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
-+    QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) {
-         mtree_print_mr(mon_printf, f, ml->mr, level + 1, cur_start,
-                        alias_print_queue);
-     }
- 
--    QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, queue, next_ml) {
-+    QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, mrqueue, next_ml) {
-         g_free(ml);
-     }
- }
-@@ -2872,13 +2872,13 @@ void mtree_info(fprintf_function mon_pri
-     }
- 
-     /* print aliased regions */
--    QTAILQ_FOREACH(ml, &ml_head, queue) {
-+    QTAILQ_FOREACH(ml, &ml_head, mrqueue) {
-         mon_printf(f, "memory-region: %s\n", memory_region_name(ml->mr));
-         mtree_print_mr(mon_printf, f, ml->mr, 1, 0, &ml_head);
-         mon_printf(f, "\n");
-     }
- 
--    QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
-+    QTAILQ_FOREACH_SAFE(ml, &ml_head, mrqueue, ml2) {
-         g_free(ml);
-     }
- }