| Message ID | 20220907150327.538464-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any user-visible changes.
Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: > The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: > > Merge tag 'samuel-thibault' of https://people.debian.org/~sthibault/qemu into staging (2022-09-06 08:31:24 -0400) > > are available in the Git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-09-07 > > for you to fetch changes up to 6e7a37ffc230d06852f1a8893097331d39df77c9: > > qapi: fix examples of events missing timestamp (2022-09-07 15:10:13 +0200) > > ---------------------------------------------------------------- > QAPI patches patches for 2022-09-07 > > ---------------------------------------------------------------- > Victor Toso (10): > qapi: fix example of query-ballon command > qapi: fix example of query-vnc command > qapi: fix example of query-dump-guest-memory-capability command > qapi: fix example of BLOCK_JOB_READY event > qapi: fix example of NIC_RX_FILTER_CHANGED event > qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event > qapi: fix example of MEM_UNPLUG_ERROR event > qapi: fix examples of blockdev-add with qcow2 NACK, this patch is wrong. 'file' is a required member (defined in BlockdevOptionsGenericFormat), removing it makes the example invalid. 'data-file' is only an additional optional member to be used for external data files (i.e. when the guest data is kept separate from the metadata in the .qcow2 file). Kevin > qapi: fix example of query-hotpluggable-cpus command > qapi: fix examples of events missing timestamp > > qapi/block-core.json | 12 ++++++------ > qapi/dump.json | 2 +- > qapi/machine.json | 8 ++++---- > qapi/migration.json | 27 +++++++++++++++++++++++---- > qapi/net.json | 1 - > qapi/qdev.json | 3 +-- > qapi/ui.json | 4 ++-- > 7 files changed, 37 insertions(+), 20 deletions(-) > > -- > 2.37.2 > >
Kevin Wolf <kwolf@redhat.com> writes: > Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: >> The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: >> >> Merge tag 'samuel-thibault' of https://people.debian.org/~sthibault/qemu into staging (2022-09-06 08:31:24 -0400) >> >> are available in the Git repository at: >> >> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-09-07 >> >> for you to fetch changes up to 6e7a37ffc230d06852f1a8893097331d39df77c9: >> >> qapi: fix examples of events missing timestamp (2022-09-07 15:10:13 +0200) >> >> ---------------------------------------------------------------- >> QAPI patches patches for 2022-09-07 >> >> ---------------------------------------------------------------- >> Victor Toso (10): >> qapi: fix example of query-ballon command >> qapi: fix example of query-vnc command >> qapi: fix example of query-dump-guest-memory-capability command >> qapi: fix example of BLOCK_JOB_READY event >> qapi: fix example of NIC_RX_FILTER_CHANGED event >> qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event >> qapi: fix example of MEM_UNPLUG_ERROR event >> qapi: fix examples of blockdev-add with qcow2 > > NACK, this patch is wrong. > > 'file' is a required member (defined in BlockdevOptionsGenericFormat), > removing it makes the example invalid. 'data-file' is only an additional > optional member to be used for external data files (i.e. when the guest > data is kept separate from the metadata in the .qcow2 file). I'll respin with #8 dropped. Thank you! [...]
Markus Armbruster <armbru@redhat.com> writes: > Kevin Wolf <kwolf@redhat.com> writes: > >> Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: >>> The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: >>> >>> Merge tag 'samuel-thibault' of https://people.debian.org/~sthibault/qemu into staging (2022-09-06 08:31:24 -0400) >>> >>> are available in the Git repository at: >>> >>> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-09-07 >>> >>> for you to fetch changes up to 6e7a37ffc230d06852f1a8893097331d39df77c9: >>> >>> qapi: fix examples of events missing timestamp (2022-09-07 15:10:13 +0200) >>> >>> ---------------------------------------------------------------- >>> QAPI patches patches for 2022-09-07 >>> >>> ---------------------------------------------------------------- >>> Victor Toso (10): >>> qapi: fix example of query-ballon command >>> qapi: fix example of query-vnc command >>> qapi: fix example of query-dump-guest-memory-capability command >>> qapi: fix example of BLOCK_JOB_READY event >>> qapi: fix example of NIC_RX_FILTER_CHANGED event >>> qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event >>> qapi: fix example of MEM_UNPLUG_ERROR event >>> qapi: fix examples of blockdev-add with qcow2 >> >> NACK, this patch is wrong. >> >> 'file' is a required member (defined in BlockdevOptionsGenericFormat), >> removing it makes the example invalid. 'data-file' is only an additional >> optional member to be used for external data files (i.e. when the guest >> data is kept separate from the metadata in the .qcow2 file). > > I'll respin with #8 dropped. Thank you! Too late, it's already merged. Victor, could you fix on top? Or would you like me to revert the patch?
Gentle reminder, Victor :) Markus Armbruster <armbru@redhat.com> writes: > Markus Armbruster <armbru@redhat.com> writes: > >> Kevin Wolf <kwolf@redhat.com> writes: >> >>> Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: >>>> The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: >>>> >>>> Merge tag 'samuel-thibault' of https://people.debian.org/~sthibault/qemu into staging (2022-09-06 08:31:24 -0400) >>>> >>>> are available in the Git repository at: >>>> >>>> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-09-07 >>>> >>>> for you to fetch changes up to 6e7a37ffc230d06852f1a8893097331d39df77c9: >>>> >>>> qapi: fix examples of events missing timestamp (2022-09-07 15:10:13 +0200) >>>> >>>> ---------------------------------------------------------------- >>>> QAPI patches patches for 2022-09-07 >>>> >>>> ---------------------------------------------------------------- >>>> Victor Toso (10): >>>> qapi: fix example of query-ballon command >>>> qapi: fix example of query-vnc command >>>> qapi: fix example of query-dump-guest-memory-capability command >>>> qapi: fix example of BLOCK_JOB_READY event >>>> qapi: fix example of NIC_RX_FILTER_CHANGED event >>>> qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event >>>> qapi: fix example of MEM_UNPLUG_ERROR event >>>> qapi: fix examples of blockdev-add with qcow2 >>> >>> NACK, this patch is wrong. >>> >>> 'file' is a required member (defined in BlockdevOptionsGenericFormat), >>> removing it makes the example invalid. 'data-file' is only an additional >>> optional member to be used for external data files (i.e. when the guest >>> data is kept separate from the metadata in the .qcow2 file). >> >> I'll respin with #8 dropped. Thank you! > > Too late, it's already merged. > > Victor, could you fix on top? Or would you like me to revert the patch?
Markus Armbruster <armbru@redhat.com> writes: > Gentle reminder, Victor :) > > Markus Armbruster <armbru@redhat.com> writes: > >> Markus Armbruster <armbru@redhat.com> writes: >> >>> Kevin Wolf <kwolf@redhat.com> writes: >>> >>>> Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: >>>>> The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: [...] >>>>> qapi: fix examples of blockdev-add with qcow2 >>>> >>>> NACK, this patch is wrong. >>>> >>>> 'file' is a required member (defined in BlockdevOptionsGenericFormat), >>>> removing it makes the example invalid. 'data-file' is only an additional >>>> optional member to be used for external data files (i.e. when the guest >>>> data is kept separate from the metadata in the .qcow2 file). >>> >>> I'll respin with #8 dropped. Thank you! >> >> Too late, it's already merged. >> >> Victor, could you fix on top? Or would you like me to revert the patch? Revert posted: Subject: [PATCH] Revert "qapi: fix examples of blockdev-add with qcow2" Date: Fri, 30 Sep 2022 17:26:34 +0200 Message-Id: <20220930152634.774907-1-armbru@redhat.com>
Markus Armbruster <armbru@redhat.com> writes: > Markus Armbruster <armbru@redhat.com> writes: > >> Gentle reminder, Victor :) >> >> Markus Armbruster <armbru@redhat.com> writes: >> >>> Markus Armbruster <armbru@redhat.com> writes: >>> >>>> Kevin Wolf <kwolf@redhat.com> writes: >>>> >>>>> Am 07.09.2022 um 17:03 hat Markus Armbruster geschrieben: >>>>>> The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: > > [...] > >>>>>> qapi: fix examples of blockdev-add with qcow2 >>>>> >>>>> NACK, this patch is wrong. >>>>> >>>>> 'file' is a required member (defined in BlockdevOptionsGenericFormat), >>>>> removing it makes the example invalid. 'data-file' is only an additional >>>>> optional member to be used for external data files (i.e. when the guest >>>>> data is kept separate from the metadata in the .qcow2 file). >>>> >>>> I'll respin with #8 dropped. Thank you! >>> >>> Too late, it's already merged. >>> >>> Victor, could you fix on top? Or would you like me to revert the patch? > > Revert posted: > > Subject: [PATCH] Revert "qapi: fix examples of blockdev-add with qcow2" > Date: Fri, 30 Sep 2022 17:26:34 +0200 > Message-Id: <20220930152634.774907-1-armbru@redhat.com> I messed up the send. Correction is Message-Id: <20220930171908.846769-1-armbru@redhat.com>
The following changes since commit 946e9bccf12f2bcc3ca471b820738fb22d14fc80: Merge tag 'samuel-thibault' of https://people.debian.org/~sthibault/qemu into staging (2022-09-06 08:31:24 -0400) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-09-07 for you to fetch changes up to 6e7a37ffc230d06852f1a8893097331d39df77c9: qapi: fix examples of events missing timestamp (2022-09-07 15:10:13 +0200) ---------------------------------------------------------------- QAPI patches patches for 2022-09-07 ---------------------------------------------------------------- Victor Toso (10): qapi: fix example of query-ballon command qapi: fix example of query-vnc command qapi: fix example of query-dump-guest-memory-capability command qapi: fix example of BLOCK_JOB_READY event qapi: fix example of NIC_RX_FILTER_CHANGED event qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event qapi: fix example of MEM_UNPLUG_ERROR event qapi: fix examples of blockdev-add with qcow2 qapi: fix example of query-hotpluggable-cpus command qapi: fix examples of events missing timestamp qapi/block-core.json | 12 ++++++------ qapi/dump.json | 2 +- qapi/machine.json | 8 ++++---- qapi/migration.json | 27 +++++++++++++++++++++++---- qapi/net.json | 1 - qapi/qdev.json | 3 +-- qapi/ui.json | 4 ++-- 7 files changed, 37 insertions(+), 20 deletions(-)