mbox

[PULL,00/21] Trivial patches for 2015-06-22

Message ID cover.1434971627.git.mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-06-22

Message

Michael Tokarev June 22, 2015, 11:16 a.m. UTC 
There are a few random thing here and there.  I especially
want to note 2 of them:

 - QOMification series by Gonglei
 - rearrangement of ./configure --help output by me

Other than that, the stuff is really trivial.

Please consider applying/pulling.

/mjt

The following changes since commit ad7020a7e7b27d468ecc2aacb04ba4eb09017074:

  target-microblaze: Remove dead code (2015-06-21 17:20:16 +1000)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-06-22

for you to fetch changes up to 43ce995c79c09595e6fbdcabecd1c8b43cf9e4a4:

  util/qemu-sockets: improve ai_flag hints for ipv6 hosts (2015-06-22 14:08:25 +0300)

----------------------------------------------------------------
trivial patches for 2015-06-22

----------------------------------------------------------------
Alberto Garcia (1):
      throttle: Fix typo in the documentation of block_set_io_throttle

Alex Bennée (1):
      configure: append --extra-ldflags to LDFLAGS

Dr. David Alan Gilbert (2):
      Grammar: 'as to'->'as for'
      Print error when failing to load PCI config data

Fam Zheng (2):
      Makefile: Fix "make cscope TAGS"
      Makefile: Add "make ctags"

Frediano Ziglio (1):
      hw/display/qxl-logger.c: Constify some variable

Gonglei (6):
      pci-assign: QOMify
      piix: piix3 QOMify
      piix4: QOMify
      wdt_i6300esb: QOMify
      xen_pt: QOMify
      vt82c686: QOMify

Markus Armbruster (2):
      qemu-options: Improve -global documentation
      qemu-options: Use @itemx where appropriate

Michael Tokarev (3):
      remove libdecnumber/dpd/decimal128Local.h
      libcacard: pkgconfig: tidy dependent libs
      configure: rearrange --help and consolidate enable/disable together

Shannon Zhao (2):
      hw/display/cg3.c: Fix memory leak
      hw/display/tcx.c: Fix memory leak

Wolfgang Bumiller (1):
      util/qemu-sockets: improve ai_flag hints for ipv6 hosts

 Makefile                           |  20 +++-
 configure                          | 198 ++++++++++++++-----------------------
 hw/display/cg3.c                   |   1 +
 hw/display/qxl-logger.c            |  16 +--
 hw/display/tcx.c                   |   1 +
 hw/i386/kvm/pci-assign.c           |  39 ++++----
 hw/isa/piix4.c                     |   8 +-
 hw/isa/vt82c686.c                  |  47 ++++++---
 hw/pci-host/piix.c                 |  57 ++++++-----
 hw/pci/pci.c                       |   4 +
 hw/watchdog/wdt_i6300esb.c         |  14 ++-
 hw/xen/xen_pt.c                    |  10 +-
 hw/xen/xen_pt.h                    |   4 +
 libcacard/libcacard.pc.in          |   2 +-
 libdecnumber/dpd/decimal128Local.h |  42 --------
 qapi/block-core.json               |   2 +-
 qemu-options.hx                    |  57 +++++------
 qmp-commands.hx                    |   2 +-
 util/qemu-sockets.c                |   6 +-
 19 files changed, 247 insertions(+), 283 deletions(-)
 delete mode 100644 libdecnumber/dpd/decimal128Local.h

Comments

Peter Maydell June 22, 2015, 4:02 p.m. UTC | #1 
On 22 June 2015 at 12:16, Michael Tokarev <mjt@tls.msk.ru> wrote:
> There are a few random thing here and there.  I especially
> want to note 2 of them:
>
>  - QOMification series by Gonglei
>  - rearrangement of ./configure --help output by me
>
> Other than that, the stuff is really trivial.
>
> Please consider applying/pulling.
>
> /mjt
>
> The following changes since commit ad7020a7e7b27d468ecc2aacb04ba4eb09017074:
>
>   target-microblaze: Remove dead code (2015-06-21 17:20:16 +1000)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-06-22
>
> for you to fetch changes up to 43ce995c79c09595e6fbdcabecd1c8b43cf9e4a4:
>
>   util/qemu-sockets: improve ai_flag hints for ipv6 hosts (2015-06-22 14:08:25 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2015-06-22

Fails to build on Windows:

util/qemu-sockets.c: In function ‘inet_parse_connect_opts’:
util/qemu-sockets.c:338: error: ‘AI_V4MAPPED’ undeclared (first use in
this function)
util/qemu-sockets.c:338: error: (Each undeclared identifier is
reported only once
util/qemu-sockets.c:338: error: for each function it appears in.)
util/qemu-sockets.c: In function ‘inet_dgram_opts’:
util/qemu-sockets.c:438: error: ‘AI_V4MAPPED’ undeclared (first use in
this function)

(Also I had to resolve a conflict in configure, so if you rebase
on current master you'll save me having to do it twice...)

thanks
-- PMM
Wolfgang Bumiller June 23, 2015, 7:52 a.m. UTC | #2 
> Fails to build on Windows:
> 
> util/qemu-sockets.c: In function ‘inet_parse_connect_opts’:
> util/qemu-sockets.c:338: error: ‘AI_V4MAPPED’ undeclared (first use in

What's the procedure with the trivial pull-request here now. Should I
send a v2 of this patch to trivial, or a fix based on the trivial
branch?
It's a bit embarrassing, I should have seen this coming, as there's
already an #ifdef for AI_ADDRCONFIG to #define it to 0. So the change
would just be doing the same for V4MAPPED.

Sorry about that.

On Mon, Jun 22, 2015 at 05:02:17PM +0100, Peter Maydell wrote:
> On 22 June 2015 at 12:16, Michael Tokarev <mjt@tls.msk.ru> wrote:
> > There are a few random thing here and there.  I especially
> > want to note 2 of them:
> >
> >  - QOMification series by Gonglei
> >  - rearrangement of ./configure --help output by me
> >
> > Other than that, the stuff is really trivial.
> >
> > Please consider applying/pulling.
> >
> > /mjt
> >
> > The following changes since commit ad7020a7e7b27d468ecc2aacb04ba4eb09017074:
> >
> >   target-microblaze: Remove dead code (2015-06-21 17:20:16 +1000)
> >
> > are available in the git repository at:
> >
> >   git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-06-22
> >
> > for you to fetch changes up to 43ce995c79c09595e6fbdcabecd1c8b43cf9e4a4:
> >
> >   util/qemu-sockets: improve ai_flag hints for ipv6 hosts (2015-06-22 14:08:25 +0300)
> >
> > ----------------------------------------------------------------
> > trivial patches for 2015-06-22
> 
> Fails to build on Windows:
> 
> util/qemu-sockets.c: In function ‘inet_parse_connect_opts’:
> util/qemu-sockets.c:338: error: ‘AI_V4MAPPED’ undeclared (first use in
> this function)
> util/qemu-sockets.c:338: error: (Each undeclared identifier is
> reported only once
> util/qemu-sockets.c:338: error: for each function it appears in.)
> util/qemu-sockets.c: In function ‘inet_dgram_opts’:
> util/qemu-sockets.c:438: error: ‘AI_V4MAPPED’ undeclared (first use in
> this function)
> 
> (Also I had to resolve a conflict in configure, so if you rebase
> on current master you'll save me having to do it twice...)
> 
> thanks
> -- PMM
> 
>
Michael Tokarev June 23, 2015, 5:08 p.m. UTC | #3 
22.06.2015 19:02, Peter Maydell wrote:

> Fails to build on Windows:
> 
> util/qemu-sockets.c: In function ‘inet_parse_connect_opts’:
> util/qemu-sockets.c:338: error: ‘AI_V4MAPPED’ undeclared (first use in this function)

Hmm.  Does WIN really have no AI_V4MAPPED?  Does it have getaddrinfo
in the first place?  If yes, it should have AI_V4MAPPED too.

I added a conditional #define AI_V4MAPPED to 0 at the top of this
file, the same way AI_ADDRCONFIG is handled.

> (Also I had to resolve a conflict in configure, so if you rebase
> on current master you'll save me having to do it twice...)

Immediately before sending the pull request, I did a rebase and rebuild.
Apparently you pulled some other change before trying to pull this.
I usually rebase right before sending the request.  Just did the
rebase again, and fixed he conflict with guest-agent-msi change.

Will resend the pull request.

Thanks,

/mjt
Peter Maydell June 23, 2015, 5:15 p.m. UTC | #4 
On 23 June 2015 at 18:08, Michael Tokarev <mjt@tls.msk.ru> wrote:
> 22.06.2015 19:02, Peter Maydell wrote:
>> Fails to build on Windows:
>>
>> util/qemu-sockets.c: In function ‘inet_parse_connect_opts’:
>> util/qemu-sockets.c:338: error: ‘AI_V4MAPPED’ undeclared (first use in this function)
>
> Hmm.  Does WIN really have no AI_V4MAPPED?  Does it have getaddrinfo
> in the first place?  If yes, it should have AI_V4MAPPED too.
>
> I added a conditional #define AI_V4MAPPED to 0 at the top of this
> file, the same way AI_ADDRCONFIG is handled.

https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520%28v=vs.85%29.aspx
says AI_V4MAPPED is supported on Windows Vista and later. Likely
this compile error is elderly-mingw again (though I haven't
checked with a newer one to see if it's correctly reflecting
the Windows SDK addition to the headers).

(Similarly, AI_V4MAPPED in glibc is only present from 2.3.3 and up.)

>> (Also I had to resolve a conflict in configure, so if you rebase
>> on current master you'll save me having to do it twice...)
>
> Immediately before sending the pull request, I did a rebase and rebuild.
> Apparently you pulled some other change before trying to pull this.
> I usually rebase right before sending the request.  Just did the
> rebase again, and fixed he conflict with guest-agent-msi change.

Yeah, this kind of thing just happens from bad luck sometimes
(I process pull requests oldest-first and they take a few hours
to complete). I would just have resolved the conflict locally if
there hadn't been the other problem too.

thanks
-- PMM