| Message ID | 1436244020-27822-1-git-send-email-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 7 July 2015 at 05:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > Hi Peter, > > Sorry for the last minute pull. This is a round-up of all tested/reviewed > qemu-ga patches posted prior to soft-freeze, along with 1 bug fix that > came in last week. > > This adds win32 implementations of: > guest-get-fsinfo > guest-network-get-interfaces > > and modifies guest-fstrim to return per-mount results and continue on to other > mounts even when a failure is encountered. > > There's also bug fixes for guest-fstrim and guest-set-time. > > The following changes since commit 7edd8e4660beb301d527257f8e04ebec0f841cb0: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-06 14:03:44 +0100) > > are available in the git repository at: > > > git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-06-tag > > for you to fetch changes up to d1ad92aab4a9419538b7b1b7423a8a770c7a2859: > > qga: added GuestPCIAddress information (2015-07-06 23:06:12 -0500) > > ---------------------------------------------------------------- > tag for qga-pull-2015-07-06 Hi. I'm afraid this doesn't build for me for Windows: /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:21:22: error: ws2ipdef.h: No such file or directory CC qga/vss-win32.o CC qga/qapi-generated/qga-qapi-types.o /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:25:22: error: ntddscsi.h: No such file or directory CC qga/qapi-generated/qga-qapi-visit.o CC qga/qapi-generated/qga-qmp-marshal.o cc1: warnings being treated as errors /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:39: warning: ‘GUID_DEVINTERFACE_VOLUME’ initialized and declared ‘extern’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:101: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘win2qemu’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:124: error: expected ‘)’ before ‘bus’ AR libqemuutil.a /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In function ‘get_disk_bus_type’: /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: ‘STORAGE_PROPERTY_QUERY’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: (Each undeclared identifier is reported only once /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: for each function it appears in.) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: expected ‘;’ before ‘query’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: ‘STORAGE_DEVICE_DESCRIPTOR’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: ‘dev_desc’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: ‘buf’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: warning: left-hand operand of comma expression has no effect /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: ‘query’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: ‘StorageDeviceProperty’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:533: error: ‘PropertyStandardQuery’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:535: error: ‘IOCTL_STORAGE_QUERY_PROPERTY’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:543: warning: control reaches end of non-void function /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In function ‘build_guest_disk_info’: /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: ‘SCSI_ADDRESS’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: expected ‘;’ before ‘addr’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: ‘scsi_ad’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: ‘addr’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: warning: implicit declaration of function ‘find_bus_type’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: warning: nested extern declaration of ‘find_bus_type’ /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: ‘BusTypeScsi’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: ‘BusTypeAta’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: ‘BusTypeRAID’ undeclared (first use in this function) /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:583: error: ‘IOCTL_SCSI_GET_ADDRESS’ undeclared (first use in this function) make: *** [qga/commands-win32.o] Error 1 thanks -- PMM
On 07/07/15 13:32, Peter Maydell wrote: > On 7 July 2015 at 05:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: >> Hi Peter, >> >> Sorry for the last minute pull. This is a round-up of all tested/reviewed >> qemu-ga patches posted prior to soft-freeze, along with 1 bug fix that >> came in last week. >> >> This adds win32 implementations of: >> guest-get-fsinfo >> guest-network-get-interfaces >> >> and modifies guest-fstrim to return per-mount results and continue on to other >> mounts even when a failure is encountered. >> >> There's also bug fixes for guest-fstrim and guest-set-time. >> >> The following changes since commit 7edd8e4660beb301d527257f8e04ebec0f841cb0: >> >> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-06 14:03:44 +0100) >> >> are available in the git repository at: >> >> >> git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-06-tag >> >> for you to fetch changes up to d1ad92aab4a9419538b7b1b7423a8a770c7a2859: >> >> qga: added GuestPCIAddress information (2015-07-06 23:06:12 -0500) >> >> ---------------------------------------------------------------- >> tag for qga-pull-2015-07-06 > Hi. I'm afraid this doesn't build for me for Windows: > > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:21:22: > error: ws2ipdef.h: No such file or directory > CC qga/vss-win32.o > CC qga/qapi-generated/qga-qapi-types.o > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:25:22: > error: ntddscsi.h: No such file or directory I am using the following mingw cross [gray_pig@gray qemu]$ rpm -qf /usr/x86_64-w64-mingw32/sys-root/mingw/include/ntddscsi.h mingw64-headers-4.0.2-1.el7.noarch Do we have minimal version which should be supported for the case? If so, should we use config option for this or bump minimal version? IMHO this is the root of all problems below. > CC qga/qapi-generated/qga-qapi-visit.o > CC qga/qapi-generated/qga-qmp-marshal.o > cc1: warnings being treated as errors > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:39: > warning: ‘GUID_DEVINTERFACE_VOLUME’ initialized and declared ‘extern’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:101: error: > expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘win2qemu’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:124: error: > expected ‘)’ before ‘bus’ > AR libqemuutil.a > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In > function ‘get_disk_bus_type’: > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > ‘STORAGE_PROPERTY_QUERY’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > (Each undeclared identifier is reported only once > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > for each function it appears in.) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > expected ‘;’ before ‘query’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘STORAGE_DEVICE_DESCRIPTOR’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘dev_desc’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘buf’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: > warning: left-hand operand of comma expression has no effect > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: > ‘query’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: > ‘StorageDeviceProperty’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:533: error: > ‘PropertyStandardQuery’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:535: error: > ‘IOCTL_STORAGE_QUERY_PROPERTY’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:543: > warning: control reaches end of non-void function > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In > function ‘build_guest_disk_info’: > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: > ‘SCSI_ADDRESS’ undeclared (first use in this function) > To link the part of code connected with setupapi we use -lsetupapi option. It seems you are missing this lib. > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: > expected ‘;’ before ‘addr’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: > ‘scsi_ad’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: > ‘addr’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: > warning: implicit declaration of function ‘find_bus_type’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: > warning: nested extern declaration of ‘find_bus_type’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeScsi’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeAta’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeRAID’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:583: error: > ‘IOCTL_SCSI_GET_ADDRESS’ undeclared (first use in this function) > make: *** [qga/commands-win32.o] Error 1 > > thanks > -- PMM >
On 7 July 2015 at 14:06, Olga Krishtal <okrishtal@parallels.com> wrote: > On 07/07/15 13:32, Peter Maydell wrote: >> >> On 7 July 2015 at 05:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: >>> >>> Hi Peter, >>> >>> Sorry for the last minute pull. This is a round-up of all tested/reviewed >>> qemu-ga patches posted prior to soft-freeze, along with 1 bug fix that >>> came in last week. >>> >>> This adds win32 implementations of: >>> guest-get-fsinfo >>> guest-network-get-interfaces >>> >>> and modifies guest-fstrim to return per-mount results and continue on to >>> other >>> mounts even when a failure is encountered. >>> >>> There's also bug fixes for guest-fstrim and guest-set-time. >>> >>> The following changes since commit >>> 7edd8e4660beb301d527257f8e04ebec0f841cb0: >>> >>> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into >>> staging (2015-07-06 14:03:44 +0100) >>> >>> are available in the git repository at: >>> >>> >>> git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-06-tag >>> >>> for you to fetch changes up to d1ad92aab4a9419538b7b1b7423a8a770c7a2859: >>> >>> qga: added GuestPCIAddress information (2015-07-06 23:06:12 -0500) >>> >>> ---------------------------------------------------------------- >>> tag for qga-pull-2015-07-06 >> >> Hi. I'm afraid this doesn't build for me for Windows: >> >> /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:21:22: >> error: ws2ipdef.h: No such file or directory >> CC qga/vss-win32.o >> CC qga/qapi-generated/qga-qapi-types.o >> /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:25:22: >> error: ntddscsi.h: No such file or directory > > I am using the following mingw cross > [gray_pig@gray qemu]$ rpm -qf > /usr/x86_64-w64-mingw32/sys-root/mingw/include/ntddscsi.h > mingw64-headers-4.0.2-1.el7.noarch > > Do we have minimal version which should be supported for the > case? If so, should we use config option for this or bump > minimal version? > > IMHO this is the root of all problems below. Yes, my windows build environment is a fairly old one (ubuntu host, mingw32-runtime 3.15.2-0ubuntu1). It looks like in older versions of mingw this header is in ddk/ntddscsi.h, see for instance: http://sourceforge.net/p/mingw-w64/mailman/mingw-w64-public/thread/4C1E3BCE.6090901@yahoo.de/ It's OK if we make new features dependent on having a newer mingw, but you need to have a configure check to make sure the things you depend on exist. thanks -- PMM
On 7 July 2015 at 14:06, Olga Krishtal <okrishtal@parallels.com> wrote: > Do we have minimal version which should be supported for the > case? If so, should we use config option for this or bump > minimal version? Incidentally, I don't inherently object to bumping the minimum version of mingw or whatever here; that's a decision for the win32 maintainer. I would prefer that we don't make the change on the eve of hardfreeze, though... thanks -- PMM
On 07/07/15 13:32, Peter Maydell wrote: > On 7 July 2015 at 05:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: >> Hi Peter, >> >> Sorry for the last minute pull. This is a round-up of all tested/reviewed >> qemu-ga patches posted prior to soft-freeze, along with 1 bug fix that >> came in last week. >> >> This adds win32 implementations of: >> guest-get-fsinfo >> guest-network-get-interfaces >> >> and modifies guest-fstrim to return per-mount results and continue on to other >> mounts even when a failure is encountered. >> >> There's also bug fixes for guest-fstrim and guest-set-time. >> >> The following changes since commit 7edd8e4660beb301d527257f8e04ebec0f841cb0: >> >> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-06 14:03:44 +0100) >> >> are available in the git repository at: >> >> >> git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-06-tag >> >> for you to fetch changes up to d1ad92aab4a9419538b7b1b7423a8a770c7a2859: >> >> qga: added GuestPCIAddress information (2015-07-06 23:06:12 -0500) >> >> ---------------------------------------------------------------- >> tag for qga-pull-2015-07-06 > Hi. I'm afraid this doesn't build for me for Windows: > > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:21:22: > error: ws2ipdef.h: No such file or directory > CC qga/vss-win32.o > CC qga/qapi-generated/qga-qapi-types.o > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:25:22: > error: ntddscsi.h: No such file or directory > CC qga/qapi-generated/qga-qapi-visit.o > CC qga/qapi-generated/qga-qmp-marshal.o > cc1: warnings being treated as errors > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:39: > warning: ‘GUID_DEVINTERFACE_VOLUME’ initialized and declared ‘extern’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:101: error: > expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘win2qemu’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:124: error: > expected ‘)’ before ‘bus’ > AR libqemuutil.a > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In > function ‘get_disk_bus_type’: > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > ‘STORAGE_PROPERTY_QUERY’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > (Each undeclared identifier is reported only once > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > for each function it appears in.) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:526: error: > expected ‘;’ before ‘query’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘STORAGE_DEVICE_DESCRIPTOR’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘dev_desc’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: error: > ‘buf’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:527: > warning: left-hand operand of comma expression has no effect > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: > ‘query’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:532: error: > ‘StorageDeviceProperty’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:533: error: > ‘PropertyStandardQuery’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:535: error: > ‘IOCTL_STORAGE_QUERY_PROPERTY’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:543: > warning: control reaches end of non-void function > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c: In > function ‘build_guest_disk_info’: > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: > ‘SCSI_ADDRESS’ undeclared (first use in this function) > > > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:552: error: > expected ‘;’ before ‘addr’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: > ‘scsi_ad’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:557: error: > ‘addr’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: > warning: implicit declaration of function ‘find_bus_type’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:573: > warning: nested extern declaration of ‘find_bus_type’ > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeScsi’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeAta’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:574: error: > ‘BusTypeRAID’ undeclared (first use in this function) > /home/petmay01/linaro/qemu-for-merges/qga/commands-win32.c:583: error: > ‘IOCTL_SCSI_GET_ADDRESS’ undeclared (first use in this function) > make: *** [qga/commands-win32.o] Error 1 > > thanks > -- PMM > To get same errors I exclude #include <initguid.h> #include <winioctl.h> #include <ntddscsi.h>
On 7 July 2015 at 14:25, Olga Krishtal <okrishtal@parallels.com> wrote: > To get same errors I exclude > #include <initguid.h> > #include <winioctl.h> > #include <ntddscsi.h> In my mingw setup the first two of these exist, but ntddscsi.h is in ddk/. -- PMM
Hi Peter, Sorry for the last minute pull. This is a round-up of all tested/reviewed qemu-ga patches posted prior to soft-freeze, along with 1 bug fix that came in last week. This adds win32 implementations of: guest-get-fsinfo guest-network-get-interfaces and modifies guest-fstrim to return per-mount results and continue on to other mounts even when a failure is encountered. There's also bug fixes for guest-fstrim and guest-set-time. The following changes since commit 7edd8e4660beb301d527257f8e04ebec0f841cb0: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-06 14:03:44 +0100) are available in the git repository at: git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-06-tag for you to fetch changes up to d1ad92aab4a9419538b7b1b7423a8a770c7a2859: qga: added GuestPCIAddress information (2015-07-06 23:06:12 -0500) ---------------------------------------------------------------- tag for qga-pull-2015-07-06 ---------------------------------------------------------------- Justin Ossevoort (2): qga/commands-posix: Fix bug in guest-fstrim qga/qmp_guest_fstrim: Return per path fstrim result Kirk Allan (2): qga: add win32 library iphlpapi qga: win32 qmp_guest_network_get_interfaces implementation Marc-André Lureau (1): qga: fail early for invalid time Markus Armbruster (1): Revert "guest agent: remove g_strcmp0 usage" Olga Krishtal (4): qga: added empty qmp_quest_get_fsinfo functionality. qga: added mountpoint and filesystem type for single volume qga: added bus type and disk location path qga: added GuestPCIAddress information configure | 2 +- qga/commands-posix.c | 70 +++++-- qga/commands-win32.c | 518 ++++++++++++++++++++++++++++++++++++++++++++++++++- qga/main.c | 2 +- qga/qapi-schema.json | 44 ++++- 5 files changed, 605 insertions(+), 31 deletions(-)