On 11/25/2015 09:46 AM, Michael Roth wrote: > Quoting Eric Blake (2015-11-25 10:41:35) >> On 11/25/2015 09:21 AM, Michael Roth wrote: >> >>>>> + /* seek to 0 */ >>>>> + cmd = g_strdup_printf("{'execute': 'guest-file-seek'," >>>>> + " 'arguments': { 'handle': %" PRId64 ", " >>>>> + " 'offset': %d, 'whence': %d } }", >>>>> + id, 0, SEEK_SET); >>>> >>>> We still have a conflict between this series and my proposal to codify 0 >>>> rather than relying on platform-specific SEEK_SET; Markus had the >>>> suggestion of using QGA_SET (or QGA_SEEK_SET). Are we trying to get >>>> both your series and my v2 patch into 2.5? Knowing that will help me >>>> decide whether my v2 should be rebased on top of your patches. >>> >>> I was planning on pulling in your patch on top of this for the next >>> 2.5 pull, so rebasing on top of this series is probably best. >> >> Okay, will do, and will do quickly so I'm not holding up your pull request. > > Thanks! FYI I now have this series applied here if you'd like to base > on that: > > https://github.com/mdroth/qemu/commits/qga
On that branch, commit 7a38932 has two typos: s/is commit msg (Lazlo)/in commit msg (Laszlo)/ -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature