[Qemu-devel] [PATCH v6] Add compare subcommand for qemu-img

2012-12-06 Thread Miroslav Rezanina
: - changed option for second image format to -F - changed handling of -f and -F [1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav Rezanina diff --git a/block.c b

Re: [Qemu-devel] [PATCH v6] Add compare subcommand for qemu-img

2012-12-11 Thread Miroslav Rezanina
Hi Kevin, thanks for review, comments inline. - Original Message - > From: "Kevin Wolf" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, "Paolo Bonzini" , "Stefan > Hajnoczi" > Sent: Tuesday, December 11, 2012 1:27:45 PM &g

Re: [Qemu-devel] [PATCH v7 2/4] qemu-img: Add "Quiet mode" option

2012-12-20 Thread Miroslav Rezanina
Re: [Qemu-devel] [PATCH v7 2/4] qemu-img: Add "Quiet mode" option > > On 12/17/2012 06:39 AM, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > Your git send-email settings threaded each message as a reply to the > other, rather than the more typical set

Re: [Qemu-devel] [PATCH v7 3/4] qemu-img: Add compare subcommand

2012-12-20 Thread Miroslav Rezanina
-img: Add compare subcommand > > On 12/17/2012 06:39 AM, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > This patch adds new qemu-img subcommand that compare content of two > > disk > > s/compare/compares/ > > > images. > > &

Re: [Qemu-devel] [PATCH v7 4/4] Add qemu-img compare documentation

2012-12-20 Thread Miroslav Rezanina
mu-img compare documentation > > On 12/17/2012 06:39 AM, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > Adding documentation for new qemu-img subcommand compare. > > > > Signed-off-by: Miroslav Rezanina > > --- > > qemu-img.c| 7 +

Re: [Qemu-devel] [PATCH v8 3/4] qemu-img: Add compare subcommand

2013-01-29 Thread Miroslav Rezanina
See response inline, if no response that comment will be handled in next version. - Original Message - > From: "Kevin Wolf" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Tuesday, January 29, 2013 12:28:22 PM > Subject: Re: [Qemu-

Re: [Qemu-devel] [PATCH 2/4] qemu-img: Add "Quiet mode" option

2013-02-10 Thread Miroslav Rezanina
Hi Eric, - Original Message - > From: "Eric Blake" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, kw...@redhat.com, pbonz...@redhat.com, > stefa...@redhat.com > Sent: Friday, February 8, 2013 6:07:35 PM > Subject: Re: [PATCH 2/4] qemu-img:

Re: [Qemu-devel] [PATCH 3/4] This patch adds new qemu-img subcommand that compares content of two disk images.

2013-02-10 Thread Miroslav Rezanina
- Original Message - > From: "Eric Blake" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, kw...@redhat.com, pbonz...@redhat.com, > stefa...@redhat.com > Sent: Friday, February 8, 2013 8:19:45 PM > Subject: Re: [PATCH 3/4] This patch adds ne

[Qemu-devel] [PATCH v10 1/4] block: Add synchronous wrapper for bdrv_co_is_allocated_above

2013-02-11 Thread Miroslav Rezanina
There's no synchronous wrapper for bdrv_co_is_allocated_above function so it's not possible to check for sector allocation in an image with a backing file. Signed-off-by: Miroslav Rezanina --- block.c | 39 +++ include/block/bloc

[Qemu-devel] [PATCH v10 0/4] Add subcommand compare for qemu-img

2013-02-11 Thread Miroslav Rezanina
put v2: - changed option for second image format to -F - changed handling of -f and -F [1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav Rezanina Miroslav Rez

[Qemu-devel] [PATCH v10 4/4] qemu-iotests: Add qemu-img compare test

2013-02-11 Thread Miroslav Rezanina
Simple test for qemu-img compare to check it's working correctly. Signed-off-by: Miroslav Rezanina --- tests/qemu-iotests/048 | 77 tests/qemu-iotests/048.out | 25 ++ tests/qemu-iotests/group |1 + 3 files changed

[Qemu-devel] [PATCH v10 3/4] This patch adds new qemu-img subcommand that compares content of two disk images.

2013-02-11 Thread Miroslav Rezanina
Signed-off-by: Miroslav Rezanina --- qemu-img-cmds.hx |6 + qemu-img.c | 290 +- qemu-img.texi| 53 ++ 3 files changed, 348 insertions(+), 1 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 9283776

[Qemu-devel] [PATCH v10 2/4] qemu-img: Add "Quiet mode" option

2013-02-11 Thread Miroslav Rezanina
There can be a need to turn output to stdout off. This patch adds a -q option that enable "Quiet mode". In Quiet mode, only errors are printed out. Signed-off-by: Miroslav Rezanina --- block.c | 12 ++-- blockdev.c|6 +- include/block/block.h |3 +-

Re: [Qemu-devel] [PATCH v10 3/4] This patch adds new qemu-img subcommand that compares content of two disk images.

2013-02-12 Thread Miroslav Rezanina
- Original Message - > From: "Kevin Wolf" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, pbonz...@redhat.com, stefa...@redhat.com, > ebl...@redhat.com > Sent: Tuesday, February 12, 2013 10:36:07 AM > Subject: Re: [PATCH v10 3/4] This p

Re: [Qemu-devel] [PATCH v10 0/4] Add subcommand compare for qemu-img

2013-02-13 Thread Miroslav Rezanina
Please ignore this serie. It's resended v10 instead of v11. Sorry for spam. - Original Message - > From: "Miroslav Rezanina" > To: qemu-devel@nongnu.org, qemu-devel@nongnu.org > Cc: kw...@redhat.com, pbonz...@redhat.com, stefa...@redhat.com, > ebl...@red

[Qemu-devel] [PATCH v11 0/4] Add subcommand compare for qemu-img

2013-02-13 Thread Miroslav Rezanina
f sector number for output v2: - changed option for second image format to -F - changed handling of -f and -F [1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav

[Qemu-devel] [PATCH v11 2/4] qemu-img: Add "Quiet mode" option

2013-02-13 Thread Miroslav Rezanina
There can be a need to turn output to stdout off. This patch adds a -q option that enable "Quiet mode". In Quiet mode, only errors are printed out. Signed-off-by: Miroslav Rezanina --- block.c | 12 ++-- blockdev.c|6 +- include/block/block.h |3 +-

[Qemu-devel] [PATCH v11 3/4] qemu-img: Add compare subcommand

2013-02-13 Thread Miroslav Rezanina
This patch adds new qemu-img subcommand that compares content of two disk images. Signed-off-by: Miroslav Rezanina --- qemu-img-cmds.hx |6 + qemu-img.c | 290 +- qemu-img.texi| 53 ++ 3 files changed, 348 insertions

[Qemu-devel] [PATCH v11 1/4] block: Add synchronous wrapper for bdrv_co_is_allocated_above

2013-02-13 Thread Miroslav Rezanina
There's no synchronous wrapper for bdrv_co_is_allocated_above function so it's not possible to check for sector allocation in an image with a backing file. Signed-off-by: Miroslav Rezanina --- block.c | 39 +++ include/block/bloc

[Qemu-devel] [PATCH v11 4/4] qemu-iotests: Add qemu-img compare test

2013-02-13 Thread Miroslav Rezanina
Simple test for qemu-img compare to check it's working correctly. Signed-off-by: Miroslav Rezanina --- tests/qemu-iotests/048 | 78 tests/qemu-iotests/048.out | 31 + tests/qemu-iotests/group |1 + 3 files changed

Re: [Qemu-devel] [PATCH v11 3/4] qemu-img: Add compare subcommand

2013-02-13 Thread Miroslav Rezanina
- Original Message - > From: "Eric Blake" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, kw...@redhat.com, pbonz...@redhat.com, > stefa...@redhat.com > Sent: Wednesday, February 13, 2013 2:39:59 PM > Subject: Re: [PATCH v11 3/4] qemu-img

[Qemu-devel] [PATCH] Make usb-bt-dongle configurable

2013-08-19 Thread Miroslav Rezanina
usb-bt-dongle device can't be disabled as there's dependency in vl.c file. This patch add preprocesor condition to be able to disable it. Signed-off-by: Miroslav Rezanina --- hw/usb/Makefile.objs | 1 - vl.c | 18 ++ 2 files changed, 14 insert

Re: [Qemu-devel] [PATCHv2] Make usb-bt-dongle configurable

2013-09-03 Thread Miroslav Rezanina
s) are pure code motion from vl.c, correct? > Can you split this into a separate patch please? That'll simplify the > review o the actual code changes. Yes, this is pure code motion. I'll split the code to separate patches. > > It also doesn't make much sense to compile hw/bt/ with > CONFIG_USB_BLUETOOTH=n. It's basically dead code then. > Is this true? So -bt option is not useable without usb-bt-dongle? > cheers, > Gerd > > > -- Miroslav Rezanina Software Engineer - Virtualization Team

Re: [Qemu-devel] [ANNOUNCE] QEMU 1.5.2 Stable released

2013-07-31 Thread Miroslav Rezanina
ave state directory in ga_install_service() (Laszlo Ersek) > c432c7d: qga: remove undefined behavior in ga_install_service() (Laszlo > Ersek) > > -- Miroslav Rezanina Software Engineer - Virtualization Team

[Qemu-devel] Man page: Add -global description

2012-03-13 Thread Miroslav Rezanina
There's only TODO information in qemu man page for -global option. This is a basic description of this option with simple example. Signed-off-by: Miroslav Rezanina Patch: -- diff --git a/qemu-options.hx b/qemu-options.hx index daefce3..56d8c78 100644 --- a/qemu-options.hx +++ b/qemu-optio

Re: [Qemu-devel] Man page: Add -global description

2012-03-14 Thread Miroslav Rezanina
- Original Message - > From: "Paolo Bonzini" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Wednesday, March 14, 2012 8:42:00 AM > Subject: Re: Man page: Add -global description > > Il 13/03/2012 19:09, Miroslav Rezanina ha scr

[Qemu-devel] [PATCH v2] Man page: Add -global description

2012-03-14 Thread Miroslav Rezanina
There's only TODO information in qemu man page for -global option. This is a basic description of this option with simple example. Signed-off-by: Miroslav Rezanina Patch: -- diff --git a/qemu-options.hx b/qemu-options.hx index daefce3..876f929 100644 --- a/qemu-options.hx +++ b/qemu-optio

Re: [Qemu-devel] [PATCH v2] Man page: Add -global description

2012-03-15 Thread Miroslav Rezanina
- Original Message - > From: "Peter Maydell" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Wednesday, March 14, 2012 7:21:30 PM > Subject: Re: [Qemu-devel] [PATCH v2] Man page: Add -global description > > On 14 March 2012 08:53, M

[Qemu-devel] [PATCH v3] Man page: Add -global description

2012-03-15 Thread Miroslav Rezanina
There's only TODO information in qemu man page for -global option. This is a basic description of this option with simple example. Signed-off-by: Miroslav Rezanina Patch: -- diff --git a/qemu-options.hx b/qemu-options.hx index daefce3..db8be37 100644 --- a/qemu-options.hx +++ b/qemu-optio

[Qemu-devel] [PATCH v4] Man page: Add -global description

2012-03-21 Thread Miroslav Rezanina
There's only TODO information in qemu man page for -global option. This is a basic description of this option with simple example. Signed-off-by: Miroslav Rezanina v4: - break long line v3: - add use case description - use prop instead of property v2: - Use better value in ex

[Qemu-devel] [PATCH] Add -netdev to man page

2012-03-01 Thread Miroslav Rezanina
There's missing -netdev description in the man page for qemu. As this is recommended way to create network backend, lack of documentation can discourage its usage. -net option is preserved but marked as obsolete way. Signed-off-by: Miroslav Rezanina Patch: - diff --git a/qemu-options

Re: [Qemu-devel] [PATCH] Add -netdev to man page

2012-03-01 Thread Miroslav Rezanina
Hi Markus, thanks for comments see inline: - Original Message - > From: "Markus Armbruster" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Thursday, March 1, 2012 4:50:35 PM > Subject: Re: [Qemu-devel] [PATCH] Add -netdev to man

Re: [Qemu-devel] [PATCH] Add -netdev to man page

2012-03-03 Thread Miroslav Rezanina
- Original Message - > From: "Markus Armbruster" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Thursday, March 1, 2012 4:50:35 PM > Subject: Re: [Qemu-devel] [PATCH] Add -netdev to man page > > Miroslav Rezanina writes: > &g

[Qemu-devel] [PATCH v2] Add -netdev to man page

2012-03-03 Thread Miroslav Rezanina
There's missing -netdev description in the man page for qemu. As this is recommended way to create network backend, lack of documentation can discourage its usage. Signed-off-by: Miroslav Rezanina V2: - Fixed spelling errors - Fixed net and dhcpstart range values Patch: - diff --git a

Re: [Qemu-devel] [PATCH] qemu-img: Fix content mismatch offset of image compare

2013-11-13 Thread Miroslav Rezanina
- Original Message - > From: "Fam Zheng" > To: qemu-devel@nongnu.org > Cc: stefa...@redhat.com, kw...@redhat.com, "Miroslav Rezanina" > > Sent: Wednesday, November 13, 2013 5:04:18 AM > Subject: [PATCH] qemu-img: Fix content mismatch offset of im

Re: [Qemu-devel] [PATCH v6] vl.c: Output error on invalid machine type

2014-03-10 Thread Miroslav Rezanina
Hi, is there any issue with this patch? Mirek - Original Message - > From: mreza...@redhat.com > To: qemu-devel@nongnu.org > Sent: Wednesday, February 5, 2014 2:44:23 PM > Subject: [Qemu-devel] [PATCH v6] vl.c: Output error on invalid machine type > > From: Miroslav Rez

Re: [Qemu-devel] [PATCHv2] Prevent segmentation fault in case of relative resolve of uri

2015-02-09 Thread Miroslav Rezanina
On Mon, Feb 09, 2015 at 12:31:18PM +0100, Paolo Bonzini wrote: > > > On 09/02/2015 11:47, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > It was possible to call strcmp with NULL argument, that can cause > > segmentation fault. Properly ch

Re: [Qemu-devel] [PATCH v2][RFC] Add compare subcommand for qemu-img

2012-11-20 Thread Miroslav Rezanina
- Original Message - > From: "Kevin Wolf" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, pbonz...@redhat.com > Sent: Tuesday, November 20, 2012 1:36:37 PM > Subject: Re: [Qemu-devel] [PATCH v2][RFC] Add compare subcommand for qemu-img > &

[Qemu-devel] [PATCH v3] Add compare subcommand for qemu-img

2012-11-21 Thread Miroslav Rezanina
- changed handlig of -f and -F [1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav Rezanina diff --git a/block.c b/block.c index 854ebd6..fdc8c45 100644 --- a/block.c +++ b

[Qemu-devel] [PATCH v4] Add compare subcommand for qemu-img

2012-11-27 Thread Miroslav Rezanina
handling - added man page content Signed-off-by: Miroslav Rezanina diff --git a/block.c b/block.c index 854ebd6..fdc8c45 100644 --- a/block.c +++ b/block.c @@ -2698,6 +2698,7 @@ int bdrv_has_zero_init(BlockDriverState *bs) typedef struct BdrvCoIsAllocatedData { BlockDriverState *bs

[Qemu-devel] [PATCH v5] Add compare subcommand for qemu-img

2012-12-04 Thread Miroslav Rezanina
handling of -f and -F [1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav Rezanina Note: Do not move any code to separate function as suggested by Stefan. Code to

[Qemu-devel] [PATCH v8 0/4] Add subcommand compare for qemu-img

2013-01-14 Thread Miroslav Rezanina
[1] - added strict mode (-s) - added quiet mode (-q) - improved output messages [2] - rename variables for larger image handling - added man page content Signed-off-by: Miroslav Rezanina Miroslav Rezanina (4): block: Add synchronous wrapper for bdrv_co_is_allocated_above qemu-img: Add

[Qemu-devel] [PATCH v8 1/4] block: Add synchronous wrapper for bdrv_co_is_allocated_above

2013-01-14 Thread Miroslav Rezanina
There's no synchronous wrapper for bdrv_co_is_allocated_above function so it's not possible to check for sector allocation in in mage with a backing file. This patch adds the missing synchronous wrapper. Signed-off-by: Miroslav Rezanina --- block.c

[Qemu-devel] [PATCH v8 2/4] qemu-img: Add "Quiet mode" option

2013-01-14 Thread Miroslav Rezanina
There can be a need to turn output to stdout off. This patch adds a -q option that enable "Quiet mode". In Quiet mode, only errors are printed out. Signed-off-by: Miroslav Rezanina --- block.c | 12 +++-- blockdev.c|6 +- include/block/block.h |3 +-

[Qemu-devel] [PATCH v8 3/4] qemu-img: Add compare subcommand

2013-01-14 Thread Miroslav Rezanina
This patch adds new qemu-img subcommand that compares content of two disk images. Signed-off-by: Miroslav Rezanina --- qemu-img-cmds.hx |6 ++ qemu-img.c | 266 ++ 2 files changed, 272 insertions(+), 0 deletions(-) diff --git a

[Qemu-devel] [PATCH v8 4/4] Add qemu-img compare documentation

2013-01-14 Thread Miroslav Rezanina
Adding documentation for new qemu-img subcommand compare. Signed-off-by: Miroslav Rezanina --- qemu-img.c|7 ++- qemu-img.texi | 32 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 0c12692..6aebdc3

Re: [Qemu-devel] [PATCH] net: fix insecure temporary file creation in SLiRP

2015-06-01 Thread Miroslav Rezanina
On Mon, Jun 01, 2015 at 09:58:10AM +0200, Markus Armbruster wrote: > mreza...@redhat.com writes: > > > From: Miroslav Rezanina > > > > Qemu's user mode networking stack(-net user) is vulnerable to > > a predictable temporary file creation flaw. This patch us

Re: [Qemu-devel] [PATCH] slirp: use less predictable directory name in /tmp for smb config (CVE-2015-4037)

2015-06-01 Thread Miroslav Rezanina
-if (mkdir(s->smb_dir, 0700) < 0) { > +strcpy(s->smb_dir, "/tmp/qemu-smb.XX"); > +if (!mkdtemp(s->smb_dir)) { > error_report("could not create samba server dir '%s'", s->smb_dir); > return -1; > } > -- > 2.1.4 > > I suggest to go with this patch as: 1) It was sent first 2) Is simplier 3) Keep original behavior Reviewed-by: Miroslav Rezanina

Re: [Qemu-devel] [PATCH v2] slirp: use less predictable directory name in /tmp for smb config (CVE-2015-4037)

2015-06-07 Thread Miroslav Rezanina
> +snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.XX"); > +if (!mkdtemp(s->smb_dir)) { > error_report("could not create samba server dir '%s'", s->smb_dir); > +s->smb_dir[0] = 0; > return -1; > } > snprintf(smb_conf, sizeof(smb_conf), "%s/%s", s->smb_dir, "smb.conf"); > -- > 2.1.4 > > Reviewed-by: Miroslav Rezanina

[Qemu-devel] [PATCH][RFC] Add compare subcommand for qemu-img

2012-08-01 Thread Miroslav Rezanina
images are identical - 1 if images differ - 2 on error Signed-off-by: Miroslav Rezanina Patch: -- diff --git a/block.c b/block.c index b38940b..919f8e9 100644 --- a/block.c +++ b/block.c @@ -2284,6 +2284,7 @@ int bdrv_has_zero_init(BlockDriverState *bs) typedef struct

Re: [Qemu-devel] [PATCH][RFC] Add compare subcommand for qemu-img

2012-08-01 Thread Miroslav Rezanina
- Original Message - > From: "Paolo Bonzini" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Wednesday, August 1, 2012 12:22:50 PM > Subject: Re: [PATCH][RFC] Add compare subcommand for qemu-img > > Il 01/08/2012 12:03, Miroslav

Re: [Qemu-devel] [PATCH][RFC] Add compare subcommand for qemu-img

2012-08-01 Thread Miroslav Rezanina
- Original Message - > From: "Eric Blake" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org, "Paolo Bonzini" > Sent: Wednesday, August 1, 2012 3:21:03 PM > Subject: Re: [Qemu-devel] [PATCH][RFC] Add compare subcommand for qemu-img &

Re: [Qemu-devel] [PATCH][RFC] Add compare subcommand for qemu-img

2012-08-02 Thread Miroslav Rezanina
- Original Message - > From: "Paolo Bonzini" > To: "Miroslav Rezanina" > Cc: qemu-devel@nongnu.org > Sent: Wednesday, August 1, 2012 12:22:50 PM > Subject: Re: [PATCH][RFC] Add compare subcommand for qemu-img

[Qemu-devel] [PATCH v2][RFC] Add compare subcommand for qemu-img

2012-08-02 Thread Miroslav Rezanina
ge is compared. This is done to not compare whole image in case that one of images is only expanded copy of other. Paolo Bonzini proposed to do this check after compare shared size of images to go through image sequentially. Signed-off-by: Miroslav Rezanina --- block.c | 39 bl

Re: [Qemu-devel] [PATCH] Whitelist sysinfo call

2016-04-12 Thread Miroslav Rezanina
6 at 08=19=52PM +, Serge Hallyn wrote: > > Quoting mreza...@redhat.com (mreza...@redhat.com): > > > From: Miroslav Rezanina > > > > > > Newer version of nss-softokn libraries (> 3.16.2.3) use sysinfo call > > > so qemu using rbd image hang after sta

Re: [Qemu-devel] [PATCH] Whitelist sysinfo call

2016-03-21 Thread Miroslav Rezanina
a...@redhat.com wrote: > > From: Miroslav Rezanina > > > > Newer version of nss-softokn libraries (> 3.16.2.3) use sysinfo call > > so qemu using rbd image hang after start when run in sandbox mode. > > > > To allow using rbd images in sandbox mode we have to whit

Re: [Qemu-devel] [PATCH] parallel: Allow to disable CONFIG_PARALLEL

2015-05-06 Thread Miroslav Rezanina
On Tue, May 05, 2015 at 11:59:50AM +0200, Thomas Huth wrote: > On Tue, 5 May 2015 11:30:49 +0200 > mreza...@redhat.com wrote: > > > From: Miroslav Rezanina > > > > Disabling CONFIG_PARALLEL cause build failure as commit 07dc788 factored > > out initialization

Re: [Qemu-devel] [PATCH] parallel: Allow to disable CONFIG_PARALLEL

2015-05-06 Thread Miroslav Rezanina
On Tue, May 05, 2015 at 12:32:37PM +0200, Thomas Huth wrote: > On Tue, 5 May 2015 12:18:05 +0200 > Miroslav Rezanina wrote: > > > On Tue, May 05, 2015 at 11:59:50AM +0200, Thomas Huth wrote: > > > On Tue, 5 May 2015 11:30:49 +0200 > > > mreza...@redhat.com wro

Re: [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL

2015-05-11 Thread Miroslav Rezanina
On Mon, May 11, 2015 at 08:46:19AM +0200, Markus Armbruster wrote: > mreza...@redhat.com writes: > > > From: Miroslav Rezanina > > > > Disabling CONFIG_PARALLEL cause build failure as commit 07dc788 factored > > out initialization to parallel_hds_isa_init function i

Re: [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL

2015-05-11 Thread Miroslav Rezanina
On Mon, May 11, 2015 at 10:40:04AM +0200, Paolo Bonzini wrote: > > > On 11/05/2015 07:38, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > Disabling CONFIG_PARALLEL cause build failure as commit 07dc788 factored > > out initialization to parallel

Re: [Qemu-devel] [PATCHv3 2/2] stubs: Provide parallel_mm_init stub version

2015-05-13 Thread Miroslav Rezanina
On Wed, May 13, 2015 at 10:04:23AM +0200, Markus Armbruster wrote: > Paolo Bonzini writes: > > > On 12/05/2015 08:22, mreza...@redhat.com wrote: > >> From: Miroslav Rezanina > >> > >> mips build fail with link error in case PARALLEL_CONFIG is dis

Re: [Qemu-devel] [PATCHv3 1/2] Move parallel_hds_isa_init to hw/isa/isa-bus.c

2015-05-13 Thread Miroslav Rezanina
On Wed, May 13, 2015 at 10:01:12AM +0200, Markus Armbruster wrote: > mreza...@redhat.com writes: > > > From: Miroslav Rezanina > > > > Disabling CONFIG_PARALLEL cause removing parallel_hds_isa_init defined in > > parallel.c. This function is called during in

[PATCH] docs: Fix virtiofsd.1 location

2020-02-12 Thread Miroslav Rezanina
Patch 6a7e2bbee5 docs: add virtiofsd(1) man page introduced new man page virtiofsd.1. Unfortunately, wrong file location is used as source for install command. This cause installation of docs fail. Fixing wrong location so installation is successful. Signed-off-by: Miroslav Rezanina

[PATCH v2] Use long endian options for ppc64

2022-01-31 Thread Miroslav Rezanina
. Signed-off-by: Miroslav Rezanina --- This is v2 of configure: Use -mlittle-endian instead of -mlittle for ppc64. v2: - handle both -mlittle and -mbig usage - fix tests/tcg/configure.sh --- configure | 4 ++-- tests/tcg/configure.sh | 4 ++-- 2 files changed, 4 insertions(+), 4

[PATCH] Fix tcg_out_vec_op argument type

2021-10-27 Thread Miroslav Rezanina
~~~^~ ../tcg/tcg.c:122:38: note: previously declared as an array 'const int[16]' 122 |const int const_args[TCG_MAX_OP_ARGS]); |~~^~~ Fixing argument type to pass build. Signe

Re: [PATCH] Add missing pixman dependecy

2022-11-10 Thread Miroslav Rezanina
On Wed, Nov 9, 2022 at 5:14 PM Philippe Mathieu-Daudé wrote: > > Hi Mirek, > > On 9/11/22 16:34, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build VGA > > device descr

Prevent compiler warning on block.c

2021-05-05 Thread Miroslav Rezanina
-by: Miroslav Rezanina --- diff --git a/block.c b/block.c index 874c22c43e..3ca27bd2d9 100644 --- a/block.c +++ b/block.c @@ -4851,7 +4851,7 @@ static int bdrv_replace_node_common(BlockDriverState *from, Transaction *tran = tran_new(); g_autoptr(GHashTable) found = NULL; g_autoptr

Re: Prevent compiler warning on block.c

2021-05-05 Thread Miroslav Rezanina
- Original Message - > From: "Peter Maydell" > To: "Miroslav Rezanina" > Cc: "QEMU Developers" , "Vladimir Sementsov-Ogievskiy" > , > "Qemu-block" > Sent: Wednesday, May 5, 2021 12:43:44 PM > Subject: Re: Prevent

Re: [Qemu-devel] [PATCH] hmp: fix "dump-quest-memory" segfault (ppc)

2017-09-11 Thread Miroslav Rezanina
- Original Message - > From: "Thomas Huth" > To: "Laurent Vivier" , qemu-devel@nongnu.org > Cc: "David Gibson" , qemu-...@nongnu.org, "Dr . > David Alan Gilbert" > , "Miroslav Rezanina" > Sent: Monday, September 11

Re: [Qemu-devel] [PATCH for-2.12] memfd: fix vhost-user-test on non-memfd capable host

2018-04-04 Thread Miroslav Rezanina
to > create memfd > FAIL > > There is a qemu_memfd_check() to prevent running memfd path, but it > also checks for fallback implementation. Let's specialize > qemu_memfd_check() to check memfd only, while qemu_memfd_alloc_check() > checks for the qemu_memfd_alloc() AP

Re: [Qemu-devel] [PATCH] tcg: fix 16-byte vector operations detection

2018-03-28 Thread Miroslav Rezanina
*(U2 *)(d + i) = *(U2 *)(a + i) << shift; > + *(U4 *)(d + i) = *(U4 *)(a + i) << shift; > + *(U8 *)(d + i) = *(U8 *)(a + i) << shift; > +} > int main(void) > { >a1 += b1; a2 += b2; a4 += b4; a8 += b8; > -- > 2.14.3 > > Build works correctly for RHEL 7 with this patch Reviewed-by: Miroslav Rezanina

Re: [PATCH 1/3] gdbstub: prevent uninitialized warning

2020-03-25 Thread Miroslav Rezanina
-cpu_name = object_get_canonical_path_component(OBJECT(cpu)); > +g_autofree char *cpu_name = > +object_get_canonical_path_component(OBJECT(cpu)); > g_string_printf(rs, "%s %s [%s]", cpu_model, cpu_name, > cpu->halted ? "halted " : "running"); > } else { > -- > 2.23.0 > > > Fixing broken build with -Wall. Reviewed-by: Miroslav Rezanina

Re: [PATCH 2/2] aspeed/i2c: Prevent uninitialized warning

2020-01-21 Thread Miroslav Rezanina
Tuesday, January 21, 2020 11:44:14 AM > Subject: Re: [PATCH 2/2] aspeed/i2c: Prevent uninitialized warning > > On 1/21/20 11:02 AM, Thomas Huth wrote: > > On 21/01/2020 10.28, mreza...@redhat.com wrote: > >> From: Miroslav Rezanina > >> > >> Compiler r

Re: [PATCH] Makefile: add missing mkdir MANUAL_BUILDDIR

2020-01-21 Thread Miroslav Rezanina
quot;$(MANUAL_BUILDDIR)" > $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \ > "GEN","$@") > > -- > 2.24.1 > Fixing our issues with build, Reviewed-by: Miroslav Rezanina

Re: [PATCH 1/2] disas/arm-a64.cc: Fix build error

2021-03-22 Thread Miroslav Rezanina
> -#include "vixl/a64/disasm-a64.h" > - > using namespace vixl; > > static Decoder *vixl_decoder = NULL; > -- > 2.23.0 > > This error occurs when c++ compiler is used. With the fix, build pass. Reviewed-by: Miroslav Rezanina

Re: [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr()

2021-03-10 Thread Miroslav Rezanina
- Original Message - > From: "Philippe Mathieu-Daudé" > To: qemu-devel@nongnu.org > Cc: "Jason Wang" , "Stefano Garzarella" > , "Thomas Huth" , > "Miroslav Rezanina" , "Dmitry Fleytman" > , "Paolo Bonzi

Re: [PATCH v3] multi-process: Initialize variables declared with g_auto*

2021-03-14 Thread Miroslav Rezanina
On Fri, Mar 12, 2021 at 07:21:43PM +0800, Zenghui Yu wrote: > Quote docs/devel/style.rst (section "Automatic memory deallocation"): > > * Variables declared with g_auto* MUST always be initialized, > otherwise the cleanup function will use uninitialized stack memory > > Initialize @name properl

Re: [PATCH v3] multi-process: Initialize variables declared with g_auto*

2021-03-14 Thread Miroslav Rezanina
On Mon, Mar 15, 2021 at 02:20:10PM +0800, Zenghui Yu wrote: > On 2021/3/15 13:48, Miroslav Rezanina wrote: > > Missing declaration without initialization in hw/s390x/s390-pci-vfio.c > > othwerwise correct. Will you send v4 with missing initialization or > > should I send

Re: [PATCH v2] Add missing initialization for g_autofree variables

2021-03-15 Thread Miroslav Rezanina
On Mon, Mar 15, 2021 at 09:08:01AM +0100, Thomas Huth wrote: > On 15/03/2021 09.00, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > When declaring g_autofree variable without inicialization, compiler > > will raise "may be used uninitialized in t

Re: [PATCH v4 4/6] net/eth: Check rt_hdr size before casting to ip6_ext_hdr

2021-03-10 Thread Miroslav Rezanina
- Original Message - > From: "Philippe Mathieu-Daudé" > To: qemu-devel@nongnu.org > Cc: "Laurent Vivier" , "Dmitry Fleytman" > , "Miroslav Rezanina" > , "Li Qiang" , "Paolo Bonzini" > , "Jason Wa

Re: [PATCH 3/5] tcg/s390: Hoist common argument loads in tcg_out_op()

2021-01-13 Thread Miroslav Rezanina
On Mon, Jan 11, 2021 at 04:01:12PM +0100, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé > --- > tcg/s390/tcg-target.c.inc | 252 ++ > 1 file changed, 122 insertions(+), 130 deletions(-) > > diff --git a/tcg/s390/tcg-target.c.inc b/tcg

[PATCH v3 2/2] s390x: Use strpadcpy for copying vm name

2021-01-13 Thread Miroslav Rezanina
th, zeroes target array after copied string and does not raise warning when length is equal to target array size (and ending '\0' is discarded). Signed-off-by: Miroslav Rezanina --- target/s390x/kvm.c | 12 +--- target/s390x/misc_helper.c | 7 +-- 2 files changed,

[PATCH v3 1/2] Fix net.c warning on GCC 11

2021-01-13 Thread Miroslav Rezanina
outing that has more attributes. As this usage is expected, suppress the warning temporarily through the function using this retyping. Signed-off-by: Miroslav Rezanina --- net/eth.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/eth.c b/net/eth.c index 1e0821c5f8..b9bdd0435c 100644 -

[PATCH v3 0/2] Fixing several GCC 11 warnings

2021-01-13 Thread Miroslav Rezanina
Compiling qemu using GCC 11 we got several new warnings. To allow build with --enable-werror, we need to solve issues generating these warnings. Signed-of-by: Miroslav Rezanina v2: - Patch 2 rewrite to use strpadcpy - removed Patch 3 (different version sent by Philippe Mathieu-Daudé) v3

Re: [PATCH v3 1/2] Fix net.c warning on GCC 11

2021-01-14 Thread Miroslav Rezanina
On Thu, Jan 14, 2021 at 09:19:20AM -0500, Alexander Bulekov wrote: > On 210114 1415, Philippe Mathieu-Daudé wrote: > > +Jason +Dmitry > > > > On 1/14/21 8:07 AM, Miroslav Rezanina wrote: > > > When building qemu with GCC 11, compiling eth.c file pr

Re: [PATCH v3 1/2] Fix net.c warning on GCC 11

2021-01-14 Thread Miroslav Rezanina
On Thu, Jan 14, 2021 at 02:15:59PM +0100, Philippe Mathieu-Daudé wrote: > +Jason +Dmitry > > On 1/14/21 8:07 AM, Miroslav Rezanina wrote: > > When building qemu with GCC 11, compiling eth.c file produce following > > warning: > > > >warning: array subscr

Re: [PATCH 0/2] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr()

2021-01-15 Thread Miroslav Rezanina
> With qtest chunk included: Reviewed-by: Miroslav Rezanina

Re: [PATCH v2 0/2] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr()

2021-01-18 Thread Miroslav Rezanina
+ > 4 files changed, 72 insertions(+), 20 deletions(-) > create mode 100644 tests/qtest/fuzz-e1000e-test.c > > -- > 2.26.2 > > > Reviewed-by: Miroslav Rezanina

Re: [Qemu-devel] [PATCH v3] qemu-ga: Convert invocation documentation to rST

2019-09-20 Thread Miroslav Rezanina
> - default is @samp{/var/run}). > - > -@item -v, --verbose > - Log extra debugging information. > - > -@item -V, --version > - Print version information and exit. > - > -@item -d, --daemon > - Daemonize after startup (detach from terminal). > - > -@item -b, --blacklist=@var{list} > - Comma-separated list of RPCs to disable (no spaces, @samp{?} to list > - available RPCs). > - > -@item -D, --dump-conf > - Dump the configuration in a format compatible with @file{qemu-ga.conf} > - and exit. > - > -@item -h, --help > - Display this help and exit. > -@end table > - > -@c man end > - > -@c man begin FILES > - > -The syntax of the @file{qemu-ga.conf} configuration file follows the > -Desktop Entry Specification, here is a quick summary: it consists of > -groups of key-value pairs, interspersed with comments. > - > -@example > -# qemu-ga configuration sample > -[general] > -daemonize = 0 > -pidfile = /var/run/qemu-ga.pid > -verbose = 0 > -method = virtio-serial > -path = /dev/virtio-ports/org.qemu.guest_agent.0 > -statedir = /var/run > -@end example > - > -The list of keys follows the command line options: > -@table @option > -@item daemon= boolean > -@item method= string > -@item path= string > -@item logfile= string > -@item pidfile= string > -@item fsfreeze-hook= string > -@item statedir= string > -@item verbose= boolean > -@item blacklist= string list > -@end table > - > -@c man end > - > -@ignore > - > -@setfilename qemu-ga > -@settitle QEMU Guest Agent > - > -@c man begin AUTHOR > -Michael Roth > -@c man end > - > -@c man begin SEEALSO > -qemu(1) > -@c man end > - > -@end ignore > -- > 2.20.1 > > This patch is breaking build for me. It fails on: perl -Ww -- /builddir/build/BUILD/qemu-4.1.0/scripts/texi2pod.pl -I docs -I scripts -I docs/interop -DVERSION="4.1.50" -DCONFDIR="/etc/qemu-kvm" scripts/texi2pod.pl docs/interop/qemu-ga.8.pod && pod2man --utf8 --section=8 --center=" " --release=" " docs/interop/qemu-ga.8.pod > docs/interop/qemu-ga.8 with: No filename or title Not sure why this is happening. Miroslav Rezanina

Re: [Qemu-devel] [PATCH v3] qemu-ga: Convert invocation documentation to rST

2019-09-20 Thread Miroslav Rezanina
- Original Message - > From: "Peter Maydell" > To: "Miroslav Rezanina" > Cc: "QEMU Developers" , "Michael Roth" > > Sent: Friday, September 20, 2019 12:52:49 PM > Subject: Re: [Qemu-devel] [PATCH v3] qemu-ga: Convert invocat

Re: [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module

2019-08-23 Thread Miroslav Rezanina
uot;sdl", > #endif > -#if defined(CONFIG_SPICE) && defined(CONFIG_GIO) > -"ui-", "spice-app", > -#endif > }; > int i; > > -- > 1.8.3.1 > > Making make check pass again for me. Reviewed-by: Miroslav Rezanina

Re: [Qemu-devel] [PATCH] modules-test: fix const cast

2019-08-23 Thread Miroslav Rezanina
ULL); > qtest_module_load(qts, args[0], args[1]); > -- > 1.8.3.1 > > Reviewed-by: Miroslav Rezanina

Re: [Qemu-devel] [PATCH] qemu-doc: Do not hard-code the name of the QEMU binary

2019-08-30 Thread Miroslav Rezanina
socket,id=n1,mcast=239.192.168.1:1102,localaddr=1.2.3.4 > @end example > @@ -2633,7 +2633,7 @@ brctl addif br-lan vmtunnel0 > # on 4.3.2.1 > # launch QEMU instance - if your network has reorder or is very lossy add > ,pincounter > > -qemu-system-i386 linux.img -device e1000,netdev=n1 \ > +@value{qemu_system} linux.img -device e1000,netdev=n1 \ > -netdev > > l2tpv3,id=n1,src=4.2.3.1,dst=1.2.3.4,udp,srcport=16384,dstport=16384,rxsession=0x,txsession=0x,counter > > @end example > @@ -2650,7 +2650,7 @@ Example: > # launch vde switch > vde_switch -F -sock /tmp/myswitch > # launch QEMU instance > -qemu-system-i386 linux.img -nic vde,sock=/tmp/myswitch > +@value{qemu_system} linux.img -nic vde,sock=/tmp/myswitch > @end example > > @item -netdev vhost-user,chardev=@var{id}[,vhostforce=on|off][,queues=n] > @@ -3107,7 +3107,7 @@ and communicate. Requires the Linux @code{vhci} driver > installed. Can > be used as following: > > @example > -qemu-system-i386 [...OPTIONS...] -bt hci,vlan=5 -bt vhci,vlan=5 > +@value{qemu_system} [...OPTIONS...] -bt hci,vlan=5 -bt vhci,vlan=5 > @end example > > @item -bt device:@var{dev}[,vlan=@var{n}] > @@ -3601,7 +3601,7 @@ connections will likely be TCP-based, but also UDP, > pseudo TTY, or even > stdio are reasonable use case. The latter is allowing to start QEMU from > within gdb and establish the connection via a pipe: > @example > -(gdb) target remote | exec qemu-system-i386 -gdb stdio ... > +(gdb) target remote | exec @value{qemu_system} -gdb stdio ... > @end example > ETEXI > > @@ -4571,7 +4571,7 @@ which specify the queue number of cryptodev backend, > the default of > > @example > > - # qemu-system-x86_64 \ > + # @value{qemu_system} \ > [...] \ > -object cryptodev-backend-builtin,id=cryptodev0 \ > -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \ > @@ -4591,7 +4591,7 @@ of cryptodev backend for multiqueue vhost-user, the > default of @var{queues} is 1 > > @example > > - # qemu-system-x86_64 \ > + # @value{qemu_system} \ > [...] \ > -chardev socket,id=chardev0,path=/path/to/socket \ > -object cryptodev-vhost-user,id=cryptodev0,chardev=chardev0 \ > @@ -4627,14 +4627,14 @@ The simplest (insecure) usage is to provide the > secret inline > > @example > > - # $QEMU -object secret,id=sec0,data=letmein,format=raw > + # @value{qemu_system} -object secret,id=sec0,data=letmein,format=raw > > @end example > > The simplest secure usage is to provide the secret via a file > > # printf "letmein" > mypasswd.txt > - # $QEMU -object secret,id=sec0,file=mypasswd.txt,format=raw > + # @value{qemu_system} -object secret,id=sec0,file=mypasswd.txt,format=raw > > For greater security, AES-256-CBC should be used. To illustrate usage, > consider the openssl command line tool which can encrypt the data. Note > @@ -4670,7 +4670,7 @@ and specify that to be used to decrypt the user > password. Pass the > contents of @code{iv.b64} to the second secret > > @example > - # $QEMU \ > + # @value{qemu_system} \ > -object secret,id=secmaster0,format=base64,file=key.b64 \ > -object secret,id=sec0,keyid=secmaster0,format=base64,\ > data=$SECRET,iv=$( @@ -4713,7 +4713,7 @@ negotiate keys used for attestation. The file must be > encoded in base64. > > e.g to launch a SEV guest > @example > - # $QEMU \ > + # @value{qemu_system_x86} \ > .. > -object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=5 \ > -machine ...,memory-encryption=sev0 > @@ -4735,7 +4735,7 @@ any commas in the distinguished name. > An example authorization object to validate a x509 distinguished name > would look like: > @example > - # $QEMU \ > + # @value{qemu_system} \ > ... > -object > 'authz-simple,id=auth0,identity=CN=laptop.example.com,,O=Example > Org,,L=London,,ST=London,,C=GB' \ > ... > @@ -4784,7 +4784,7 @@ a TLS x509 distinguished name, or a SASL username. > An example authorization object to validate a SASL username > would look like: > @example > - # $QEMU \ > + # @value{qemu_system} \ > ... > -object > authz-simple,id=auth0,filename=/etc/qemu/vnc-sasl.acl,refresh=yes > ... > @@ -4802,7 +4802,7 @@ An example authorization object to validate a TLS x509 > distinguished > name would look like: > > @example > - # $QEMU \ > + # @value{qemu_system} \ > ... > -object authz-pam,id=auth0,service=qemu-vnc > ... > -- > 2.18.1 > > Useful change. Reviewed-by: Miroslav Rezanina -- Miroslav Rezanina Software Engineer - Virtualization Team Maintainer

Re: [Qemu-devel] [PATCH] qemu-doc: Do not hard-code the name of the QEMU binary

2020-01-14 Thread Miroslav Rezanina
- Original Message - > From: "Peter Maydell" > To: "Thomas Huth" > Cc: "QEMU Developers" , "Paolo Bonzini" > , "QEMU Trivial" > , "Miroslav Rezanina" , > "Eduardo Habkost" , > "Qemu-block

[PATCH] Fix libdaxctl option

2021-07-06 Thread Miroslav Rezanina
For some reason, libdaxctl option setting was set to work in an opposite way (--enable-libdaxctl disabled it and vice versa). Fixing this so configuration works properly. Signed-off-by: Miroslav Rezanina --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a

[PATCH] Fix libpmem configuration option

2021-07-07 Thread Miroslav Rezanina
For some reason, libpmem option setting was set to work in an opposite way (--enable-libpmem disabled it and vice versa). Fixing this so configuration works properly. Signed-off-by: Miroslav Rezanina --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure

Re: [RHEL7 qemu-kvm PATCH 2/3] s390x: Fix vm name copy length

2021-01-11 Thread Miroslav Rezanina
Fix vm name copy length > > On 11/01/2021 13.10, Philippe Mathieu-Daudé wrote: > > Hi Miroslav, > > > > On 1/11/21 12:30 PM, mreza...@redhat.com wrote: > >> From: Miroslav Rezanina > >> > >> There are two cases when vm name is copied but closing \0

Re: [RHEL7 qemu-kvm PATCH 3/3] Fix tcg_out_op argument mismatch warning

2021-01-11 Thread Miroslav Rezanina
cg_out_op argument mismatch > warning > > On 1/11/21 12:30 PM, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > There's prototype mismatch between tcg/tcg.c and > > tcg/aarch/tcg-target.c.inc: > > > > t

Re: [RHEL7 qemu-kvm PATCH 2/3] s390x: Fix vm name copy length

2021-01-11 Thread Miroslav Rezanina
1/21 12:30 PM, mreza...@redhat.com wrote: > > From: Miroslav Rezanina > > > > There are two cases when vm name is copied but closing \0 can be lost > > in case name is too long (>=256 characters). > > > > Updating length to copy so there is space for closing

Re: [RHEL7 qemu-kvm PATCH 2/3] s390x: Fix vm name copy length

2021-01-11 Thread Miroslav Rezanina
- Original Message - > From: "Thomas Huth" > To: "Miroslav Rezanina" > Cc: "qemu-s390x" , "Philippe Mathieu-Daudé" > , qemu-devel@nongnu.org > Sent: Monday, January 11, 2021 1:54:06 PM > Subject: Re: [RHEL7 qemu-kvm PATCH 2/

  1   2   >