| 1 |
commit: e45a57f08893a593681571c93af8e4f68b6dc97c |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 17:55:33 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 17:55:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/commit/?id=e45a57f0 |
| 7 |
|
| 8 |
Gentoo specific patches for 4.15.3 (or later) |
| 9 |
|
| 10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 11 |
|
| 12 |
xen-tools-4-qemu-fix-po-collision.patch | 26 +++++++++++++ |
| 13 |
xen-tools-4.16.0-qemu-bridge.patch | 69 --------------------------------- |
| 14 |
2 files changed, 26 insertions(+), 69 deletions(-) |
| 15 |
|
| 16 |
diff --git a/xen-tools-4-qemu-fix-po-collision.patch b/xen-tools-4-qemu-fix-po-collision.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..9304768 |
| 19 |
--- /dev/null |
| 20 |
+++ b/xen-tools-4-qemu-fix-po-collision.patch |
| 21 |
@@ -0,0 +1,26 @@ |
| 22 |
+diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile |
| 23 |
+index 705166e..2e7cdcb 100644 |
| 24 |
+--- a/tools/qemu-xen/po/Makefile |
| 25 |
++++ b/tools/qemu-xen/po/Makefile |
| 26 |
+@@ -30,7 +30,7 @@ install: $(OBJS) |
| 27 |
+ for obj in $(OBJS); do \ |
| 28 |
+ base=`basename $$obj .mo`; \ |
| 29 |
+ $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ |
| 30 |
+- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ |
| 31 |
++ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \ |
| 32 |
+ done |
| 33 |
+ |
| 34 |
+ %.mo: %.po |
| 35 |
+diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c |
| 36 |
+index c38146f..d3c331b 100644 |
| 37 |
+--- a/tools/qemu-xen/ui/gtk.c |
| 38 |
++++ b/tools/qemu-xen/ui/gtk.c |
| 39 |
+@@ -31,7 +31,7 @@ |
| 40 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 41 |
+ */ |
| 42 |
+ |
| 43 |
+-#define GETTEXT_PACKAGE "qemu" |
| 44 |
++#define GETTEXT_PACKAGE "xenqemu" |
| 45 |
+ #define LOCALEDIR "po" |
| 46 |
+ |
| 47 |
+ #include "qemu-common.h" |
| 48 |
|
| 49 |
diff --git a/xen-tools-4.16.0-qemu-bridge.patch b/xen-tools-4.16.0-qemu-bridge.patch |
| 50 |
deleted file mode 100644 |
| 51 |
index 886be18..0000000 |
| 52 |
--- a/xen-tools-4.16.0-qemu-bridge.patch |
| 53 |
+++ /dev/null |
| 54 |
@@ -1,69 +0,0 @@ |
| 55 |
-diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h |
| 56 |
-index 5d150808..1de01433 100644 |
| 57 |
---- a/tools/qemu-xen/include/net/net.h |
| 58 |
-+++ b/tools/qemu-xen/include/net/net.h |
| 59 |
-@@ -221,7 +221,7 @@ NetClientState *net_hub_port_find(int hub_id); |
| 60 |
- |
| 61 |
- #define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup" |
| 62 |
- #define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown" |
| 63 |
--#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" |
| 64 |
-+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" |
| 65 |
- #define DEFAULT_BRIDGE_INTERFACE "br0" |
| 66 |
- |
| 67 |
- void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); |
| 68 |
-diff --git a/tools/qemu-xen/meson.build b/tools/qemu-xen/meson.build |
| 69 |
-index b3e7ec0e..9cd36a43 100644 |
| 70 |
---- a/tools/qemu-xen/meson.build |
| 71 |
-+++ b/tools/qemu-xen/meson.build |
| 72 |
-@@ -2759,7 +2759,7 @@ if have_tools |
| 73 |
- endif |
| 74 |
- |
| 75 |
- if targetos == 'linux' |
| 76 |
-- executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), |
| 77 |
-+ executable('xen-bridge-helper', files('xen-bridge-helper.c'), |
| 78 |
- dependencies: [qemuutil, libcap_ng], |
| 79 |
- install: true, |
| 80 |
- install_dir: get_option('libexecdir')) |
| 81 |
-diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c |
| 82 |
-index a26e1663..8abc0e74 100644 |
| 83 |
---- a/tools/qemu-xen/qemu-bridge-helper.c |
| 84 |
-+++ b/tools/qemu-xen/qemu-bridge-helper.c |
| 85 |
-@@ -68,7 +68,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; |
| 86 |
- static void usage(void) |
| 87 |
- { |
| 88 |
- fprintf(stderr, |
| 89 |
-- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); |
| 90 |
-+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); |
| 91 |
- } |
| 92 |
- |
| 93 |
- static int parse_acl_file(const char *filename, ACLList *acl_list) |
| 94 |
-diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx |
| 95 |
-index 83aa59a9..87a898bd 100644 |
| 96 |
---- a/tools/qemu-xen/qemu-options.hx |
| 97 |
-+++ b/tools/qemu-xen/qemu-options.hx |
| 98 |
-@@ -2910,7 +2910,7 @@ SRST |
| 99 |
- If running QEMU as an unprivileged user, use the network helper |
| 100 |
- to configure the TAP interface and attach it to the bridge. |
| 101 |
- The default network helper executable is |
| 102 |
-- ``/path/to/qemu-bridge-helper`` and the default bridge device is |
| 103 |
-+ ``/path/to/xen-bridge-helper`` and the default bridge device is |
| 104 |
- ``br0``. |
| 105 |
- |
| 106 |
- ``fd``\ =h can be used to specify the handle of an already opened |
| 107 |
-@@ -2936,14 +2936,14 @@ SRST |
| 108 |
- #launch a QEMU instance with the default network helper to |
| 109 |
- #connect a TAP device to bridge br0 |
| 110 |
- |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \\ |
| 111 |
-- -netdev tap,id=n1,"helper=/path/to/qemu-bridge-helper" |
| 112 |
-+ -netdev tap,id=n1,"helper=/path/to/xen-bridge-helper" |
| 113 |
- |
| 114 |
- ``-netdev bridge,id=id[,br=bridge][,helper=helper]`` |
| 115 |
- Connect a host TAP network interface to a host bridge device. |
| 116 |
- |
| 117 |
- Use the network helper helper to configure the TAP interface and |
| 118 |
- attach it to the bridge. The default network helper executable is |
| 119 |
-- ``/path/to/qemu-bridge-helper`` and the default bridge device is |
| 120 |
-+ ``/path/to/xen-bridge-helper`` and the default bridge device is |
| 121 |
- ``br0``. |
| 122 |
- |
| 123 |
- Examples: |
Archives