1. 07 3月, 2017 30 次提交
  2. 06 3月, 2017 10 次提交
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · eba44e93
      Peter Maydell 提交于
      # gpg: Signature made Mon 06 Mar 2017 04:15:17 GMT
      # gpg:                using RSA key 0xEF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        net/filter-mirror: Follow CODING_STYLE
        COLO-compare: Fix icmp and udp compare different packet always dump bug
        COLO-compare: Optimize compare_common and compare_tcp
        COLO-compare: Rename compare function and remove duplicate codes
        filter-rewriter: skip net_checksum_calculate() while offset = 0
        net/colo: fix memory double free error
        vmxnet3: VMStatify rx/tx q_descr and int_state
        vmxnet3: Convert ring values to uint32_t's
        net/colo-compare: Fix memory free error
        colo-compare: Fix removing fds been watched incorrectly in finalization
        char: remove the right fd been watched in qemu_chr_fe_set_handlers()
        colo-compare: kick compare thread to exit after some cleanup in finalization
        colo-compare: use g_timeout_source_new() to process the stale packets
        NetRxPkt: Remove code duplication in net_rx_pkt_pull_data()
        NetRxPkt: Account buffer with ETH header in IOV length
        NetRxPkt: Do not try to pull more data than present
        NetRxPkt: Fix memory corruption on VLAN header stripping
        eth: Extend vlan stripping functions
        net: Remove useless local var pkt
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      eba44e93
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170306' into staging · 56b51708
      Peter Maydell 提交于
      ppc patch queue for 2017-03-06
      
      Looks like my previous batch wasn't quite the last before hard freeze.
      This has a handful of bugfixes to go in.  They're all genuine
      bugfixes, though not regressions in some cases.
      
      # gpg: Signature made Mon 06 Mar 2017 04:07:48 GMT
      # gpg:                using RSA key 0x6C38CACA20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.9-20170306:
        target/ppc: use helper for excp handling
        target/ppc: fmadd: add macro for updating flags
        target/ppc: fmadd check for excp independently
        spapr: ensure that all threads within core are on the same NUMA node
        ppc/xics: register reset handlers for the ICP and ICS objects
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      56b51708
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-28' into staging · fbddc2e5
      Peter Maydell 提交于
      QAPI patches for 2017-02-28
      
      # gpg: Signature made Sun 05 Mar 2017 08:21:51 GMT
      # gpg:                using RSA key 0x3870B400EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-qapi-2017-02-28: (27 commits)
        qapi: Improve qobject visitor documentation
        qapi: Fix object input visit beyond end of list
        tests: Cover input visit beyond end of list
        qapi: Make input visitors detect unvisited list tails
        test-qobject-input-visitor: Cover missing nested struct member
        tests: Cover partial input visit of list
        test-string-input-visitor: Improve list coverage
        test-string-input-visitor: Tear down existing test automatically
        tests-qobject-input-strict: Merge into test-qobject-input-visitor
        qapi: Drop unused non-strict qobject input visitor
        test-qobject-input-visitor: Use strict visitor
        qom: Make object_property_set_qobject()'s input visitor strict
        qapi: Make string input and opts visitor require non-null input
        qapi: Drop string input visitor method optional()
        qapi: Improve qobject input visitor error reporting
        qapi: Make QObject input visitor set *list reliably
        qapi: Clean up after commit 3d344c2a
        qapi: Improve a QObject input visitor error message
        qmp: Eliminate silly QERR_QMP_* macros
        qmp: Drop duplicated QMP command object checks
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      fbddc2e5
    • B
      tests: check path to avoid a failing qga/get-vcpus test · ec72c0e2
      Bruce Rogers 提交于
      The qga/get-vcpus test fails in a simple chroot environment, as
      used in an openSUSE Build Service local build, so first check
      that the sysfs based path exists in order to avoid calling this
      test in an environment where it won't work right.
      Signed-off-by: NBruce Rogers <brogers@suse.com>
      Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      ec72c0e2
    • P
      qga: ignore EBUSY when freezing a filesystem · ce2eb6c4
      Peter Lieven 提交于
      the current implementation fails if we try to freeze an
      already frozen filesystem. This can happen if a filesystem
      is mounted more than once (e.g. with a bind mount).
      Suggested-by: NChristian Theune <ct@flyingcircus.io>
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      ce2eb6c4
    • S
      qga: add systemd socket activation support · 26de2296
      Stefan Hajnoczi 提交于
      AF_UNIX and AF_VSOCK listen sockets can be passed in by systemd on
      startup.  This allows systemd to manage the listen socket until the
      first client connects and between restarts.  Advantages of socket
      activation are that parallel startup of network services becomes
      possible and that unused daemons do not consume memory.
      
      The key to achieving this is the LISTEN_FDS environment variable, which
      is a stable ABI as shown here:
      https://www.freedesktop.org/wiki/Software/systemd/InterfacePortabilityAndStabilityChart/
      
      We could link against libsystemd and use sd_listen_fds(3) but it's easy
      to implement the tiny LISTEN_FDS ABI so that qemu-ga does not depend on
      libsystemd.  Some systems may not have systemd installed and wish to
      avoid the dependency.  Other init systems or socket activation servers
      may implement the same ABI without systemd involvement.
      
      Test as follows:
      
        $ cat ~/.config/systemd/user/qga.service
        [Unit]
        Description=qga
      
        [Service]
        WorkingDirectory=/tmp
        ExecStart=/path/to/qemu-ga --logfile=/tmp/qga.log --pidfile=/tmp/qga.pid --statedir=/tmp
      
        $ cat ~/.config/systemd/user/qga.socket
        [Socket]
        ListenStream=/tmp/qga.sock
      
        [Install]
        WantedBy=default.target
      
        $ systemctl --user daemon-reload
        $ systemctl --user start qga.socket
        $ nc -U /tmp/qga.sock
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Reviewed-by: NDaniel P. Berrange <berrange@redhat.com>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      26de2296
    • Z
      net/filter-mirror: Follow CODING_STYLE · f0aabd5c
      Zhang Chen 提交于
      Signed-off-by: NZhang Chen <zhangchen.fnst@cn.fujitsu.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      f0aabd5c
    • Z
    • Z
      COLO-compare: Optimize compare_common and compare_tcp · 6efeb328
      Zhang Chen 提交于
      Add offset args for colo_packet_compare_common, optimize
      colo_packet_compare_icmp() and colo_packet_compare_udp()
      just compare the IP payload. Before compare all tcp packet,
      we compare tcp checksum firstly, this function can get
      better performance.
      Signed-off-by: NZhang Chen <zhangchen.fnst@cn.fujitsu.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      6efeb328
    • Z
      COLO-compare: Rename compare function and remove duplicate codes · 2ad7ca4c
      Zhang Chen 提交于
      Rename colo_packet_compare() to colo_packet_compare_common() that
      make tcp_compare udp_compare icmp_compare reuse this function.
      Remove minimum packet size check in icmp_compare, because we have
      check this in parse_packet_early().
      Signed-off-by: NZhang Chen <zhangchen.fnst@cn.fujitsu.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      2ad7ca4c