On Mon 12 Oct 2015 10:29:35 PM CEST, Max Reitz <mre...@redhat.com> wrote: >> - if (has_snapshot_node_name && >> - bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) { >> - error_setg(errp, "New snapshot node name already in use"); > > There's a difference from v6 here... [...] >> - options = qdict_new(); >> - if (has_snapshot_node_name) { >> - qdict_put(options, "node-name", >> - qstring_from_str(snapshot_node_name)); >> + if (snapshot_node_name && >> + bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) { >> + error_setg(errp, "New snapshot node name already in use"); > > ...and here, but how to resolve the conflict resulting from the newly > added patch 1 was obvious, so my R-b stands, of course.
The differences are because this patch is now rebased on top of the new one, sorry if I overstepped by keeping your R-b here! >> + if (state->new_bs->backing_hd != NULL) { >> + error_setg(errp, "The snapshot already has a backing image"); >> } > > It's here: In case Kevin's series is applied before this one (which > I'm assuming since you were brave enough to base this series on my BB > series), this needs to be s/backing_hd/backing/. I'm just saying this > so you know you can keep my R-b then. Sure, I was about to test your new version of the series. Thanks, Berto