Commit 38dc7490 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mjt/trivial-patches' into staging 



# By Jan Krupa (4) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
  configure: Use -B switch only for Python versions which support it
  qga: Fix shutdown command of guest agent to work with SysV
  console: Remove unused debug code
  qga: Fix compilation for old versions of MinGW
  .travis.yml: basic compile and check recipes
  pci-assign: Fix error_report of pci-stub message
  qapi: Fix comment for create-type to match code.
  vl: fix build when configured with no graphic support
  usb: drop unused USBNetState.inpkt field
  qemu-char: add missing characters used in keymaps
  qemu-char: add support for U-prefixed symbols
  qemu-char: add Czech keymap file
  qemu-char: add Czech characters to VNC keysyms

Message-id: 1384684850-6777-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 7af31519 0478f37c

.travis.yml

0 → 100644
+71 −0
Original line number Diff line number Diff line 
language: c

python:

  - "2.4"

compiler:

  - gcc

  - clang

env:

  global:

    - TEST_CMD="make check"

    - EXTRA_CONFIG=""

    # Development packages, EXTRA_PKGS saved for additional builds

    - CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev"

    - NET_PKGS="libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev libspice-protocol-dev libnss3-dev"

    - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev"

    - EXTRA_PKGS=""

  matrix:

  - TARGETS=alpha-softmmu,alpha-linux-user

  - TARGETS=arm-softmmu,arm-linux-user

  - TARGETS=cris-softmmu

  - TARGETS=i386-softmmu,x86_64-softmmu

  - TARGETS=lm32-softmmu

  - TARGETS=m68k-softmmu

  - TARGETS=microblaze-softmmu,microblazeel-softmmu

  - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu

  - TARGETS=moxie-softmmu

  - TARGETS=or32-softmmu,

  - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu

  - TARGETS=s390x-softmmu

  - TARGETS=sh4-softmmu,sh4eb-softmmu

  - TARGETS=sparc-softmmu,sparc64-softmmu

  - TARGETS=unicore32-softmmu

  - TARGETS=xtensa-softmmu,xtensaeb-softmmu

before_install:

  - git submodule update --init --recursive

  - sudo apt-get update -qq

  - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS}

script: "./configure --target-list=${TARGETS} ${EXTRA_CONFIG} && make && ${TEST_CMD}"

matrix:

  # We manually include a number of additional build for non-standard bits

  include:

    # Debug related options

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-debug"

      compiler: gcc

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"

      compiler: gcc

    # Currently configure doesn't force --disable-pie

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie"

      compiler: gcc

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_PKGS="sparse"

           EXTRA_CONFIG="--enable-sparse"

      compiler: gcc

    # All the trace backends (apart from dtrace)

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-trace-backend=stderr"

      compiler: gcc

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-trace-backend=simple"

      compiler: gcc

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-trace-backend=ftrace"

           TEST_CMD=""

      compiler: gcc

    # This disabled make check for the ftrace backend which needs more setting up

    # Currently broken on 12.04 due to mis-packaged liburcu and changed API, will be pulled.

    #- env: TARGETS=i386-softmmu,x86_64-softmmu

    #       EXTRA_PKGS="liblttng-ust-dev liburcu-dev"

    #       EXTRA_CONFIG="--enable-trace-backend=ust"

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ distclean: clean 
KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \

ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \

common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \

bepo

bepo    cz



ifdef INSTALL_BLOBS

BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

configure

+8 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ fi 


: ${make=${MAKE-make}}

: ${install=${INSTALL-install}}

: ${python=${PYTHON-python -B}}

: ${python=${PYTHON-python}}

: ${smbd=${SMBD-/usr/sbin/smbd}}



# Default objcc to clang if available, otherwise use CC
@@ -1420,6 +1420,13 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_in 
      "Use --python=/path/to/python to specify a supported Python."

fi



# The -B switch was added in Python 2.6.

# If it is supplied, compiled files are not written.

# Use it for Python versions which support it.

if $python -B -c 'import sys; sys.exit(0)' 2>/dev/null; then

  python="$python -B"

fi



if test -z "${target_list+xxx}" ; then

    target_list="$default_target_list"

else

hw/i386/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl $(SRC_PATH)/scripts/acpi_extract_prepro 
	$(call quiet-command, cpp -P $< -o $*.dsl.i.orig, "  CPP $(TARGET_DIR)$*.dsl.i.orig")

	$(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, "  ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")

	$(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ,"  IASL $(TARGET_DIR)$*.dsl.i")

	$(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, "  ACPI_EXTRACT $(TARGET_DIR)$*.off")

	$(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, "  ACPI_EXTRACT $(TARGET_DIR)$*.off")

	$(call quiet-command, cat $*.off > $@, "  CAT $(TARGET_DIR)$@")

else

#IASL Not present. Restore pre-generated hex files.

hw/i386/kvm/pci-assign.c

+16 −20
Original line number Diff line number Diff line
@@ -791,26 +791,22 @@ static void assign_failed_examine(AssignedDevice *dev) 
        goto fail;

    }



    error_report("*** The driver '%s' is occupying your device "

                 "%04x:%02x:%02x.%x.",

    error_printf("*** The driver '%s' is occupying your device "

        "%04x:%02x:%02x.%x.\n"

        "***\n"

        "*** You can try the following commands to free it:\n"

        "***\n"

        "*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/new_id\n"

        "*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/%s/unbind\n"

        "*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"

        "pci-stub/bind\n"

        "*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/remove_id\n"

        "***",

        ns, dev->host.domain, dev->host.bus, dev->host.slot,

                 dev->host.function);

    error_report("***");

    error_report("*** You can try the following commands to free it:");

    error_report("***");

    error_report("*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/"

                 "new_id", vendor_id, device_id);

    error_report("*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"

                 "%s/unbind",

                 dev->host.domain, dev->host.bus, dev->host.slot,

                 dev->host.function, ns);

    error_report("*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"

                 "pci-stub/bind",

                 dev->host.domain, dev->host.bus, dev->host.slot,

                 dev->host.function);

    error_report("*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub"

                 "/remove_id", vendor_id, device_id);

    error_report("***");

        dev->host.function, vendor_id, device_id,

        dev->host.domain, dev->host.bus, dev->host.slot, dev->host.function,

        ns, dev->host.domain, dev->host.bus, dev->host.slot,

        dev->host.function, vendor_id, device_id);



    return;