summaryrefslogtreecommitdiffstats
path: root/qemu/disas/libvixl/Makefile.objs
diff options
context:
space:
mode:
Diffstat (limited to 'qemu/disas/libvixl/Makefile.objs')
-rw-r--r--qemu/disas/libvixl/Makefile.objs13
1 files changed, 8 insertions, 5 deletions
diff --git a/qemu/disas/libvixl/Makefile.objs b/qemu/disas/libvixl/Makefile.objs
index 17e6565d1..bbe7695fd 100644
--- a/qemu/disas/libvixl/Makefile.objs
+++ b/qemu/disas/libvixl/Makefile.objs
@@ -1,8 +1,11 @@
-libvixl_OBJS = utils.o \
- a64/instructions-a64.o \
- a64/decoder-a64.o \
- a64/disasm-a64.o
+libvixl_OBJS = vixl/utils.o \
+ vixl/compiler-intrinsics.o \
+ vixl/a64/instructions-a64.o \
+ vixl/a64/decoder-a64.o \
+ vixl/a64/disasm-a64.o
-$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS)
+# The -Wno-sign-compare is needed only for gcc 4.6, which complains about
+# some signed-unsigned equality comparisons which later gcc versions do not.
+$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare
common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)
g.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
##############################################################################
# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
# Sample test case for ha

schema: "yardstick:task:0.1"

scenarios:
-
  type: ServiceHA
  options:
    attackers:
    - fault_type: "bare-metal-down"
      host: node1

    monitors:
    - monitor_type: "openstack-cmd"
      command_name: "nova image-list"
      monitor_time: 10
      sla:
        max_outage_time: 5
    - monitor_type: "openstack-cmd"
      command_name: "heat stack-list"
      monitor_time: 10
      sla:
        max_outage_time: 5
    - monitor_type: "openstack-cmd"
      command_name: "neutron router-list"
      monitor_time: 10
      sla:
        max_outage_time: 5

  nodes:
    node1: node1.LF

  runner:
    type: Duration
    duration: 1
  sla:
    outage_time: 5
    action: monitor


context:
  type: Node
  name: LF
  file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml