SHA256
1
0
forked from pool/xen

- Update to Xen Version 4.6.0

xen-4.6.0-testing-src.tar.bz2
  mini-os.tar.bz2
  blktap2-no-uninit.patch
  stubdom-have-iovec.patch
- Renamed
  xsa149.patch to CVE-2015-7969-xsa149.patch
- Dropped patches now contained in tarball or unnecessary
  xen-4.5.2-testing-src.tar.bz2
  54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch
  54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch
  54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch
  54f4985f-libxl-fix-libvirtd-double-free.patch
  55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch
  551ac326-xentop-add-support-for-qdisk.patch
  552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch
  552d0fe8-x86-mtrr-include-asm-atomic.h.patch
  552d293b-x86-vMSI-X-honor-all-mask-requests.patch
  552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch
  5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch
  5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch
  5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch
  554c7aee-x86-provide-arch_fetch_and_add.patch
  554c7b00-arm-provide-arch_fetch_and_add.patch
  554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch
  55534b25-arm-provide-add_sized.patch
  5555a4f8-use-ticket-locks-for-spin-locks.patch
  5555a5b9-x86-arm-remove-asm-spinlock-h.patch
  5555a8ec-introduce-non-contiguous-allocation.patch
  556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
This commit is contained in:
Charles Arnold
2015-11-11 17:04:52 +00:00
committed by Git OBS Bridge
parent 95031aabfd
commit 047483513a
114 changed files with 500 additions and 10098 deletions

View File

@@ -31,11 +31,11 @@ ee2e7e5 Merge pull request #1 from aaannz/pvscsi
7de6f49 support character devices too
c84381b allow /dev/sda as scsi devspec
f11e3a2 pvscsi
Index: xen-4.5.2-testing/docs/man/xl.cfg.pod.5
Index: xen-4.6.0-testing/docs/man/xl.cfg.pod.5
===================================================================
--- xen-4.5.2-testing.orig/docs/man/xl.cfg.pod.5
+++ xen-4.5.2-testing/docs/man/xl.cfg.pod.5
@@ -448,6 +448,36 @@ value is optional if this is a guest dom
--- xen-4.6.0-testing.orig/docs/man/xl.cfg.pod.5
+++ xen-4.6.0-testing/docs/man/xl.cfg.pod.5
@@ -506,6 +506,36 @@ value is optional if this is a guest dom
=back
@@ -72,11 +72,11 @@ Index: xen-4.5.2-testing/docs/man/xl.cfg.pod.5
=item B<vfb=[ "VFB_SPEC_STRING", "VFB_SPEC_STRING", ...]>
Specifies the paravirtual framebuffer devices which should be supplied
Index: xen-4.5.2-testing/docs/man/xl.pod.1
Index: xen-4.6.0-testing/docs/man/xl.pod.1
===================================================================
--- xen-4.5.2-testing.orig/docs/man/xl.pod.1
+++ xen-4.5.2-testing/docs/man/xl.pod.1
@@ -1323,6 +1323,26 @@ List virtual trusted platform modules fo
--- xen-4.6.0-testing.orig/docs/man/xl.pod.1
+++ xen-4.6.0-testing/docs/man/xl.pod.1
@@ -1293,6 +1293,26 @@ List virtual trusted platform modules fo
=back
@@ -103,11 +103,11 @@ Index: xen-4.5.2-testing/docs/man/xl.pod.1
=head1 PCI PASS-THROUGH
=over 4
Index: xen-4.5.2-testing/tools/libxl/libxl.c
Index: xen-4.6.0-testing/tools/libxl/libxl.c
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl.c
+++ xen-4.5.2-testing/tools/libxl/libxl.c
@@ -2324,6 +2324,273 @@ int libxl_devid_to_device_vtpm(libxl_ctx
--- xen-4.6.0-testing.orig/tools/libxl/libxl.c
+++ xen-4.6.0-testing/tools/libxl/libxl.c
@@ -2319,6 +2319,273 @@ int libxl_devid_to_device_vtpm(libxl_ctx
return rc;
}
@@ -381,7 +381,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
/******************************************************************************/
@@ -4199,6 +4466,8 @@ out:
@@ -4133,6 +4400,8 @@ out:
* libxl_device_vkb_destroy
* libxl_device_vfb_remove
* libxl_device_vfb_destroy
@@ -390,7 +390,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
*/
#define DEFINE_DEVICE_REMOVE(type, removedestroy, f) \
int libxl_device_##type##_##removedestroy(libxl_ctx *ctx, \
@@ -4254,6 +4523,10 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1)
@@ -4188,6 +4457,10 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1)
* 1. add support for secondary consoles to xenconsoled
* 2. dynamically add/remove qemu chardevs via qmp messages. */
@@ -401,7 +401,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
#undef DEFINE_DEVICE_REMOVE
/******************************************************************************/
@@ -4263,6 +4536,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1)
@@ -4197,6 +4470,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1)
* libxl_device_disk_add
* libxl_device_nic_add
* libxl_device_vtpm_add
@@ -409,7 +409,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
*/
#define DEFINE_DEVICE_ADD(type) \
@@ -4294,6 +4568,9 @@ DEFINE_DEVICE_ADD(nic)
@@ -4228,6 +4502,9 @@ DEFINE_DEVICE_ADD(nic)
/* vtpm */
DEFINE_DEVICE_ADD(vtpm)
@@ -419,7 +419,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
#undef DEFINE_DEVICE_ADD
/******************************************************************************/
@@ -6836,6 +7113,20 @@ out:
@@ -6780,6 +7057,20 @@ out:
return rc;
}
@@ -440,11 +440,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.c
/*
* Local variables:
* mode: C
Index: xen-4.5.2-testing/tools/libxl/libxl.h
Index: xen-4.6.0-testing/tools/libxl/libxl.h
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl.h
+++ xen-4.5.2-testing/tools/libxl/libxl.h
@@ -1238,6 +1238,26 @@ libxl_device_vtpm *libxl_device_vtpm_lis
--- xen-4.6.0-testing.orig/tools/libxl/libxl.h
+++ xen-4.6.0-testing/tools/libxl/libxl.h
@@ -1435,6 +1435,26 @@ libxl_device_vtpm *libxl_device_vtpm_lis
int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid,
libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo);
@@ -471,7 +471,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.h
/* Keyboard */
int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb,
const libxl_asyncop_how *ao_how)
@@ -1495,6 +1515,27 @@ int libxl_fd_set_nonblock(libxl_ctx *ctx
@@ -1740,6 +1760,27 @@ int libxl_fd_set_nonblock(libxl_ctx *ctx
#include <libxl_event.h>
@@ -499,11 +499,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl.h
#endif /* LIBXL_H */
/*
Index: xen-4.5.2-testing/tools/libxl/libxl_create.c
Index: xen-4.6.0-testing/tools/libxl/libxl_create.c
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl_create.c
+++ xen-4.5.2-testing/tools/libxl/libxl_create.c
@@ -1141,6 +1141,7 @@ static void domcreate_rebuild_done(libxl
--- xen-4.6.0-testing.orig/tools/libxl/libxl_create.c
+++ xen-4.6.0-testing/tools/libxl/libxl_create.c
@@ -1149,6 +1149,7 @@ static void domcreate_rebuild_done(libxl
libxl__multidev_begin(ao, &dcs->multidev);
dcs->multidev.callback = domcreate_launch_dm;
libxl__add_disks(egc, ao, domid, d_config, &dcs->multidev);
@@ -511,11 +511,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_create.c
libxl__multidev_prepared(egc, &dcs->multidev, 0);
return;
Index: xen-4.5.2-testing/tools/libxl/libxl_device.c
Index: xen-4.6.0-testing/tools/libxl/libxl_device.c
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl_device.c
+++ xen-4.5.2-testing/tools/libxl/libxl_device.c
@@ -541,6 +541,7 @@ void libxl__multidev_prepared(libxl__egc
--- xen-4.6.0-testing.orig/tools/libxl/libxl_device.c
+++ xen-4.6.0-testing/tools/libxl/libxl_device.c
@@ -543,6 +543,7 @@ void libxl__multidev_prepared(libxl__egc
* The following functions are defined:
* libxl__add_disks
* libxl__add_nics
@@ -523,7 +523,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_device.c
* libxl__add_vtpms
*/
@@ -560,10 +561,32 @@ void libxl__multidev_prepared(libxl__egc
@@ -562,10 +563,32 @@ void libxl__multidev_prepared(libxl__egc
DEFINE_DEVICES_ADD(disk)
DEFINE_DEVICES_ADD(nic)
@@ -556,11 +556,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_device.c
/******************************************************************************/
int libxl__device_destroy(libxl__gc *gc, libxl__device *dev)
Index: xen-4.5.2-testing/tools/libxl/libxl_internal.h
Index: xen-4.6.0-testing/tools/libxl/libxl_internal.h
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl_internal.h
+++ xen-4.5.2-testing/tools/libxl/libxl_internal.h
@@ -1094,6 +1094,7 @@ _hidden int libxl__device_disk_setdefaul
--- xen-4.6.0-testing.orig/tools/libxl/libxl_internal.h
+++ xen-4.6.0-testing/tools/libxl/libxl_internal.h
@@ -1185,6 +1185,7 @@ _hidden int libxl__device_disk_setdefaul
_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic,
uint32_t domid);
_hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm);
@@ -568,7 +568,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_internal.h
_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb);
_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb);
_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci);
@@ -2405,6 +2406,10 @@ _hidden void libxl__device_vtpm_add(libx
@@ -2561,6 +2562,10 @@ _hidden void libxl__device_vtpm_add(libx
libxl_device_vtpm *vtpm,
libxl__ao_device *aodev);
@@ -579,7 +579,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_internal.h
/* Internal function to connect a vkb device */
_hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid,
libxl_device_vkb *vkb);
@@ -3029,6 +3034,10 @@ _hidden void libxl__add_vtpms(libxl__egc
@@ -3277,6 +3282,10 @@ _hidden void libxl__add_vtpms(libxl__egc
libxl_domain_config *d_config,
libxl__multidev *multidev);
@@ -590,11 +590,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_internal.h
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
Index: xen-4.5.2-testing/tools/libxl/libxl_types.idl
Index: xen-4.6.0-testing/tools/libxl/libxl_types.idl
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl_types.idl
+++ xen-4.5.2-testing/tools/libxl/libxl_types.idl
@@ -540,6 +540,26 @@ libxl_device_channel = Struct("device_ch
--- xen-4.6.0-testing.orig/tools/libxl/libxl_types.idl
+++ xen-4.6.0-testing/tools/libxl/libxl_types.idl
@@ -617,6 +617,26 @@ libxl_device_channel = Struct("device_ch
])),
])
@@ -621,7 +621,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_types.idl
libxl_domain_config = Struct("domain_config", [
("c_info", libxl_domain_create_info),
("b_info", libxl_domain_build_info),
@@ -553,6 +573,8 @@ libxl_domain_config = Struct("domain_con
@@ -632,6 +652,8 @@ libxl_domain_config = Struct("domain_con
# a channel manifests as a console with a name,
# see docs/misc/channels.txt
("channels", Array(libxl_device_channel, "num_channels")),
@@ -630,7 +630,7 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_types.idl
("on_poweroff", libxl_action_on_shutdown),
("on_reboot", libxl_action_on_shutdown),
@@ -595,6 +617,28 @@ libxl_vtpminfo = Struct("vtpminfo", [
@@ -674,6 +696,28 @@ libxl_vtpminfo = Struct("vtpminfo", [
("uuid", libxl_uuid),
], dir=DIR_OUT)
@@ -659,10 +659,10 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_types.idl
libxl_vcpuinfo = Struct("vcpuinfo", [
("vcpuid", uint32),
("cpu", uint32),
Index: xen-4.5.2-testing/tools/libxl/libxl_types_internal.idl
Index: xen-4.6.0-testing/tools/libxl/libxl_types_internal.idl
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/libxl_types_internal.idl
+++ xen-4.5.2-testing/tools/libxl/libxl_types_internal.idl
--- xen-4.6.0-testing.orig/tools/libxl/libxl_types_internal.idl
+++ xen-4.6.0-testing/tools/libxl/libxl_types_internal.idl
@@ -22,6 +22,7 @@ libxl__device_kind = Enumeration("device
(6, "VKBD"),
(7, "CONSOLE"),
@@ -671,11 +671,11 @@ Index: xen-4.5.2-testing/tools/libxl/libxl_types_internal.idl
])
libxl__console_backend = Enumeration("console_backend", [
Index: xen-4.5.2-testing/tools/libxl/xl.h
Index: xen-4.6.0-testing/tools/libxl/xl.h
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/xl.h
+++ xen-4.5.2-testing/tools/libxl/xl.h
@@ -83,6 +83,9 @@ int main_channellist(int argc, char **ar
--- xen-4.6.0-testing.orig/tools/libxl/xl.h
+++ xen-4.6.0-testing/tools/libxl/xl.h
@@ -82,6 +82,9 @@ int main_channellist(int argc, char **ar
int main_blockattach(int argc, char **argv);
int main_blocklist(int argc, char **argv);
int main_blockdetach(int argc, char **argv);
@@ -685,10 +685,10 @@ Index: xen-4.5.2-testing/tools/libxl/xl.h
int main_vtpmattach(int argc, char **argv);
int main_vtpmlist(int argc, char **argv);
int main_vtpmdetach(int argc, char **argv);
Index: xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
Index: xen-4.6.0-testing/tools/libxl/xl_cmdimpl.c
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/xl_cmdimpl.c
+++ xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
--- xen-4.6.0-testing.orig/tools/libxl/xl_cmdimpl.c
+++ xen-4.6.0-testing/tools/libxl/xl_cmdimpl.c
@@ -17,6 +17,7 @@
#include "libxl_osdeps.h"
@@ -705,7 +705,7 @@ Index: xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
#include <xen/hvm/e820.h>
#include "libxl.h"
@@ -549,6 +551,122 @@ static void set_default_nic_values(libxl
@@ -626,6 +628,122 @@ static void set_default_nic_values(libxl
}
}
@@ -828,16 +828,16 @@ Index: xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
static void split_string_into_string_list(const char *str,
const char *delim,
libxl_string_list *psl)
@@ -918,7 +1036,7 @@ static void parse_config_data(const char
@@ -1261,7 +1379,7 @@ static void parse_config_data(const char
const char *buf;
long l;
long l, vcpus = 0;
XLU_Config *config;
- XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms;
+ XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms, *vscsis;
XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian;
XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs;
int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian;
int pci_power_mgmt = 0;
@@ -1421,6 +1539,66 @@ static void parse_config_data(const char
@@ -1782,6 +1900,66 @@ static void parse_config_data(const char
}
}
@@ -904,7 +904,7 @@ Index: xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) {
d_config->num_vtpms = 0;
d_config->vtpms = NULL;
@@ -6511,6 +6689,256 @@ int main_blockdetach(int argc, char **ar
@@ -6702,6 +6880,256 @@ int main_blockdetach(int argc, char **ar
return rc;
}
@@ -1161,11 +1161,11 @@ Index: xen-4.5.2-testing/tools/libxl/xl_cmdimpl.c
int main_vtpmattach(int argc, char **argv)
{
int opt;
Index: xen-4.5.2-testing/tools/libxl/xl_cmdtable.c
Index: xen-4.6.0-testing/tools/libxl/xl_cmdtable.c
===================================================================
--- xen-4.5.2-testing.orig/tools/libxl/xl_cmdtable.c
+++ xen-4.5.2-testing/tools/libxl/xl_cmdtable.c
@@ -372,6 +372,21 @@ struct cmd_spec cmd_table[] = {
--- xen-4.6.0-testing.orig/tools/libxl/xl_cmdtable.c
+++ xen-4.6.0-testing/tools/libxl/xl_cmdtable.c
@@ -351,6 +351,21 @@ struct cmd_spec cmd_table[] = {
"Destroy a domain's virtual block device",
"<Domain> <DevId>",
},