1. 26 3月, 2019 6 次提交
  2. 25 3月, 2019 18 次提交
  3. 23 3月, 2019 8 次提交
    • M
      slirp: is not maintained by Kelly Price for a long time · 7849f0c2
      Marc-André Lureau 提交于
      slirp has been maintained by the QEMU maintainers and will be
      maintained under an independent project soon.
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NKelly Price <strredwolf@gmail.com>
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      7849f0c2
    • M
      slirp: remove reference to COPYRIGHT file · 0c4cc4e2
      Marc-André Lureau 提交于
      The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to
      another project file, the SPDX license notice present in all source
      files states that unequivocally.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      0c4cc4e2
    • M
      slirp: clarify license of slirp files using SPDX: implicit via unstated · dfacac4c
      Marc-André Lureau 提交于
      Add SPDX license identifier to clarify the license of files without
      explicit license header.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      dfacac4c
    • M
      slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT · 3e6d35e5
      Marc-André Lureau 提交于
      Add SPDX license identifier to clarify the license of files with
      reference to BSD license from slirp COPYRIGHT file.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      3e6d35e5
    • M
      slirp: clarify license of slirp files using SPDX: explicit MIT · 6087fd53
      Marc-André Lureau 提交于
      Add SPDX license identifier to clarify the license of files with
      explicit MIT license header.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      6087fd53
    • M
      slirp: clarify license of slirp files using SPDX: explicit BSD · d2f27fcb
      Marc-André Lureau 提交于
      Add SPDX license identifier to clarify the license of files with
      explicit 3-clause BSD license header.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      d2f27fcb
    • M
      slirp: relicense GPL files to BSD-3 · 87ecdc71
      Marc-André Lureau 提交于
      In order to make slirp a standalone project, the project must have a
      clear license, and be compatible with the GPL or LGPL.
      
      Since commit 2f5f8996 ("Remove the
      advertising clause from the slirp license"), slirp is BSD-3. But new
      files have been added under slirp/ with QEMU GPL license since then.
      
      The copyright holders have been asked to relicense files to BSD-3 and
      gave their permission:
      
      - slirp/dhcpv6.{c,h}
      
      Subject: Re: Clearing slirp/ license
      To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, Thomas Huth <thuth@redhat.com>
      Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
      References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com>
      From: "Cédric Le Goater" <clg@kaod.org>
      Message-ID: <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org>
      Date: Mon, 11 Mar 2019 16:23:25 +0100
      
      > Could you reply that you have no objection in relicensing those files
      > are 3-Clause BSD?
      
      Fine for me. You can change the license of slirp/ncsi.c and
      slirp/ncsi-pkt.hto a 3-Clause BSD.
      
      Thanks,
      
      C.
      
      Subject: Re: [Qemu-devel] Clearing slirp/ license
      To: Peter Maydell <peter.maydell@linaro.org>, Shan Gavin <shan.gavin@gmail.com>
      Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, "Marc-André Lureau" <marcandre.lureau@gmail.com>, Gavin Shan <gwshan@linux.vnet.ibm.com>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
      References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org> <CAJ+F1C+hFfsa5gcSdttTP5J+uyDvNdYJWrm9OJM26+Zc1ZQkew@mail.gmail.com> <cc62e1fd-c564-e1b7-d10c-30665b481352@ozlabs.ru> <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com> <CAFEAcA_g=L2LSo=B_5dpJhJJrqFiOb6sswMVohQwpVGiKi_A7w@mail.gmail.com>
      From: "Cédric Le Goater" <clg@kaod.org>
      Message-ID: <4ddf6031-0df1-b3b5-965e-a181266e42b0@kaod.org>
      Date: Tue, 12 Mar 2019 11:49:21 +0100
      
      > Is the code in question copyright you personally, or copyright
      > IBM as your employer at the time ? If the latter, it is IBM that
      > would need to approve the relicensing.
      
      That was done. I had our legal team approve the change of license.
      
      Thanks,
      
      C.
      
      From: Shan Gavin <shan.gavin@gmail.com>
      Date: Tue, 12 Mar 2019 15:04:54 +0800
      Message-ID: <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com>
      Subject: Re: [Qemu-devel] Clearing slirp/ license
      To: Alexey Kardashevskiy <aik@ozlabs.ru>
      Cc: "Marc-André Lureau" <marcandre.lureau@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, gwshan@linux.vnet.ibm.com, Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
      
      > Gavin, could you reply that you have no objection in relicensing
      > ncsi-pkt.h as 3-Clause BSD?
      
      No objection. Please go ahead with the relicensing.
      
      Cheers,
      Gavin
      
      - ncsi.c, ncsi-pkt.h
      
      Subject: Re: Clearing slirp/ license
      To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, "Cédric Le Goater" <clg@kaod.org>
      Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
      References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com>
      From: Thomas Huth <thuth@redhat.com>
      Message-ID: <ed5a9f55-f2e5-298d-58ac-414759e9b491@redhat.com>
      Date: Wed, 13 Feb 2019 12:30:32 +0100
      
      > Could you reply that you have no objection in relicensing those files
      > are 3-Clause BSD?
      
      Ok, for the records: I'm fine if you change the license of dhcpv6.[ch]
      to either 3-Clause BSD or 2-Clause BSD.
      
       Thomas
      
      - vmstate.{c,h}
      
      From: Juan Quintela <quintela@redhat.com>
      To: "Marc-André Lureau" <marcandre.lureau@gmail.com>
      Cc: QEMU <qemu-devel@nongnu.org>, Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
      Subject: Re: Clearing slirp/ license
      Date: Tue, 12 Mar 2019 12:43:17 +0100
      Message-ID: <87k1h4qpwq.fsf@trasno.org>
      
      > Juan, Could you reply that you have no objection in relicensing the
      > vmstate files as 3-Clause BSD?
      
      No problem at all on my side.
      
      Later, Juan.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      [ for the NC-SI files ]
      Reviewed-by: NCédric Le Goater <clg@kaod.org>
      Acked-by: NThomas Huth <thuth@redhat.com>
      87ecdc71
    • M
      slirp: update COPYRIGHT to use full 3-Clause BSD License · 772c7127
      Marc-André Lureau 提交于
      According to commit 2f5f8996 ("Remove
      the advertising clause from the slirp license"), Danny Gasparovski
      gave permission to license slirp code under 3-clause BSD license:
      
          Subject: RE: Slirp license
          Date: Thu, 8 Jan 2009 10:51:00 +1100
          From: "Gasparovski, Daniel" <Daniel.Gasparovski@ato.gov.au>
          To: "Richard Fontana" <rfontana@redhat.com>
      
          I have no objection to having Slirp code in QEMU be licensed under
          the 3-clause BSD license.
      
      slirp/COPYRIGHT's initial version in 2004 (commit 5fafdf24) listed
      only 3 clauses BUT used the poisonous advertising clause for clause 3
      which is the controversial clause of non-free 4-clause (that is, it
      appears that the BSD-4 license was copied, and then the WRONG clause
      was deleted, when creating COPYRIGHT.  Perhaps explained as an easy
      mistake to make since 3-clause was created by removing clause 3 of the
      4-clause, where you sometimes see the three-clause version with
      clauses 1, 2, 4; but more commonly see a renumbered version with
      clauses 1, 2, 3 to close the gap. If you pay attention only to clause
      numbers instead of content, it can be easy to confuse which clause to
      delete to go from 4-clause to 3-clause).
      
      Commit 2f5f8996 removed the poisonous wrong clause on
      the grounds of moving from 4-clause to 3-clause; but did not add the
      missing clause, which makes it LOOK like the 2-clause version.  But I
      think we have a decent enough trail showing the intent for 3-clause.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      772c7127
  4. 22 3月, 2019 1 次提交
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging · d97a39d9
      Peter Maydell 提交于
      x86 queue for -rc1
      
      A few fixes that missed -rc0:
      * CPU model documentation updates (Daniel P. Berrangé)
      * Fix bogus OSPKE warnings (Eduardo Habkost)
      * Work around KVM bugs when handing arch_capabilities
        (Eduardo Habkost)
      
      # gpg: Signature made Thu 21 Mar 2019 19:32:02 GMT
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/x86-next-pull-request:
        docs: add note about stibp CPU feature for spectre v2
        docs: clarify that spec-ctrl is only needed for Spectre v2
        i386: Disable OSPKE on CPU model definitions
        i386: Make arch_capabilities migratable
        i386: kvm: Disable arch_capabilities if MSR can't be set
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d97a39d9
  5. 21 3月, 2019 6 次提交
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/authz-next-pull-request' into staging · c692931c
      Peter Maydell 提交于
      Fix object interface check macro usage
      
      # gpg: Signature made Thu 21 Mar 2019 11:53:15 GMT
      # gpg:                using RSA key BE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/authz-next-pull-request:
        authz: Use OBJECT_CHECK() on objects
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c692931c
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging · 9b198f93
      Peter Maydell 提交于
      Avoid struct packing warnings with gcc9
      
      # gpg: Signature made Thu 21 Mar 2019 11:55:03 GMT
      # gpg:                using RSA key BE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/qcrypto-next-pull-request:
        crypto/block: remove redundant struct packing to fix build with gcc 9
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9b198f93
    • G
      crypto/block: remove redundant struct packing to fix build with gcc 9 · 5993e3be
      Greg Kurz 提交于
      Build fails with gcc 9:
      
      crypto/block-luks.c:689:18: error: taking address of packed member of ‘struct QCryptoBlockLUKSHeader’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
        689 |     be32_to_cpus(&luks->header.payload_offset);
            |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      crypto/block-luks.c:690:18: error: taking address of packed member of ‘struct QCryptoBlockLUKSHeader’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
        690 |     be32_to_cpus(&luks->header.key_bytes);
            |                  ^~~~~~~~~~~~~~~~~~~~~~~
      crypto/block-luks.c:691:18: error: taking address of packed member of ‘struct QCryptoBlockLUKSHeader’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
        691 |     be32_to_cpus(&luks->header.master_key_iterations);
            |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      ... a bunch of similar errors...
      
      crypto/block-luks.c:1288:22: error: taking address of packed member of ‘struct QCryptoBlockLUKSKeySlot’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
       1288 |         be32_to_cpus(&luks->header.key_slots[i].stripes);
            |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      cc1: all warnings being treated as errors
      
      All members of the QCryptoBlockLUKSKeySlot and QCryptoBlockLUKSHeader are
      naturally aligned and we already check at build time there isn't any
      unwanted padding. Drop the QEMU_PACKED attribute.
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NGreg Kurz <groug@kaod.org>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      5993e3be
    • P
      authz: Use OBJECT_CHECK() on objects · 063603d4
      Philippe Mathieu-Daudé 提交于
      TYPE_QAUTHZ is an abstract object of type TYPE_OBJECT. All other
      are children of TYPE_QAUTHZ, thus also objects.
      
      Keep INTERFACE_CHECK() for interfaces, and use OBJECT_CHECK() on
      objects.
      Reported-by: NMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: NPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      063603d4
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging · 6532dceb
      Peter Maydell 提交于
      Merge I/O patch queue
      
      Fix problem with end of file handling with websock channels
      
      # gpg: Signature made Wed 20 Mar 2019 16:57:15 GMT
      # gpg:                using RSA key BE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/qio-next-pull-request:
        io: fix handling of EOF / error conditions in websock GSource
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6532dceb
    • D
      io: fix handling of EOF / error conditions in websock GSource · dd154c4d
      Daniel P. Berrangé 提交于
      We were never reporting the G_IO_HUP event when an end of file was hit
      on the websocket channel.
      
      We also didn't report G_IO_ERR when we hit a fatal error processing the
      websocket protocol.
      
      The latter in particular meant that the chardev code would not notice
      when an eof/error was encountered on the websocket channel, unless the
      guest OS happened to trigger a write operation.
      
      This meant that once the first client had quit, the chardev would never
      listen to accept a new client.
      
      Fixes launchpad bug 1816819
      Acked-by: NStefano Garzarella <sgarzare@redhat.com>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      dd154c4d
  6. 20 3月, 2019 1 次提交