rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity
xen/xen-warnings-unused.diff
Charles Arnold 80e28a00ec - Update to Xen 4.2.0 FCS c/s 25844 
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed
  in 3.6-rc1

- bnc#778105 - first XEN-PV VM fails to spawn
  xend: Increase wait time for disk to appear in host bootloader
  Modified existing xen-domUloader.diff

- Disable the snapshot patches. Snapshot only supported the qcow2
  image format which was poorly implemented qemu 0.10.2. Snapshot
  support may be restored in the future when the newer upstream
  qemu is used by Xen.

- bnc#776995 - attaching scsi control luns with pvscsi
  - xend/pvscsi: fix passing of SCSI control LUNs
  xen-bug776995-pvscsi-no-devname.patch
  - xend/pvscsi: fix usage of persistant device names for SCSI devices
  xen-bug776995-pvscsi-persistent-names.patch
  - xend/pvscsi: update sysfs parser for Linux 3.0
  xen-bug776995-pvscsi-sysfs-parser.patch

- Update to Xen 4.2.0 RC3+ c/s 25779 

- Update to Xen 4.2.0 RC2+ c/s 25765

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
2012-09-17 15:49:23 +00:00

389 lines
15 KiB
Diff
Raw Blame History

Index: xen-4.2.0-testing/tools/misc/gtraceview.c
===================================================================
--- xen-4.2.0-testing.orig/tools/misc/gtraceview.c
+++ xen-4.2.0-testing/tools/misc/gtraceview.c
@@ -621,7 +621,8 @@ void crt_init(void)
void nr_addch(int nr, int ch)
{
int i;
- int y, x;
+ int x;
+ int __attribute__((__unused__)) y;
getyx(stdscr, y, x);
for (i = 0; i < nr; i++) {
if (x == COLS-1)
Index: xen-4.2.0-testing/tools/xcutils/xc_restore.c
===================================================================
--- xen-4.2.0-testing.orig/tools/xcutils/xc_restore.c
+++ xen-4.2.0-testing/tools/xcutils/xc_restore.c
@@ -19,7 +19,8 @@ int
main(int argc, char **argv)
{
unsigned int domid, store_evtchn, console_evtchn;
- unsigned int hvm, pae, apic;
+ unsigned int hvm, pae;
+ unsigned int __attribute__((__unused__)) apic;
xc_interface *xch;
int io_fd, ret;
int superpages;
Index: xen-4.2.0-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
===================================================================
--- xen-4.2.0-testing.orig/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
+++ xen-4.2.0-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
@@ -1064,7 +1064,7 @@ uint32_t HashLogEvent32(struct hlei *hle
uint32_t rc = 0;
uint16_t size;
uint32_t logdataptr;
- uint32_t logdatalen;
+ uint32_t __attribute__((__unused__)) logdatalen;
uint32_t hashdataptr;
uint32_t hashdatalen;
Index: xen-4.2.0-testing/tools/console/client/main.c
===================================================================
--- xen-4.2.0-testing.orig/tools/console/client/main.c
+++ xen-4.2.0-testing/tools/console/client/main.c
@@ -277,7 +277,8 @@ int main(int argc, char **argv)
};
char *dom_path = NULL, *path = NULL;
- int spty, xsfd;
+ int spty;
+ int __attribute__((__unused__)) xsfd;
struct xs_handle *xs;
char *end;
console_type type = CONSOLE_INVAL;
Index: xen-4.2.0-testing/tools/xenstat/xentop/xentop.c
===================================================================
--- xen-4.2.0-testing.orig/tools/xenstat/xentop/xentop.c
+++ xen-4.2.0-testing/tools/xenstat/xentop/xentop.c
@@ -278,7 +278,8 @@ static void fail(const char *str)
/* Return the row containing the cursor. */
static int current_row(void)
{
- int y, x;
+ int __attribute__((__unused__)) x;
+ int y;
getyx(stdscr, y, x);
return y;
}
@@ -286,7 +287,8 @@ static int current_row(void)
/* Return the number of lines on the screen. */
static int lines(void)
{
- int y, x;
+ int __attribute__((__unused__)) x;
+ int y;
getmaxyx(stdscr, y, x);
return y;
}
Index: xen-4.2.0-testing/tools/libxl/libxlu_cfg.c
===================================================================
--- xen-4.2.0-testing.orig/tools/libxl/libxlu_cfg.c
+++ xen-4.2.0-testing/tools/libxl/libxlu_cfg.c
@@ -406,7 +406,7 @@ char *xlu__cfgl_dequote(CfgParseContext
#define NUMERIC_CHAR(minlen,maxlen,base,basetext) do{ \
char numbuf[(maxlen)+1], *ep; \
- unsigned long val; \
+ unsigned long __attribute__((__unused__)) val; \
\
strncpy(numbuf,p,(maxlen)); \
numbuf[(maxlen)]= 0; \
Index: xen-4.2.0-testing/tools/libxl/libxl_pci.c
===================================================================
--- xen-4.2.0-testing.orig/tools/libxl/libxl_pci.c
+++ xen-4.2.0-testing/tools/libxl/libxl_pci.c
@@ -71,7 +71,7 @@ int libxl__create_pci_backend(libxl__gc
flexarray_t *front = NULL;
flexarray_t *back = NULL;
libxl__device device;
- int ret = ERROR_NOMEM, i;
+ int i;
front = flexarray_make(16, 1);
if (!front)
@@ -80,8 +80,6 @@ int libxl__create_pci_backend(libxl__gc
if (!back)
goto out;
- ret = 0;
-
LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend");
/* add pci device */
Index: xen-4.2.0-testing/tools/libxl/libxl_dom.c
===================================================================
--- xen-4.2.0-testing.orig/tools/libxl/libxl_dom.c
+++ xen-4.2.0-testing/tools/libxl/libxl_dom.c
@@ -565,7 +565,6 @@ int libxl__build_hvm(libxl__gc *gc, uint
LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, ret, "hvm build set params failed");
goto out;
}
- rc = 0;
out:
return rc;
}
Index: xen-4.2.0-testing/tools/debugger/gdbsx/gx/gx_comm.c
===================================================================
--- xen-4.2.0-testing.orig/tools/debugger/gdbsx/gx/gx_comm.c
+++ xen-4.2.0-testing/tools/debugger/gdbsx/gx/gx_comm.c
@@ -163,7 +163,7 @@ readchar(void)
static char buf[BUFSIZ];
static int bufcnt = 0;
static char *bufp;
- uint64_t ll;
+ uint64_t __attribute__((__unused__)) ll;
if (bufcnt-- > 0)
return *bufp++ & 0x7f;
Index: xen-4.2.0-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
===================================================================
--- xen-4.2.0-testing.orig/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
+++ xen-4.2.0-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
@@ -836,7 +836,7 @@ static int create_suspend_thread(checkpo
static void stop_suspend_thread(checkpoint_state* s)
{
- int err;
+ int __attribute__((__unused__)) err;
s->done = 1;
Index: xen-4.2.0-testing/tools/python/xen/lowlevel/netlink/libnetlink.c
===================================================================
--- xen-4.2.0-testing.orig/tools/python/xen/lowlevel/netlink/libnetlink.c
+++ xen-4.2.0-testing/tools/python/xen/lowlevel/netlink/libnetlink.c
@@ -433,7 +433,8 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt
nladdr.nl_groups = 0;
while (1) {
- int err, len, type;
+ int err, len;
+ int __attribute__((__unused__)) type;
int l;
status = fread(&buf, 1, sizeof(*h), rtnl);
Index: xen-4.2.0-testing/xen/common/cpupool.c
===================================================================
--- xen-4.2.0-testing.orig/xen/common/cpupool.c
+++ xen-4.2.0-testing/xen/common/cpupool.c
@@ -371,7 +371,7 @@ int cpupool_add_domain(struct domain *d,
{
struct cpupool *c;
int rc;
- int n_dom = 0;
+ int __attribute__((__unused__)) n_dom = 0;
if ( poolid == CPUPOOLID_NONE )
return 0;
@@ -399,8 +399,8 @@ int cpupool_add_domain(struct domain *d,
*/
void cpupool_rm_domain(struct domain *d)
{
- int cpupool_id;
- int n_dom;
+ int __attribute__((__unused__)) cpupool_id;
+ int __attribute__((__unused__)) n_dom;
if ( d->cpupool == NULL )
return;
Index: xen-4.2.0-testing/xen/common/kexec.c
===================================================================
--- xen-4.2.0-testing.orig/xen/common/kexec.c
+++ xen-4.2.0-testing/xen/common/kexec.c
@@ -817,7 +817,8 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
{
xen_kexec_exec_t exec;
xen_kexec_image_t *image;
- int base, bit, pos, ret = -EINVAL;
+ int base, bit, pos;
+ int __attribute__((__unused__)) ret = -EINVAL;
if ( unlikely(copy_from_guest(&exec, uarg, 1)) )
return -EFAULT;
Index: xen-4.2.0-testing/xen/arch/x86/time.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/time.c
+++ xen-4.2.0-testing/xen/arch/x86/time.c
@@ -1012,7 +1012,8 @@ static void local_time_calibration(void)
* System timestamps, extrapolated from local and master oscillators,
* taken during this calibration and the previous calibration.
*/
- s_time_t prev_local_stime, curr_local_stime;
+ s_time_t curr_local_stime;
+ s_time_t __attribute__((__unused__)) prev_local_stime;
s_time_t prev_master_stime, curr_master_stime;
/* TSC timestamps taken during this calibration and prev calibration. */
Index: xen-4.2.0-testing/xen/arch/x86/mm/p2m.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/mm/p2m.c
+++ xen-4.2.0-testing/xen/arch/x86/mm/p2m.c
@@ -483,7 +483,7 @@ p2m_remove_page(struct p2m_domain *p2m,
unsigned int page_order)
{
unsigned long i;
- mfn_t mfn_return;
+ mfn_t __attribute__((__unused__)) mfn_return;
p2m_type_t t;
p2m_access_t a;
Index: xen-4.2.0-testing/xen/arch/x86/cpu/intel_cacheinfo.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/cpu/intel_cacheinfo.c
+++ xen-4.2.0-testing/xen/arch/x86/cpu/intel_cacheinfo.c
@@ -169,7 +169,8 @@ unsigned int __cpuinit init_intel_cachei
unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */
unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */
- unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
+ unsigned int num_threads_sharing, index_msb;
+ unsigned int __attribute__((__unused__)) l2_id = 0, l3_id = 0;
if (c->cpuid_level > 3) {
static int is_initialized;
Index: xen-4.2.0-testing/xen/arch/x86/hvm/viridian.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/hvm/viridian.c
+++ xen-4.2.0-testing/xen/arch/x86/hvm/viridian.c
@@ -317,7 +317,7 @@ int rdmsr_viridian_regs(uint32_t idx, ui
int viridian_hypercall(struct cpu_user_regs *regs)
{
int mode = hvm_guest_x86_mode(current);
- unsigned long input_params_gpa, output_params_gpa;
+ unsigned long __attribute__((__unused__)) input_params_gpa, output_params_gpa;
uint16_t status = HV_STATUS_SUCCESS;
union hypercall_input {
Index: xen-4.2.0-testing/xen/arch/x86/mm.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/mm.c
+++ xen-4.2.0-testing/xen/arch/x86/mm.c
@@ -4969,7 +4969,7 @@ static int ptwr_emulated_update(
{
unsigned long mfn;
unsigned long unaligned_addr = addr;
- struct page_info *page;
+ struct page_info __attribute__((__unused__)) *page;
l1_pgentry_t pte, ol1e, nl1e, *pl1e;
struct vcpu *v = current;
struct domain *d = v->domain;
Index: xen-4.2.0-testing/xen/common/tmem.c
===================================================================
--- xen-4.2.0-testing.orig/xen/common/tmem.c
+++ xen-4.2.0-testing/xen/common/tmem.c
@@ -1348,7 +1348,8 @@ obj_unlock:
static int tmem_evict(void)
{
client_t *client = tmh_client_from_current();
- pgp_t *pgp = NULL, *pgp2, *pgp_del;
+ pgp_t *pgp = NULL, *pgp2;
+ pgp_t __attribute__((__unused__)) *pgp_del;
obj_t *obj;
pool_t *pool;
int ret = 0;
@@ -1585,7 +1586,8 @@ static NOINLINE int do_tmem_put(pool_t *
pagesize_t pfn_offset, pagesize_t len, void *cva)
{
obj_t *obj = NULL, *objfound = NULL, *objnew = NULL;
- pgp_t *pgp = NULL, *pgpdel = NULL;
+ pgp_t *pgp = NULL;
+ pgp_t __attribute__((__unused__)) *pgpdel = NULL;
client_t *client = pool->client;
int ret = client->frozen ? -EFROZEN : -ENOMEM;
Index: xen-4.2.0-testing/xen/common/tmem_xen.c
===================================================================
--- xen-4.2.0-testing.orig/xen/common/tmem_xen.c
+++ xen-4.2.0-testing/xen/common/tmem_xen.c
@@ -181,7 +181,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p
EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn,
void **out_va, size_t *out_len, void *cli_va)
{
- int ret = 0;
+ int __attribute__((__unused__)) ret = 0;
unsigned char *dmem = this_cpu(dstmem);
unsigned char *wmem = this_cpu(workmem);
pfp_t *cli_pfp = NULL;
@@ -241,7 +241,7 @@ EXPORT int tmh_decompress_to_client(tmem
pfp_t *cli_pfp = NULL;
size_t out_len = PAGE_SIZE;
bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
- int ret;
+ int __attribute__((__unused__)) ret;
if ( !tmemc )
{
@@ -370,15 +370,17 @@ static void tmh_persistent_pool_page_put
EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id)
{
tmh_client_t *tmh;
+#ifndef __i386__
char name[5];
int i, shift;
+#endif
if ( (tmh = xmalloc(tmh_client_t)) == NULL )
return NULL;
+#ifndef __i386__
for (i = 0, shift = 12; i < 4; shift -=4, i++)
name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0';
name[4] = '\0';
-#ifndef __i386__
tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get,
tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE);
if ( tmh->persistent_pool == NULL )
Index: xen-4.2.0-testing/xen/arch/x86/mm/shadow/multi.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/mm/shadow/multi.c
+++ xen-4.2.0-testing/xen/arch/x86/mm/shadow/multi.c
@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t
/* Put a shadow into the hash table */
{
struct domain *d = v->domain;
- int res;
+ int __attribute__((__unused__)) res;
SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n",
d->domain_id, v->vcpu_id, mfn_x(gmfn),
@@ -4438,7 +4438,7 @@ sh_update_cr3(struct vcpu *v, int do_loc
int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn,
mfn_t smfn, unsigned long off)
{
- int r;
+ int __attribute__((__unused__)) r;
shadow_l1e_t *sl1p, sl1e;
struct page_info *sp;
Index: xen-4.2.0-testing/xen/arch/x86/domain_build.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/domain_build.c
+++ xen-4.2.0-testing/xen/arch/x86/domain_build.c
@@ -377,8 +377,7 @@ int __init construct_dom0(
return rc;
/* compatibility check */
- compatible = 0;
- compat32 = 0;
+ compatible = compat32 = 0;
machine = elf_uval(&elf, elf.ehdr, e_machine);
switch (CONFIG_PAGING_LEVELS) {
case 3: /* x86_32p */
Index: xen-4.2.0-testing/xen/arch/x86/traps.c
===================================================================
--- xen-4.2.0-testing.orig/xen/arch/x86/traps.c
+++ xen-4.2.0-testing/xen/arch/x86/traps.c
@@ -1910,7 +1910,11 @@ static int emulate_privileged_op(struct
struct vcpu *v = current;
unsigned long *reg, eip = regs->eip;
u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0;
+#ifdef CONFIG_X86_64
enum { lm_seg_none, lm_seg_fs, lm_seg_gs } lm_ovr = lm_seg_none;
+#else
+ enum { lm_seg_none, lm_seg_fs, lm_seg_gs } __attribute__((__unused__)) lm_ovr = lm_seg_none;
+#endif
int rc;
unsigned int port, i, data_sel, ar, data, bpmatch = 0;
unsigned int op_bytes, op_default, ad_bytes, ad_default, opsize_prefix= 0;
View Git Blame Copy Permalink