[Qemu-devel] [PULL 0/2] hmp queue

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 454d7dc9bc13e46084e0612076e6952c40f4afeb:

  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-06-29 16:21:45 +0100)

are available in the git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20170629

for you to fetch changes up to bd1d5ad9f9a1347d6f4338f294253617c565c89a:

  Add chardev-send-break monitor command (2017-06-29 17:14:11 +0100)

----------------------------------------------------------------
HMP pull 2017-06-29

----------------------------------------------------------------
Stefan Fritsch (1):
      Add chardev-send-break monitor command

Suraj Jitindar Singh (1):
      monitor: Add -a (all) option to info registers

 chardev/char.c       | 12 ++++++++++++
 hmp-commands-info.hx |  6 +++---
 hmp-commands.hx      | 16 ++++++++++++++++
 hmp.c                |  8 ++++++++
 hmp.h                |  1 +
 monitor.c            | 21 ++++++++++++++++-----
 qapi-schema.json     | 20 ++++++++++++++++++++
 tests/test-char.c    | 12 ++++++++++--
 tests/test-hmp.c     |  1 +
 9 files changed, 87 insertions(+), 10 deletions(-)

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On 29 June 2017 at 17:30, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 454d7dc9bc13e46084e0612076e6952c40f4afeb:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-06-29 16:21:45 +0100)
>
> are available in the git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20170629
>
> for you to fetch changes up to bd1d5ad9f9a1347d6f4338f294253617c565c89a:
>
>   Add chardev-send-break monitor command (2017-06-29 17:14:11 +0100)
>
> ----------------------------------------------------------------
> HMP pull 2017-06-29
>
> ----------------------------------------------------------------
> Stefan Fritsch (1):
>       Add chardev-send-break monitor command
>
> Suraj Jitindar Singh (1):
>       monitor: Add -a (all) option to info registers
>
>  chardev/char.c       | 12 ++++++++++++
>  hmp-commands-info.hx |  6 +++---
>  hmp-commands.hx      | 16 ++++++++++++++++
>  hmp.c                |  8 ++++++++
>  hmp.h                |  1 +
>  monitor.c            | 21 ++++++++++++++++-----
>  qapi-schema.json     | 20 ++++++++++++++++++++
>  tests/test-char.c    | 12 ++++++++++--
>  tests/test-hmp.c     |  1 +
>  9 files changed, 87 insertions(+), 10 deletions(-)
>
Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit abf6e752e55b2f5afb48303429dea2db7c3a62de:

  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging (2017-10-30 13:02:45 +0000)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20171030

for you to fetch changes up to 751f8cfe2a556b3ef49f6af2860e2d1d2a1ec66a:

  monitor: fix dangling CPU pointer (2017-10-30 18:46:32 +0000)

----------------------------------------------------------------
hmp pull 2017-10-30

----------------------------------------------------------------
Greg Kurz (1):
      monitor: fix dangling CPU pointer

ZhiPeng Lu (1):
      hmp: Replace error_report_err

 hmp.c     | 26 ++++++++------------------
 monitor.c | 23 ++++++++++++++++++-----
 2 files changed, 26 insertions(+), 23 deletions(-)

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On 30 October 2017 at 20:23, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit abf6e752e55b2f5afb48303429dea2db7c3a62de:
>
>   Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging (2017-10-30 13:02:45 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20171030
>
> for you to fetch changes up to 751f8cfe2a556b3ef49f6af2860e2d1d2a1ec66a:
>
>   monitor: fix dangling CPU pointer (2017-10-30 18:46:32 +0000)
>
> ----------------------------------------------------------------
> hmp pull 2017-10-30
>

applied, thanks
-- PMM

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 0a0dc59d27527b78a195c2d838d28b7b49e5a639:

  Update version for v2.11.0 release (2017-12-13 14:31:09 +0000)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20171214

for you to fetch changes up to 0eaf3b824745cacebfc321aef6787528d33d58fe:

  tests: test-hmp: print command execution result (2017-12-14 11:09:42 +0000)

----------------------------------------------------------------
HMP pull 2017-12-14

----------------------------------------------------------------
Thomas Huth (1):
      hmp-commands: Remove the deprecated usb_add and usb_del

Vadim Galitsyn (1):
      tests: test-hmp: print command execution result

 hmp-commands.hx         | 33 ---------------------------------
 hw/usb/bus.c            | 22 ----------------------
 include/hw/usb.h        |  1 -
 include/sysemu/sysemu.h |  2 --
 qemu-doc.texi           |  8 --------
 tests/test-hmp.c        |  7 +++++--
 vl.c                    | 44 --------------------------------------------
 7 files changed, 5 insertions(+), 112 deletions(-)

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On 14 December 2017 at 12:48, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 0a0dc59d27527b78a195c2d838d28b7b49e5a639:
>
>   Update version for v2.11.0 release (2017-12-13 14:31:09 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20171214
>
> for you to fetch changes up to 0eaf3b824745cacebfc321aef6787528d33d58fe:
>
>   tests: test-hmp: print command execution result (2017-12-14 11:09:42 +0000)
>
> ----------------------------------------------------------------
> HMP pull 2017-12-14
>
> ----------------------------------------------------------------
> Thomas Huth (1):
>       hmp-commands: Remove the deprecated usb_add and usb_del
>
> Vadim Galitsyn (1):
>       tests: test-hmp: print command execution result
>
Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/2] hmp queue

[no-reply]

Hi,

This series failed build test on ppc host. Please find the details below.

Message-id: 20171214124817.2567-1-dgilbert@redhat.com
Subject: [Qemu-devel] [PULL 0/2] hmp queue
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
set -e
echo "=== ENV ==="
env
echo "=== PACKAGES ==="
rpm -qa
echo "=== TEST BEGIN ==="
INSTALL=$PWD/install
BUILD=$PWD/build
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --prefix=$INSTALL
make -j100
# XXX: we need reliable clean up
# make check -j100 V=1
make install
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com -> patchew/1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com
 - [tag update]      patchew/20171214124817.2567-1-dgilbert@redhat.com -> patchew/20171214124817.2567-1-dgilbert@redhat.com
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Submodule 'pixman' (git://anongit.freedesktop.org/pixman) registered for path 'pixman'
Submodule 'roms/SLOF' (git://git.qemu-project.org/SLOF.git) registered for path 'roms/SLOF'
Submodule 'roms/ipxe' (git://git.qemu-project.org/ipxe.git) registered for path 'roms/ipxe'
Submodule 'roms/openbios' (git://git.qemu-project.org/openbios.git) registered for path 'roms/openbios'
Submodule 'roms/openhackware' (git://git.qemu-project.org/openhackware.git) registered for path 'roms/openhackware'
Submodule 'roms/qemu-palcode' (git://github.com/rth7680/qemu-palcode.git) registered for path 'roms/qemu-palcode'
Submodule 'roms/seabios' (git://git.qemu-project.org/seabios.git/) registered for path 'roms/seabios'
Submodule 'roms/sgabios' (git://git.qemu-project.org/sgabios.git) registered for path 'roms/sgabios'
Submodule 'roms/u-boot' (git://git.qemu-project.org/u-boot.git) registered for path 'roms/u-boot'
Submodule 'roms/vgabios' (git://git.qemu-project.org/vgabios.git/) registered for path 'roms/vgabios'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf'
Cloning into 'pixman'...
Submodule path 'pixman': checked out '87eea99e443b389c978cf37efc52788bf03a0ee0'
Cloning into 'roms/SLOF'...
Submodule path 'roms/SLOF': checked out 'e3d05727a074619fc12d0a67f05cf2c42c875cce'
Cloning into 'roms/ipxe'...
Submodule path 'roms/ipxe': checked out '04186319181298083ef28695a8309028b26fe83c'
Cloning into 'roms/openbios'...
Submodule path 'roms/openbios': checked out 'e79bca64838c96ec44fd7acd508879c5284233dd'
Cloning into 'roms/openhackware'...
Submodule path 'roms/openhackware': checked out 'c559da7c8eec5e45ef1f67978827af6f0b9546f5'
Cloning into 'roms/qemu-palcode'...
Submodule path 'roms/qemu-palcode': checked out 'c87a92639b28ac42bc8f6c67443543b405dc479b'
Cloning into 'roms/seabios'...
Submodule path 'roms/seabios': checked out 'e2fc41e24ee0ada60fc511d60b15a41b294538be'
Cloning into 'roms/sgabios'...
Submodule path 'roms/sgabios': checked out '23d474943dcd55d0550a3d20b3d30e9040a4f15b'
Cloning into 'roms/u-boot'...
Submodule path 'roms/u-boot': checked out '2072e7262965bb48d7fffb1e283101e6ed8b21a8'
Cloning into 'roms/vgabios'...
Submodule path 'roms/vgabios': checked out '19ea12c230ded95928ecaef0db47a82231c2e485'
warning: unable to rmdir pixman: Directory not empty
Switched to a new branch 'test'
M	dtc
M	roms/SLOF
M	roms/ipxe
M	roms/openbios
M	roms/qemu-palcode
M	roms/seabios
M	roms/sgabios
M	roms/u-boot
fatal: Not a valid branch point: '0ef0583d5adceb9138bdb47494dabd1549ac5b6d'.
Traceback (most recent call last):
  File "/home/patchew/patchew/patchew-cli", line 508, in test_one
    cwd=clone, stdout=logf, stderr=logf)
  File "/usr/lib64/python3.4/subprocess.py", line 558, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'branch', 'base', '0ef0583d5adceb9138bdb47494dabd1549ac5b6d']' returned non-zero exit status 128



---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 5e8d6a12d643a38b82a0a713a77d1192117dbdca:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180216-pull-request' into staging (2018-02-16 15:55:45 +0000)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20180216

for you to fetch changes up to bf67f1c0b16c0de43b8a10cb53808dd62b0cdc04:

  monitor.c: Fix infinite loop in monitor's auto-complete (2018-02-16 17:36:16 +0000)

----------------------------------------------------------------
HMP pull 2018-02-16

----------------------------------------------------------------
Dr. David Alan Gilbert (1):
      monitor.c: Fix infinite loop in monitor's auto-complete

Thomas Huth (1):
      monitor: Remove legacy "-mon default=on" parameter

 monitor.c     | 9 ++++-----
 qemu-doc.texi | 9 ---------
 vl.c          | 4 ----
 3 files changed, 4 insertions(+), 18 deletions(-)

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On 16 February 2018 at 17:46, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 5e8d6a12d643a38b82a0a713a77d1192117dbdca:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180216-pull-request' into staging (2018-02-16 15:55:45 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20180216
>
> for you to fetch changes up to bf67f1c0b16c0de43b8a10cb53808dd62b0cdc04:
>
>   monitor.c: Fix infinite loop in monitor's auto-complete (2018-02-16 17:36:16 +0000)
>
> ----------------------------------------------------------------
> HMP pull 2018-02-16
>
> ----------------------------------------------------------------
> Dr. David Alan Gilbert (1):
>       monitor.c: Fix infinite loop in monitor's auto-complete
>
> Thomas Huth (1):
>       monitor: Remove legacy "-mon default=on" parameter

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 4bdc24fa018901892bb8a5bd1808ebd605f4c64d:

  Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-12-v4' into staging (2018-03-20 09:51:49 +0000)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20180320

for you to fetch changes up to 95372184b7acdfd82ee748b6f0c6df1d839982ba:

  hmp: free sev info (2018-03-20 12:32:06 +0000)

----------------------------------------------------------------
HMP fixes for 2.12

----------------------------------------------------------------
Marc-André Lureau (1):
      hmp: free sev info

zhangjixiang (1):
      HMP: Initialize err before using

 hmp.c                 | 2 +-
 target/i386/monitor.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On 20 March 2018 at 12:41, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 4bdc24fa018901892bb8a5bd1808ebd605f4c64d:
>
>   Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-12-v4' into staging (2018-03-20 09:51:49 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20180320
>
> for you to fetch changes up to 95372184b7acdfd82ee748b6f0c6df1d839982ba:
>
>   hmp: free sev info (2018-03-20 12:32:06 +0000)
>
> ----------------------------------------------------------------
> HMP fixes for 2.12
>
> ----------------------------------------------------------------
> Marc-André Lureau (1):
>       hmp: free sev info
>
> zhangjixiang (1):
>       HMP: Initialize err before using
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit f75d15231e56cb0f2bafe19faf1229c459a60731:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2019-04-30 17:06:57 +0100)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20190501

for you to fetch changes up to 574d96933ceff60b2d13fe97602572fc7e95f7c6:

  hmp: gva2gpa debug command (2019-05-01 10:46:59 +0100)

----------------------------------------------------------------
HMP pull

New gva2gpa command
delvm now uses hmp_handle_error so gets Error: prefix in messages

----------------------------------------------------------------
Cole Robinson (1):
      hmp: delvm: use hmp_handle_error

Dr. David Alan Gilbert (1):
      hmp: gva2gpa debug command

 hmp-commands.hx  | 15 +++++++++++++++
 hmp.c            |  7 ++++---
 monitor.c        | 22 ++++++++++++++++++++++
 tests/test-hmp.c |  1 +
 4 files changed, 42 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 0/2] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit f75d15231e56cb0f2bafe19faf1229c459a60731:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2019-04-30 17:06:57 +0100)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20190501

for you to fetch changes up to 574d96933ceff60b2d13fe97602572fc7e95f7c6:

  hmp: gva2gpa debug command (2019-05-01 10:46:59 +0100)

----------------------------------------------------------------
HMP pull

New gva2gpa command
delvm now uses hmp_handle_error so gets Error: prefix in messages

----------------------------------------------------------------
Cole Robinson (1):
      hmp: delvm: use hmp_handle_error

Dr. David Alan Gilbert (1):
      hmp: gva2gpa debug command

 hmp-commands.hx  | 15 +++++++++++++++
 hmp.c            |  7 ++++---
 monitor.c        | 22 ++++++++++++++++++++++
 tests/test-hmp.c |  1 +
 4 files changed, 42 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/2] hmp: delvm: use hmp_handle_error

[Dr. David Alan Gilbert (git)]

From: Cole Robinson <crobinso@redhat.com>

This gives us the consistent 'Error:' prefix added in 66363e9a43f,
which helps users like libvirt who still need to scrape hmp error
messages to detect failure.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-Id: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hmp.c b/hmp.c
index 4bb3af748e..56a3ed7375 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1480,10 +1480,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
     const char *name = qdict_get_str(qdict, "name");
 
     if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
-        error_reportf_err(err,
-                          "Error while deleting snapshot on device '%s': ",
-                          bdrv_get_device_name(bs));
+        error_prepend(&err,
+                      "deleting snapshot on device '%s': ",
+                      bdrv_get_device_name(bs));
     }
+    hmp_handle_error(mon, &err);
 }
 
 void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
-- 
2.21.0

[Qemu-devel] [PULL 1/2] hmp: delvm: use hmp_handle_error

[Dr. David Alan Gilbert (git)]

From: Cole Robinson <crobinso@redhat.com>

This gives us the consistent 'Error:' prefix added in 66363e9a43f,
which helps users like libvirt who still need to scrape hmp error
messages to detect failure.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-Id: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hmp.c b/hmp.c
index 4bb3af748e..56a3ed7375 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1480,10 +1480,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
     const char *name = qdict_get_str(qdict, "name");
 
     if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
-        error_reportf_err(err,
-                          "Error while deleting snapshot on device '%s': ",
-                          bdrv_get_device_name(bs));
+        error_prepend(&err,
+                      "deleting snapshot on device '%s': ",
+                      bdrv_get_device_name(bs));
     }
+    hmp_handle_error(mon, &err);
 }
 
 void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
-- 
2.21.0

[Qemu-devel] [PULL 2/2] hmp: gva2gpa debug command

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Add a gva2gpa command purely for debug which performs
address translation on the gva, the existing gpa2hva
command can then also be used to find it in the qemu
userspace; e.g.

(qemu) info registers
.... RSP=ffffffff81c03e98
....
(qemu) gva2gpa 0xffffffff81c03e98
gpa: 0x1c03e98
(qemu) gpa2hva 0x1c03e98
Host virtual address for 0x1c03e98 (pc.ram) is 0x7f0599a03e98
(qemu) x/10x 0xffffffff81c03e98
ffffffff81c03e98: 0x81c03eb8 0xffffffff 0x8101ea3f 0xffffffff
ffffffff81c03ea8: 0x81d27b00 0xffffffff 0x00000000 0x00000000
ffffffff81c03eb8: 0x81c03ec8 0xffffffff

gdb -p ...qemu...
(gdb) x/10x 0x7f0599a03e98
0x7f0599a03e98:	0x81c03eb8	0xffffffff	0x8101ea3f	0xffffffff
0x7f0599a03ea8:	0x81d27b00	0xffffffff	0x00000000	0x00000000
0x7f0599a03eb8:	0x81c03ec8	0xffffffff

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190412152652.827-1-dgilbert@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp-commands.hx  | 15 +++++++++++++++
 monitor.c        | 22 ++++++++++++++++++++++
 tests/test-hmp.c |  1 +
 3 files changed, 38 insertions(+)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 9b4035965c..a2c3ffc218 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -585,6 +585,21 @@ STEXI
 @findex gpa2hpa
 Print the host physical address at which the guest's physical address @var{addr}
 is mapped.
+ETEXI
+
+    {
+        .name       = "gva2gpa",
+        .args_type  = "addr:l",
+        .params     = "addr",
+        .help       = "print the guest physical address corresponding to a guest virtual address",
+        .cmd        = hmp_gva2gpa,
+    },
+
+STEXI
+@item gva2gpa @var{addr}
+@findex gva2gpa
+Print the guest physical address at which the guest's virtual address @var{addr}
+is mapped based on the mapping for the current CPU.
 ETEXI
 
     {
diff --git a/monitor.c b/monitor.c
index 9b5f10b475..bb48997913 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1673,6 +1673,28 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)
     memory_region_unref(mr);
 }
 
+static void hmp_gva2gpa(Monitor *mon, const QDict *qdict)
+{
+    target_ulong addr = qdict_get_int(qdict, "addr");
+    MemTxAttrs attrs;
+    CPUState *cs = mon_get_cpu();
+    hwaddr gpa;
+
+    if (!cs) {
+        monitor_printf(mon, "No cpu\n");
+        return;
+    }
+
+    gpa  = cpu_get_phys_page_attrs_debug(mon_get_cpu(),
+                                         addr & TARGET_PAGE_MASK, &attrs);
+    if (gpa == -1) {
+        monitor_printf(mon, "Unmapped\n");
+    } else {
+        monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n",
+                       gpa + (addr & ~TARGET_PAGE_MASK));
+    }
+}
+
 #ifdef CONFIG_LINUX
 static uint64_t vtop(void *ptr, Error **errp)
 {
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index 54a01824dc..e344947f7c 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -39,6 +39,7 @@ static const char *hmp_cmds[] = {
     "dump-guest-memory /dev/null 0 4096",
     "dump-guest-memory /dev/null",
     "gdbserver",
+    "gva2gpa 0",
     "hostfwd_add tcp::43210-:43210",
     "hostfwd_remove tcp::43210-:43210",
     "i /w 0",
-- 
2.21.0

[Qemu-devel] [PULL 2/2] hmp: gva2gpa debug command

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Add a gva2gpa command purely for debug which performs
address translation on the gva, the existing gpa2hva
command can then also be used to find it in the qemu
userspace; e.g.

(qemu) info registers
.... RSP=ffffffff81c03e98
....
(qemu) gva2gpa 0xffffffff81c03e98
gpa: 0x1c03e98
(qemu) gpa2hva 0x1c03e98
Host virtual address for 0x1c03e98 (pc.ram) is 0x7f0599a03e98
(qemu) x/10x 0xffffffff81c03e98
ffffffff81c03e98: 0x81c03eb8 0xffffffff 0x8101ea3f 0xffffffff
ffffffff81c03ea8: 0x81d27b00 0xffffffff 0x00000000 0x00000000
ffffffff81c03eb8: 0x81c03ec8 0xffffffff

gdb -p ...qemu...
(gdb) x/10x 0x7f0599a03e98
0x7f0599a03e98:	0x81c03eb8	0xffffffff	0x8101ea3f	0xffffffff
0x7f0599a03ea8:	0x81d27b00	0xffffffff	0x00000000	0x00000000
0x7f0599a03eb8:	0x81c03ec8	0xffffffff

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190412152652.827-1-dgilbert@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp-commands.hx  | 15 +++++++++++++++
 monitor.c        | 22 ++++++++++++++++++++++
 tests/test-hmp.c |  1 +
 3 files changed, 38 insertions(+)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 9b4035965c..a2c3ffc218 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -585,6 +585,21 @@ STEXI
 @findex gpa2hpa
 Print the host physical address at which the guest's physical address @var{addr}
 is mapped.
+ETEXI
+
+    {
+        .name       = "gva2gpa",
+        .args_type  = "addr:l",
+        .params     = "addr",
+        .help       = "print the guest physical address corresponding to a guest virtual address",
+        .cmd        = hmp_gva2gpa,
+    },
+
+STEXI
+@item gva2gpa @var{addr}
+@findex gva2gpa
+Print the guest physical address at which the guest's virtual address @var{addr}
+is mapped based on the mapping for the current CPU.
 ETEXI
 
     {
diff --git a/monitor.c b/monitor.c
index 9b5f10b475..bb48997913 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1673,6 +1673,28 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)
     memory_region_unref(mr);
 }
 
+static void hmp_gva2gpa(Monitor *mon, const QDict *qdict)
+{
+    target_ulong addr = qdict_get_int(qdict, "addr");
+    MemTxAttrs attrs;
+    CPUState *cs = mon_get_cpu();
+    hwaddr gpa;
+
+    if (!cs) {
+        monitor_printf(mon, "No cpu\n");
+        return;
+    }
+
+    gpa  = cpu_get_phys_page_attrs_debug(mon_get_cpu(),
+                                         addr & TARGET_PAGE_MASK, &attrs);
+    if (gpa == -1) {
+        monitor_printf(mon, "Unmapped\n");
+    } else {
+        monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n",
+                       gpa + (addr & ~TARGET_PAGE_MASK));
+    }
+}
+
 #ifdef CONFIG_LINUX
 static uint64_t vtop(void *ptr, Error **errp)
 {
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index 54a01824dc..e344947f7c 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -39,6 +39,7 @@ static const char *hmp_cmds[] = {
     "dump-guest-memory /dev/null 0 4096",
     "dump-guest-memory /dev/null",
     "gdbserver",
+    "gva2gpa 0",
     "hostfwd_add tcp::43210-:43210",
     "hostfwd_remove tcp::43210-:43210",
     "i /w 0",
-- 
2.21.0

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On Wed, 1 May 2019 at 12:00, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit f75d15231e56cb0f2bafe19faf1229c459a60731:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2019-04-30 17:06:57 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20190501
>
> for you to fetch changes up to 574d96933ceff60b2d13fe97602572fc7e95f7c6:
>
>   hmp: gva2gpa debug command (2019-05-01 10:46:59 +0100)
>
> ----------------------------------------------------------------
> HMP pull
>
> New gva2gpa command
> delvm now uses hmp_handle_error so gets Error: prefix in messages
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM

Re: [Qemu-devel] [PULL 0/2] hmp queue

[Peter Maydell]

On Wed, 1 May 2019 at 12:00, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit f75d15231e56cb0f2bafe19faf1229c459a60731:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2019-04-30 17:06:57 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20190501
>
> for you to fetch changes up to 574d96933ceff60b2d13fe97602572fc7e95f7c6:
>
>   hmp: gva2gpa debug command (2019-05-01 10:46:59 +0100)
>
> ----------------------------------------------------------------
> HMP pull
>
> New gva2gpa command
> delvm now uses hmp_handle_error so gets Error: prefix in messages
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM