[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 8251a7: qga: don't fail if mount doesn't have

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 8251a7: qga: don't fail if mount doesn't have slave device...
Date: Fri, 31 Mar 2017 03:45:11 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8251a72f8bb8764c13dd5ba627e7d9e6d35d188e
  Author: Michael Roth <address@hidden>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  qga: don't fail if mount doesn't have slave devices

In some cases the slave devices of a virtual block device are tracked
by the parent in the corresponding sysfs node. For instance, if we
have a loop-back mount of the form:

  /dev/loop3p1 on /home/mdroth/mnt type ext4 (rw,relatime,data=ordered)

this will be reflected in sysfs as:


The current code however assumes the mounted virtual block device,
loop3p1 in this case, contains the slaves directory, and reports an
error otherwise. This breaks 'make check' in certain environments.

Fix this by simply skipping attempts to generate disk topology
information in these cases. Since this information is documented
in QAPI as optionally-reported, this should be ok from an API

In the future, this can possibly be improved upon by collecting
topology information from the parent in these cases.

Reported-by: Peter Maydell <address@hidden>
Cc: Peter Maydell <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
Tested-by: Peter Maydell <address@hidden>

  Commit: 4eaf72029446ba693c63429475ce46348f65bf01
  Author: Sameeh Jubran <address@hidden>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M configure

  Log Message:
  qga: Make qemu-ga compile statically for Windows

Attempting to compile qemu-ga statically as follows for Windows causes
the following error:

    ./configure --disable-docs --target-list=x86_64-softmmu \
    --cross-prefix=x86_64-w64-mingw32- --static \
    --enable-guest-agent-msi --with-vss-sdk=/path/to/VSSSDK72

    make -j8 qemu-ga

    path/to/qemu/stubs/error-printf.c:7: undefined reference to 
    collect2: error: ld returned 1 exit status
    Makefile:444: recipe for target 'qemu-ga.exe' failed
    make: *** [qemu-ga.exe] Error 1

This is caused by a bug in the pkg-config file for glib as it doesn't define
GLIB_STATIC_COMPILATION for pkg-config --static.

Signed-off-by: Sameeh Jubran <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Roth <address@hidden>

  Commit: 05a6f451eb0e3224a8e6d98089379f20ec06c787
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M configure
    M qga/commands-posix.c

  Log Message:
  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-03-30-tag' 
into staging

qemu-ga patch queue for 2.9

* fix make check failure of guest-get-fsinfo when nested virtual block
  device partitions are mounted in the test environment
* fix static compilation for mingw builds

# gpg: Signature made Fri 31 Mar 2017 04:52:40 BST
# gpg:                using RSA key 0x3353C9CEF108B584
# gpg: Good signature from "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2017-03-30-tag:
  qga: Make qemu-ga compile statically for Windows
  qga: don't fail if mount doesn't have slave devices

Signed-off-by: Peter Maydell <address@hidden>

Compare: https://github.com/qemu/qemu/compare/a0ee3797bf49...05a6f451eb0e

reply via email to

[Prev in Thread] Current Thread [Next in Thread]