Re: [Qemu-block] [Qemu-devel] [PATCH RFC v2 0/2] MSI/MSIX: fix to catch and report errors

2015-12-17 Thread Cao jin
Ping. About cleanup: 1. When realize()/init() fail, PCI device will free the config space memory, so the necessary cleanup I can find until now is: MemoryRegion object. Maybe I missed something to cleanup, hope for comments. 2. certain instance: move the msi/msxi init func to the beginning

Re: [Qemu-block] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments

2015-12-17 Thread Kevin Wolf
Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben: > Signed-off-by: Fam Zheng > --- > tests/qemu-iotests/094 | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 > index 27a2be2..d30c78d 100755 > ---

Re: [Qemu-block] [Qemu-devel] [PATCH v3 03/11] fdc: add disk field

2015-12-17 Thread Markus Armbruster
John Snow writes: > This allows us to distinguish between the current disk type and the > current drive type. The drive is what's reported to CMOS, the disk is > whatever the pick_geometry function suspects has been inserted. > > The drive field maintains the exact same meaning

[Qemu-block] [PATCH 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

2015-12-17 Thread Markus Armbruster
This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. Signed-off-by: Markus Armbruster --- scripts/tracetool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 83bde7b..7b82959 100755 ---

[Qemu-block] [PATCH 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
PEP 8 calls for it, because it's forward compatibile with Python 3. Signed-off-by: Markus Armbruster --- scripts/qapi.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 7c50cc4..ba7151b 100644 ---

[Qemu-block] [PATCH 2/4] scripts/qmp: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
PEP 8 calls for it, because it's forward compatibile with Python 3. Signed-off-by: Markus Armbruster --- scripts/qmp/qemu-ga-client | 2 +- scripts/qmp/qmp| 4 ++-- scripts/qmp/qmp-shell | 2 +- scripts/qmp/qmp.py | 4 ++-- 4 files changed, 6

[Qemu-block] [PATCH 0/4] Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
I can take this through my tree, but of course don't mind if a maintainer prefers to pick up "his" parts. Markus Armbruster (4): qapi: Use Python 2.6 "except E as ..." syntax scripts/qmp: Use Python 2.6 "except E as ..." syntax Revert "tracetool: use Python 2.4-compatible exception handling

[Qemu-block] [PATCH 4/4] tests: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
PEP 8 calls for it, because it's forward compatibile with Python 3. Signed-off-by: Markus Armbruster --- tests/image-fuzzer/runner.py | 12 ++-- tests/qemu-iotests/qed.py| 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git

Re: [Qemu-block] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments

2015-12-17 Thread Kevin Wolf
Am 17.12.2015 um 13:44 hat Fam Zheng geschrieben: > On Thu, 12/17 09:21, Kevin Wolf wrote: > > Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben: > > > Signed-off-by: Fam Zheng > > > --- > > > tests/qemu-iotests/094 | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) >

Re: [Qemu-block] Addressability of Block-jobs after bdrv_swap removal

2015-12-17 Thread Markus Armbruster
Kevin Wolf writes: > Am 09.12.2015 um 21:59 hat John Snow geschrieben: >> I have a question about how the device name of block jobs gets reported >> now after the bdrv_swap removal patch. >> >> Previously, it appears that the job stayed attached to the root-node (if >>

Re: [Qemu-block] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments

2015-12-17 Thread Fam Zheng
On Thu, 12/17 09:21, Kevin Wolf wrote: > Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben: > > Signed-off-by: Fam Zheng > > --- > > tests/qemu-iotests/094 | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/tests/qemu-iotests/094

Re: [Qemu-block] [Qemu-devel] [PATCH 1/1] HMP: Add equivalent to x-blockdev-change

2015-12-17 Thread Eric Blake
On 12/17/2015 03:47 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > x-blockdev-change has no HMP equivalent, so add x_block_change. > > Example useages are: s/useages/usages/ > x_block_change foo -a bah >to add the node bah to the parent

Re: [Qemu-block] [Qemu-devel] [PATCH 1/1] HMP: Add equivalent to x-blockdev-change

2015-12-17 Thread Dr. David Alan Gilbert
* Eric Blake (ebl...@redhat.com) wrote: > On 12/17/2015 03:47 AM, Dr. David Alan Gilbert (git) wrote: > > From: "Dr. David Alan Gilbert" > > > > x-blockdev-change has no HMP equivalent, so add x_block_change. > > > > Example useages are: > > s/useages/usages/ Yep. > >

Re: [Qemu-block] [Qemu-devel] [PATCH v3 02/11] fdc: refactor pick_geometry

2015-12-17 Thread John Snow
On 12/17/2015 02:53 AM, Markus Armbruster wrote: > John Snow writes: > >> Modify this function to operate directly on FDrive objects instead of >> unpacking and passing all of those parameters manually. >> >> Helps reduce complexity in each caller, and reduces the number of

Re: [Qemu-block] [Qemu-devel] [PATCH 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Eric Blake
On 12/17/2015 03:06 AM, Markus Armbruster wrote: > PEP 8 calls for it, because it's forward compatibile with Python 3. And possible as a cleanup only because we require 2.6 as a minimum since fec21036 (your subject line hints at it, even if not stating it outright). > > Signed-off-by: Markus

Re: [Qemu-block] [Qemu-devel] [PATCH 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

2015-12-17 Thread Markus Armbruster
Eric Blake writes: > On 12/17/2015 03:06 AM, Markus Armbruster wrote: >> This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. >> >> Signed-off-by: Markus Armbruster >> --- >> scripts/tracetool.py | 4 ++-- >> 1 file changed, 2 insertions(+), 2

Re: [Qemu-block] [Qemu-devel] [PATCH 2/4] scripts/qmp: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Eric Blake
On 12/17/2015 03:06 AM, Markus Armbruster wrote: > PEP 8 calls for it, because it's forward compatibile with Python 3. Here, and also in 1/4, s/compatibile/compatible/ > > Signed-off-by: Markus Armbruster > --- > scripts/qmp/qemu-ga-client | 2 +- > scripts/qmp/qmp

Re: [Qemu-block] [Qemu-devel] [PATCH 4/4] tests: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Eric Blake
On 12/17/2015 03:06 AM, Markus Armbruster wrote: > PEP 8 calls for it, because it's forward compatibile with Python 3. Another s/compatibile/compatible/ > > Signed-off-by: Markus Armbruster > --- > tests/image-fuzzer/runner.py | 12 ++-- > tests/qemu-iotests/qed.py

Re: [Qemu-block] [Qemu-devel] [PATCH 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

2015-12-17 Thread Eric Blake
On 12/17/2015 03:06 AM, Markus Armbruster wrote: > This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. > > Signed-off-by: Markus Armbruster > --- > scripts/tracetool.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Might be nice to mention fec21036 as

Re: [Qemu-block] [Qemu-devel] [PATCH v3 03/11] fdc: add disk field

2015-12-17 Thread Markus Armbruster
John Snow writes: > On 12/17/2015 03:30 AM, Markus Armbruster wrote: >> John Snow writes: >> >>> This allows us to distinguish between the current disk type and the >>> current drive type. The drive is what's reported to CMOS, the disk is >>> whatever the

Re: [Qemu-block] [Qemu-devel] [PATCH v3 03/11] fdc: add disk field

2015-12-17 Thread John Snow
On 12/17/2015 03:30 AM, Markus Armbruster wrote: > John Snow writes: > >> This allows us to distinguish between the current disk type and the >> current drive type. The drive is what's reported to CMOS, the disk is >> whatever the pick_geometry function suspects has been

Re: [Qemu-block] [Qemu-devel] [PATCH 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
Eric Blake writes: > On 12/17/2015 03:06 AM, Markus Armbruster wrote: >> PEP 8 calls for it, because it's forward compatibile with Python 3. > > And possible as a cleanup only because we require 2.6 as a minimum since > fec21036 (your subject line hints at it, even if not

Re: [Qemu-block] [PATCH] iscsi: fix readcapacity error message

2015-12-17 Thread John Snow
On 12/15/2015 11:40 PM, Zhu Lingshan wrote: > fix:The error message for readcapacity 16 incorrectly mentioned > a readcapacity 10 failure, fixed the error message. > > Signed-off-by: Zhu Lingshan > --- > block/iscsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >

Re: [Qemu-block] [Qemu-devel] [PATCH v3 03/11] fdc: add disk field

2015-12-17 Thread John Snow
On 12/17/2015 01:15 PM, Markus Armbruster wrote: > John Snow writes: > >> On 12/17/2015 03:30 AM, Markus Armbruster wrote: >>> John Snow writes: >>> This allows us to distinguish between the current disk type and the current drive type. The drive

Re: [Qemu-block] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments

2015-12-17 Thread Paolo Bonzini
On 17/12/2015 09:21, Kevin Wolf wrote: >> > -# 'format': 'nbd' is not actually "correct", but this is probably the >> > only way >> > -# to test bdrv_swap() on an NBD BDS >> > _send_qemu_cmd $QEMU_HANDLE \ >> > "{'execute': 'drive-mirror', >> >'arguments': {'device': 'src', >

Re: [Qemu-block] [Qemu-devel] [PATCH v3 02/11] fdc: refactor pick_geometry

2015-12-17 Thread Markus Armbruster
John Snow writes: > On 12/17/2015 02:53 AM, Markus Armbruster wrote: >> John Snow writes: >> >>> Modify this function to operate directly on FDrive objects instead of >>> unpacking and passing all of those parameters manually. >>> >>> Helps reduce complexity

Re: [Qemu-block] [PATCH 0/4] Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Stefan Hajnoczi
On Thu, Dec 17, 2015 at 11:06:27AM +0100, Markus Armbruster wrote: > I can take this through my tree, but of course don't mind if a > maintainer prefers to pick up "his" parts. > > Markus Armbruster (4): > qapi: Use Python 2.6 "except E as ..." syntax > scripts/qmp: Use Python 2.6 "except E

Re: [Qemu-block] RFC: Operation Blockers in QEMU Block Nodes

2015-12-17 Thread Stefan Hajnoczi
On Wed, Dec 16, 2015 at 01:25:29AM -0500, Jeff Cody wrote: > Background: > > Block jobs, and other QAPI operations, may modify and impact the > BlockDriverState graph in QEMU. In order to support multiple > operations safely, we need a mechanism to block and gate operations, > > We

[Qemu-block] [PATCH v2 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

2015-12-17 Thread Markus Armbruster
This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. We require Python 2.6 now (commit fec2103). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Acked-by: Stefan Hajnoczi --- scripts/tracetool.py | 4 ++-- 1 file

[Qemu-block] [PATCH v2 4/4] tests: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
PEP 8 calls for it, because it's forward compatible with Python 3. Supported since Python 2.6, which we require (commit fec2103). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Acked-by: Stefan Hajnoczi ---

[Qemu-block] [PATCH v2 0/4] Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
I can take this through my tree, but of course don't mind if a maintainer prefers to pick up "his" parts. v2: * Commit messages improved [Eric, Peter] Markus Armbruster (4): qapi: Use Python 2.6 "except E as ..." syntax scripts/qmp: Use Python 2.6 "except E as ..." syntax Revert

[Qemu-block] [PATCH v2 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Markus Armbruster
PEP 8 calls for it, because it's forward compatible with Python 3. Supported since Python 2.6, which we require (commit fec2103). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Acked-by: Stefan Hajnoczi --- scripts/qapi.py |

Re: [Qemu-block] [Qemu-devel] [PATCH 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

2015-12-17 Thread Eric Blake
On 12/17/2015 11:37 AM, Markus Armbruster wrote: > Eric Blake writes: > >> On 12/17/2015 03:06 AM, Markus Armbruster wrote: >>> This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. >>> >>> Signed-off-by: Markus Armbruster >>> --- >>>

Re: [Qemu-block] [Qemu-devel] [PATCH 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Eric Blake
On 12/17/2015 11:35 AM, Markus Armbruster wrote: > Eric Blake writes: > >> On 12/17/2015 03:06 AM, Markus Armbruster wrote: >>> PEP 8 calls for it, because it's forward compatibile with Python 3. >> >> And possible as a cleanup only because we require 2.6 as a minimum since >>

Re: [Qemu-block] [Qemu-devel] [PATCH 1/4] qapi: Use Python 2.6 "except E as ..." syntax

2015-12-17 Thread Peter Maydell
On 17 December 2015 at 10:06, Markus Armbruster wrote: > PEP 8 calls for it, because it's forward compatibile with Python 3. Typo nit: "compatible". thanks -- PMM

[Qemu-block] [PATCH v2 2/2] iotests: Update comments for bdrv_swap() in 094

2015-12-17 Thread Fam Zheng
Signed-off-by: Fam Zheng --- tests/qemu-iotests/094 | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 27a2be2..57a68f8 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -1,6 +1,6 @@

[Qemu-block] [PATCH v2 0/2] Clean up the remainders of bdrv_swap

2015-12-17 Thread Fam Zheng
v2: Update comment in patch 2. [Kevin] Fam Zheng (2): block: Remove prototype of bdrv_swap from header iotests: Update comments for bdrv_swap() in 094 include/block/block.h | 1 - tests/qemu-iotests/094 | 8 +--- 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.4.3

[Qemu-block] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header

2015-12-17 Thread Fam Zheng
The function has gone. Signed-off-by: Fam Zheng --- include/block/block.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/block/block.h b/include/block/block.h index d048bbf..a36975a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -197,7 +197,6 @@