mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
xen: remove unreferenced patches
This commit is contained in:
parent
8a249aa732
commit
745a8ea503
5 changed files with 0 additions and 531 deletions
|
@ -1,104 +0,0 @@
|
|||
From bd71555985efc423b1a119b6a3177de855763453 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Date: Tue, 20 Jan 2015 11:26:30 +0100
|
||||
Subject: [PATCH] libxl: Spice image compression setting support for upstream
|
||||
qemu
|
||||
|
||||
Usage:
|
||||
spice_image_compression=[auto_glz|auto_lz|quic|glz|lz|off]
|
||||
|
||||
Specifies what image compression is to be used by spice (if given),
|
||||
otherwise the qemu default will be used.
|
||||
|
||||
Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Acked-by: Wei Liu <wei.liu2@citrix.com>
|
||||
---
|
||||
docs/man/xl.cfg.pod.5 | 6 ++++++
|
||||
tools/libxl/libxl.h | 11 +++++++++++
|
||||
tools/libxl/libxl_dm.c | 4 ++++
|
||||
tools/libxl/libxl_types.idl | 1 +
|
||||
tools/libxl/xl_cmdimpl.c | 2 ++
|
||||
5 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
|
||||
index e2f91fc..0c2cbac 100644
|
||||
--- a/docs/man/xl.cfg.pod.5
|
||||
+++ b/docs/man/xl.cfg.pod.5
|
||||
@@ -1427,6 +1427,12 @@ for redirection of up to 4 usb devices from spice client to domU's qemu.
|
||||
It requires an usb controller and if not defined it will automatically adds
|
||||
an usb2 controller. The default is disabled (0).
|
||||
|
||||
+=item B<spice_image_compression=[auto_glz|auto_lz|quic|glz|lz|off]>
|
||||
+
|
||||
+Specifies what image compression is to be used by spice (if given), otherwise
|
||||
+the qemu default will be used. Please see documentations of your current qemu
|
||||
+version for details.
|
||||
+
|
||||
=back
|
||||
|
||||
=head3 Miscellaneous Emulated Hardware
|
||||
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
|
||||
index 0a123f1..b8e0b67 100644
|
||||
--- a/tools/libxl/libxl.h
|
||||
+++ b/tools/libxl/libxl.h
|
||||
@@ -528,6 +528,17 @@ typedef struct libxl__ctx libxl_ctx;
|
||||
#define LIBXL_HAVE_SPICE_USBREDIREDIRECTION 1
|
||||
|
||||
/*
|
||||
+ * LIBXL_HAVE_SPICE_IMAGECOMPRESSION
|
||||
+ *
|
||||
+ * If defined, then the libxl_spice_info structure will contain a string type
|
||||
+ * field: image_compression. This value defines what Spice image compression
|
||||
+ * is used.
|
||||
+ *
|
||||
+ * If this is not defined, the Spice image compression setting support is ignored.
|
||||
+ */
|
||||
+#define LIBXL_HAVE_SPICE_IMAGECOMPRESSION 1
|
||||
+
|
||||
+/*
|
||||
* LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1
|
||||
*
|
||||
* If this is defined, libxl_domain_create_restore()'s API has changed to
|
||||
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
|
||||
index c2b0487..40c8649 100644
|
||||
--- a/tools/libxl/libxl_dm.c
|
||||
+++ b/tools/libxl/libxl_dm.c
|
||||
@@ -398,6 +398,10 @@ static char *dm_spice_options(libxl__gc *gc,
|
||||
if (!libxl_defbool_val(spice->clipboard_sharing))
|
||||
opt = libxl__sprintf(gc, "%s,disable-copy-paste", opt);
|
||||
|
||||
+ if (spice->image_compression)
|
||||
+ opt = libxl__sprintf(gc, "%s,image-compression=%s", opt,
|
||||
+ spice->image_compression);
|
||||
+
|
||||
return opt;
|
||||
}
|
||||
|
||||
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
|
||||
index 1214d2e..052ded9 100644
|
||||
--- a/tools/libxl/libxl_types.idl
|
||||
+++ b/tools/libxl/libxl_types.idl
|
||||
@@ -241,6 +241,7 @@ libxl_spice_info = Struct("spice_info", [
|
||||
("vdagent", libxl_defbool),
|
||||
("clipboard_sharing", libxl_defbool),
|
||||
("usbredirection", integer),
|
||||
+ ("image_compression", string),
|
||||
])
|
||||
|
||||
libxl_sdl_info = Struct("sdl_info", [
|
||||
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
|
||||
index 0b02a6c..00aa69d 100644
|
||||
--- a/tools/libxl/xl_cmdimpl.c
|
||||
+++ b/tools/libxl/xl_cmdimpl.c
|
||||
@@ -1948,6 +1948,8 @@ skip_vfb:
|
||||
&b_info->u.hvm.spice.clipboard_sharing, 0);
|
||||
if (!xlu_cfg_get_long (config, "spiceusbredirection", &l, 0))
|
||||
b_info->u.hvm.spice.usbredirection = l;
|
||||
+ xlu_cfg_replace_string (config, "spice_image_compression",
|
||||
+ &b_info->u.hvm.spice.image_compression, 0);
|
||||
xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0);
|
||||
xlu_cfg_get_defbool(config, "gfx_passthru",
|
||||
&b_info->u.hvm.gfx_passthru, 0);
|
||||
--
|
||||
1.9.2
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
From 296c7f3284efe655d95a8ae045a5dc1a20d6fff0 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Date: Tue, 20 Jan 2015 11:33:17 +0100
|
||||
Subject: [PATCH] libxl: Spice streaming video setting support for upstream
|
||||
qemu
|
||||
|
||||
Usage:
|
||||
spice_streaming_video=[filter|all|off]
|
||||
|
||||
Specifies what streaming video setting is to be used by spice (if
|
||||
given),
|
||||
otherwise the qemu default will be used.
|
||||
|
||||
Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Acked-by: Wei Liu <wei.liu2@citrix.com>
|
||||
---
|
||||
docs/man/xl.cfg.pod.5 | 5 +++++
|
||||
tools/libxl/libxl.h | 11 +++++++++++
|
||||
tools/libxl/libxl_dm.c | 4 ++++
|
||||
tools/libxl/libxl_types.idl | 1 +
|
||||
tools/libxl/xl_cmdimpl.c | 2 ++
|
||||
5 files changed, 23 insertions(+)
|
||||
|
||||
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
|
||||
index 0c2cbac..408653f 100644
|
||||
--- a/docs/man/xl.cfg.pod.5
|
||||
+++ b/docs/man/xl.cfg.pod.5
|
||||
@@ -1433,6 +1433,11 @@ Specifies what image compression is to be used by spice (if given), otherwise
|
||||
the qemu default will be used. Please see documentations of your current qemu
|
||||
version for details.
|
||||
|
||||
+=item B<spice_streaming_video=[filter|all|off]>
|
||||
+
|
||||
+Specifies what streaming video setting is to be used by spice (if given),
|
||||
+otherwise the qemu default will be used.
|
||||
+
|
||||
=back
|
||||
|
||||
=head3 Miscellaneous Emulated Hardware
|
||||
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
|
||||
index b8e0b67..c219f59 100644
|
||||
--- a/tools/libxl/libxl.h
|
||||
+++ b/tools/libxl/libxl.h
|
||||
@@ -539,6 +539,17 @@ typedef struct libxl__ctx libxl_ctx;
|
||||
#define LIBXL_HAVE_SPICE_IMAGECOMPRESSION 1
|
||||
|
||||
/*
|
||||
+ * LIBXL_HAVE_SPICE_STREAMINGVIDEO
|
||||
+ *
|
||||
+ * If defined, then the libxl_spice_info structure will contain a string type
|
||||
+ * field: streaming_video. This value defines what Spice streaming video setting
|
||||
+ * is used.
|
||||
+ *
|
||||
+ * If this is not defined, the Spice streaming video setting support is ignored.
|
||||
+ */
|
||||
+#define LIBXL_HAVE_SPICE_STREAMINGVIDEO 1
|
||||
+
|
||||
+/*
|
||||
* LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1
|
||||
*
|
||||
* If this is defined, libxl_domain_create_restore()'s API has changed to
|
||||
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
|
||||
index 40c8649..d8d6f0c 100644
|
||||
--- a/tools/libxl/libxl_dm.c
|
||||
+++ b/tools/libxl/libxl_dm.c
|
||||
@@ -402,6 +402,10 @@ static char *dm_spice_options(libxl__gc *gc,
|
||||
opt = libxl__sprintf(gc, "%s,image-compression=%s", opt,
|
||||
spice->image_compression);
|
||||
|
||||
+ if (spice->streaming_video)
|
||||
+ opt = libxl__sprintf(gc, "%s,streaming-video=%s", opt,
|
||||
+ spice->streaming_video);
|
||||
+
|
||||
return opt;
|
||||
}
|
||||
|
||||
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
|
||||
index 052ded9..02be466 100644
|
||||
--- a/tools/libxl/libxl_types.idl
|
||||
+++ b/tools/libxl/libxl_types.idl
|
||||
@@ -242,6 +242,7 @@ libxl_spice_info = Struct("spice_info", [
|
||||
("clipboard_sharing", libxl_defbool),
|
||||
("usbredirection", integer),
|
||||
("image_compression", string),
|
||||
+ ("streaming_video", string),
|
||||
])
|
||||
|
||||
libxl_sdl_info = Struct("sdl_info", [
|
||||
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
|
||||
index 00aa69d..b7eac29 100644
|
||||
--- a/tools/libxl/xl_cmdimpl.c
|
||||
+++ b/tools/libxl/xl_cmdimpl.c
|
||||
@@ -1950,6 +1950,8 @@ skip_vfb:
|
||||
b_info->u.hvm.spice.usbredirection = l;
|
||||
xlu_cfg_replace_string (config, "spice_image_compression",
|
||||
&b_info->u.hvm.spice.image_compression, 0);
|
||||
+ xlu_cfg_replace_string (config, "spice_streaming_video",
|
||||
+ &b_info->u.hvm.spice.streaming_video, 0);
|
||||
xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0);
|
||||
xlu_cfg_get_defbool(config, "gfx_passthru",
|
||||
&b_info->u.hvm.gfx_passthru, 0);
|
||||
--
|
||||
1.9.2
|
||||
|
|
@ -1,165 +0,0 @@
|
|||
From 161212ef02312c0681d2d809c8ff1e1f0ea6f6f9 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Date: Wed, 29 Apr 2015 11:20:28 +0200
|
||||
Subject: [PATCH] libxl: Add qxl vga interface support for upstream qemu
|
||||
|
||||
Usage:
|
||||
vga="qxl"
|
||||
|
||||
Qxl vga support many resolutions that not supported by stdvga,
|
||||
mainly the 16:9 ones and other high up to 2560x1600.
|
||||
With QXL you can get improved performance and smooth video also
|
||||
with high resolutions and high quality.
|
||||
Require their drivers installed in the domU and spice used
|
||||
otherwise act as a simple stdvga.
|
||||
|
||||
Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
|
||||
Signed-off-by: Zhou Peng <zpengxen@gmail.com>
|
||||
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
||||
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
||||
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
|
||||
---
|
||||
docs/man/xl.cfg.pod.5 | 10 +++++++++-
|
||||
tools/libxl/libxl.h | 10 ++++++++++
|
||||
tools/libxl/libxl_create.c | 13 +++++++++++++
|
||||
tools/libxl/libxl_dm.c | 8 ++++++++
|
||||
tools/libxl/libxl_types.idl | 1 +
|
||||
tools/libxl/xl_cmdimpl.c | 2 ++
|
||||
6 files changed, 43 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
|
||||
index f936dfc..8e4154f 100644
|
||||
--- a/docs/man/xl.cfg.pod.5
|
||||
+++ b/docs/man/xl.cfg.pod.5
|
||||
@@ -1360,6 +1360,9 @@ qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB,
|
||||
which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen
|
||||
device-model, the default and minimum is 8 MB.
|
||||
|
||||
+For B<qxl> vga, the default is both default and minimal 128MB.
|
||||
+If B<videoram> is set less than 128MB, an error will be triggered.
|
||||
+
|
||||
=item B<stdvga=BOOLEAN>
|
||||
|
||||
Select a standard VGA card with VBE (VESA BIOS Extensions) as the
|
||||
@@ -1371,9 +1374,14 @@ This option is deprecated, use vga="stdvga" instead.
|
||||
|
||||
=item B<vga="STRING">
|
||||
|
||||
-Selects the emulated video card (none|stdvga|cirrus).
|
||||
+Selects the emulated video card (none|stdvga|cirrus|qxl).
|
||||
The default is cirrus.
|
||||
|
||||
+In general, QXL should work with the Spice remote display protocol
|
||||
+for acceleration, and QXL driver is necessary in guest in this case.
|
||||
+QXL can also work with the VNC protocol, but it will be like a standard
|
||||
+VGA without acceleration.
|
||||
+
|
||||
=item B<vnc=BOOLEAN>
|
||||
|
||||
Allow access to the display via the VNC protocol. This enables the
|
||||
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
|
||||
index 44bd8e2..efc0617 100644
|
||||
--- a/tools/libxl/libxl.h
|
||||
+++ b/tools/libxl/libxl.h
|
||||
@@ -535,6 +535,16 @@ typedef struct libxl__ctx libxl_ctx;
|
||||
#define LIBXL_HAVE_DOMINFO_OUTSTANDING_MEMKB 1
|
||||
|
||||
/*
|
||||
+ * LIBXL_HAVE_QXL
|
||||
+ *
|
||||
+ * If defined, then the libxl_vga_interface_type will contain another value:
|
||||
+ * "QXL". This value define if qxl vga is supported.
|
||||
+ *
|
||||
+ * If this is not defined, the qxl vga support is missed.
|
||||
+ */
|
||||
+#define LIBXL_HAVE_QXL 1
|
||||
+
|
||||
+/*
|
||||
* LIBXL_HAVE_SPICE_VDAGENT
|
||||
*
|
||||
* If defined, then the libxl_spice_info structure will contain a boolean type:
|
||||
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
|
||||
index e5a343f..188f7df 100644
|
||||
--- a/tools/libxl/libxl_create.c
|
||||
+++ b/tools/libxl/libxl_create.c
|
||||
@@ -248,6 +248,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
|
||||
if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
|
||||
b_info->video_memkb = 0;
|
||||
break;
|
||||
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
|
||||
+ LOG(ERROR,"qemu upstream required for qxl vga");
|
||||
+ return ERROR_INVAL;
|
||||
+ break;
|
||||
case LIBXL_VGA_INTERFACE_TYPE_STD:
|
||||
if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
|
||||
b_info->video_memkb = 8 * 1024;
|
||||
@@ -272,6 +276,15 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
|
||||
if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
|
||||
b_info->video_memkb = 0;
|
||||
break;
|
||||
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
|
||||
+ if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) {
|
||||
+ b_info->video_memkb = (128 * 1024);
|
||||
+ } else if (b_info->video_memkb < (128 * 1024)) {
|
||||
+ LOG(ERROR,
|
||||
+ "128 Mib videoram is the minimum for qxl default");
|
||||
+ return ERROR_INVAL;
|
||||
+ }
|
||||
+ break;
|
||||
case LIBXL_VGA_INTERFACE_TYPE_STD:
|
||||
if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
|
||||
b_info->video_memkb = 16 * 1024;
|
||||
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
|
||||
index 30c1578..58c9b99 100644
|
||||
--- a/tools/libxl/libxl_dm.c
|
||||
+++ b/tools/libxl/libxl_dm.c
|
||||
@@ -251,6 +251,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc,
|
||||
case LIBXL_VGA_INTERFACE_TYPE_NONE:
|
||||
flexarray_append_pair(dm_args, "-vga", "none");
|
||||
break;
|
||||
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
|
||||
+ break;
|
||||
}
|
||||
|
||||
if (b_info->u.hvm.boot) {
|
||||
@@ -625,6 +627,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
|
||||
break;
|
||||
case LIBXL_VGA_INTERFACE_TYPE_NONE:
|
||||
break;
|
||||
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
|
||||
+ /* QXL have 2 ram regions, ram and vram */
|
||||
+ flexarray_append_pair(dm_args, "-device",
|
||||
+ GCSPRINTF("qxl-vga,vram_size_mb=%"PRIu64",ram_size_mb=%"PRIu64,
|
||||
+ (b_info->video_memkb/2/1024), (b_info->video_memkb/2/1024) ) );
|
||||
+ break;
|
||||
}
|
||||
|
||||
if (b_info->u.hvm.boot) {
|
||||
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
|
||||
index 117b61d..023b21e 100644
|
||||
--- a/tools/libxl/libxl_types.idl
|
||||
+++ b/tools/libxl/libxl_types.idl
|
||||
@@ -183,6 +183,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [
|
||||
(1, "CIRRUS"),
|
||||
(2, "STD"),
|
||||
(3, "NONE"),
|
||||
+ (4, "QXL"),
|
||||
], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS")
|
||||
|
||||
libxl_vendor_device = Enumeration("vendor_device", [
|
||||
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
|
||||
index 648ca08..526a1f6 100644
|
||||
--- a/tools/libxl/xl_cmdimpl.c
|
||||
+++ b/tools/libxl/xl_cmdimpl.c
|
||||
@@ -2115,6 +2115,8 @@ skip_vfb:
|
||||
b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
|
||||
} else if (!strcmp(buf, "none")) {
|
||||
b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE;
|
||||
+ } else if (!strcmp(buf, "qxl")) {
|
||||
+ b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL;
|
||||
} else {
|
||||
fprintf(stderr, "Unknown vga \"%s\" specified\n", buf);
|
||||
exit(1);
|
||||
--
|
||||
1.9.2
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
From 858dbaaeda33b05c1ac80aea0ba9a03924e09005 Mon Sep 17 00:00:00 2001
|
||||
From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
|
||||
Date: Wed, 9 May 2018 11:08:12 +0100
|
||||
Subject: [PATCH] libacpi: fixes for iasl >= 20180427
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
New versions of iasl have introduced improved C file generation, as
|
||||
reported in the changelog:
|
||||
|
||||
iASL: Enhanced the -tc option (which creates an AML hex file in C,
|
||||
suitable for import into a firmware project):
|
||||
1) Create a unique name for the table, to simplify use of multiple
|
||||
SSDTs.
|
||||
2) Add a protection #ifdef in the file, similar to a .h header file.
|
||||
|
||||
The net effect of that on generated files is:
|
||||
|
||||
-unsigned char AmlCode[] =
|
||||
+#ifndef __SSDT_S4_HEX__
|
||||
+#define __SSDT_S4_HEX__
|
||||
+
|
||||
+unsigned char ssdt_s4_aml_code[] =
|
||||
|
||||
The above example is from ssdt_s4.asl.
|
||||
|
||||
Fix the build with newer versions of iasl by stripping the '_aml_code'
|
||||
suffix from the variable name on generated files.
|
||||
|
||||
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
|
||||
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
||||
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
Release-acked-by: Juergen Gross <jgross@suse.com>
|
||||
---
|
||||
tools/libacpi/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
|
||||
index a47a658a25..c17f3924cc 100644
|
||||
--- a/tools/libacpi/Makefile
|
||||
+++ b/tools/libacpi/Makefile
|
||||
@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
|
||||
|
||||
$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
|
||||
iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
|
||||
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
|
||||
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
|
||||
rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
|
||||
|
||||
$(MK_DSDT): mk_dsdt.c
|
||||
@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
|
||||
|
||||
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
|
||||
iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
|
||||
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
|
||||
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
|
||||
echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
|
||||
mv -f $@.$(TMP_SUFFIX) $@
|
||||
rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
diff --git a/block/gluster.c b/block/gluster.c
|
||||
index 01b479fbb9..29552e1186 100644
|
||||
--- a/block/gluster.c
|
||||
+++ b/block/gluster.c
|
||||
@@ -15,6 +15,10 @@
|
||||
#include "qemu/uri.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
+#ifdef CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT
|
||||
+# define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL)
|
||||
+#endif
|
||||
+
|
||||
#define GLUSTER_OPT_FILENAME "filename"
|
||||
#define GLUSTER_OPT_VOLUME "volume"
|
||||
#define GLUSTER_OPT_PATH "path"
|
||||
@@ -613,7 +617,11 @@ static void qemu_gluster_complete_aio(void *opaque)
|
||||
/*
|
||||
* AIO callback routine called from GlusterFS thread.
|
||||
*/
|
||||
-static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg)
|
||||
+static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
|
||||
+#ifdef CONFIG_GLUSTERFS_IOCB_HAS_STAT
|
||||
+ struct glfs_stat *pre, struct glfs_stat *post,
|
||||
+#endif
|
||||
+ void *arg)
|
||||
{
|
||||
GlusterAIOCB *acb = (GlusterAIOCB *)arg;
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4b808f9d17..89fb27fd0d 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -301,6 +301,8 @@ glusterfs=""
|
||||
glusterfs_xlator_opt="no"
|
||||
glusterfs_discard="no"
|
||||
glusterfs_zerofill="no"
|
||||
+glusterfs_ftruncate_has_stat="no"
|
||||
+glusterfs_iocb_has_stat="no"
|
||||
archipelago="no"
|
||||
gtk=""
|
||||
gtkabi=""
|
||||
@@ -3444,6 +3446,38 @@ if test "$glusterfs" != "no" ; then
|
||||
if $pkg_config --atleast-version=6 glusterfs-api; then
|
||||
glusterfs_zerofill="yes"
|
||||
fi
|
||||
+ cat > $TMPC << EOF
|
||||
+#include <glusterfs/api/glfs.h>
|
||||
+
|
||||
+int
|
||||
+main(void)
|
||||
+{
|
||||
+ /* new glfs_ftruncate() passes two additional args */
|
||||
+ return glfs_ftruncate(NULL, 0, NULL, NULL);
|
||||
+}
|
||||
+EOF
|
||||
+ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then
|
||||
+ glusterfs_ftruncate_has_stat="yes"
|
||||
+ fi
|
||||
+ cat > $TMPC << EOF
|
||||
+#include <glusterfs/api/glfs.h>
|
||||
+
|
||||
+/* new glfs_io_cbk() passes two additional glfs_stat structs */
|
||||
+static void
|
||||
+glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, struct glfs_stat *poststat, void *data)
|
||||
+{}
|
||||
+
|
||||
+int
|
||||
+main(void)
|
||||
+{
|
||||
+ glfs_io_cbk iocb = &glusterfs_iocb;
|
||||
+ iocb(NULL, 0 , NULL, NULL, NULL);
|
||||
+ return 0;
|
||||
+}
|
||||
+EOF
|
||||
+ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then
|
||||
+ glusterfs_iocb_has_stat="yes"
|
||||
+ fi
|
||||
else
|
||||
if test "$glusterfs" = "yes" ; then
|
||||
feature_not_found "GlusterFS backend support" \
|
||||
@@ -5415,6 +5449,14 @@ if test "$archipelago" = "yes" ; then
|
||||
echo "ARCHIPELAGO_LIBS=$archipelago_libs" >> $config_host_mak
|
||||
fi
|
||||
|
||||
+if test "$glusterfs_ftruncate_has_stat" = "yes" ; then
|
||||
+ echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak
|
||||
+fi
|
||||
+
|
||||
+if test "$glusterfs_iocb_has_stat" = "yes" ; then
|
||||
+ echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak
|
||||
+fi
|
||||
+
|
||||
if test "$libssh2" = "yes" ; then
|
||||
echo "CONFIG_LIBSSH2=m" >> $config_host_mak
|
||||
echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak
|
Loading…
Reference in a new issue