qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 39fbc5: s390x/kvm: Fix switch/case indentatio


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 39fbc5: s390x/kvm: Fix switch/case indentation for handle_...
Date: Fri, 30 Aug 2013 11:30:08 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 39fbc5c62ce83f34e7f5b62238305d83ce8b4489
      
https://github.com/qemu/qemu/commit/39fbc5c62ce83f34e7f5b62238305d83ce8b4489
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Fix switch/case indentation for handle_diag

This alignes case statements to switch statements in the handle_diag
function as mandated by coding style.

Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 268846ba93de2529630d623b6ded72cee1221106
      
https://github.com/qemu/qemu/commit/268846ba93de2529630d623b6ded72cee1221106
  Author: Eugene (jno) Dvurechenski <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  s390/kvm: basic implementation of diagnose 308 subcode 6

Linux uses a check for subcode 6 to decide if other subcodes are
available. Provide a minimal implementation for subcode 6, as well
as for subcode 5.

Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
[Move code from kvm.c into misc_helper.c]


  Commit: 4e872a3fb024f0d742ef6b48be3afaab2c4453fc
      
https://github.com/qemu/qemu/commit/4e872a3fb024f0d742ef6b48be3afaab2c4453fc
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M target-s390x/cpu.h

  Log Message:
  -----------
  s390: provide I/O subsystem reset

Provide a function that resets the I/O subsystem.

Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: Alexander Graf <address@hidden>


  Commit: 29c6157ca7bfa036a8c59805c1a1d76ba9a2a851
      
https://github.com/qemu/qemu/commit/29c6157ca7bfa036a8c59805c1a1d76ba9a2a851
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M target-s390x/cpu-qom.h
    M target-s390x/cpu.c
    M target-s390x/cpu.h

  Log Message:
  -----------
  s390: provide a cpu load normal function

Some code needs to perform an IPL-like bootup that mimics the
ESA (31bit) restart. Provide a cpu class method that does so.

Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: Alexander Graf <address@hidden>


  Commit: 9c3175cc15fbe8d3528375d1389dad40b19b7665
      
https://github.com/qemu/qemu/commit/9c3175cc15fbe8d3528375d1389dad40b19b7665
  Author: Stefan Weil <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Add missing attributes to local function

Function expr_error gets a format string and variable arguments like printf.
It also never returns. Add the necessary attributes.

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: cd5c6bba1b75d4faebb58345d2661d5e42600fab
      
https://github.com/qemu/qemu/commit/cd5c6bba1b75d4faebb58345d2661d5e42600fab
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: avoid use of global *cur_mon in cmd_completion()

A new local variable *mon is added in monitor_find_completion()
to make compile pass, which will be removed later in
conversion patch for monitor_find_completion().

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: cb8f68b104f8d14f0ad856012cac7bd27f183799
      
https://github.com/qemu/qemu/commit/cb8f68b104f8d14f0ad856012cac7bd27f183799
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: avoid use of global *cur_mon in file_completion()

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 599a926abcf581732d449163a96fd9a4cc80091a
      
https://github.com/qemu/qemu/commit/599a926abcf581732d449163a96fd9a4cc80091a
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: avoid use of global *cur_mon in block_completion_it()

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: d2674b2cf7db7dce865f3c2b89f0e36d1657a3b5
      
https://github.com/qemu/qemu/commit/d2674b2cf7db7dce865f3c2b89f0e36d1657a3b5
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M include/monitor/readline.h
    M monitor.c
    M readline.c

  Log Message:
  -----------
  monitor: avoid use of global *cur_mon in monitor_find_completion()

Parameter *mon is added, and local variable *mon added in previous patch
is removed. The caller readline_completion(), pass rs->mon as value, which
should be initialized in readline_init() called by monitor_init().

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: d1a9756ab8c2c2578cbcb325efffe0b0af916944
      
https://github.com/qemu/qemu/commit/d1a9756ab8c2c2578cbcb325efffe0b0af916944
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M readline.c

  Log Message:
  -----------
  monitor: avoid use of global *cur_mon in readline_completion()

Now all completion functions do not use *cur_mon any more, instead
they use rs->mon. In short, structure ReadLineState decide where
the complete action would be taken now.

Tested with the case that qemu have two telnet monitors, auto
completion function works normal.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: d038317c357efef9d8d362e526c5f5071f505a04
      
https://github.com/qemu/qemu/commit/d038317c357efef9d8d362e526c5f5071f505a04
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: call sortcmdlist() only one time

It doesn't need to be done for every monitor, so change it.

Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: b01fe89e91268c6b02720735643020746610e6d8
      
https://github.com/qemu/qemu/commit/b01fe89e91268c6b02720735643020746610e6d8
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: split off monitor_data_init()

In qmp_human_monitor_command(), the monitor need to initialized for
basic functionalities, and later more init code will be added, so
split off this function. Note that it is different with QMP mode
monitor which accept json string from monitor's input,
qmp_human_monitor_command() retrieve the human style command from
QMP input, then send the command to a normal mode monitor.

Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 7717239dc1778e94a6210e62e1ec2ba720168eec
      
https://github.com/qemu/qemu/commit/7717239dc1778e94a6210e62e1ec2ba720168eec
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: avoid direct use of global variable *mon_cmds

New member *cmd_table is added in structure Monitor to avoid direct usage of
*mon_cmds. Now monitor have an associated command table, when global variable
*info_cmds is also discarded, structure Monitor would gain full control about
how to deal with user input.

Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: f5438c0500bb22c97b30987d2e0eab953416c7c5
      
https://github.com/qemu/qemu/commit/f5438c0500bb22c97b30987d2e0eab953416c7c5
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: code move for parse_cmdline()

help_cmd() need this function later, so move it. get_str() is called by
parse_cmdline() so it is moved also. Some code style error reported by
check script, is also fixed.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: dcc70cdf0932172fc5cf27617a3b033ca58d0176
      
https://github.com/qemu/qemu/commit/dcc70cdf0932172fc5cf27617a3b033ca58d0176
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: refine parse_cmdline()

Since this function will be used by help_cmd() later, so improve
it to make it more generic and easier to use. free_cmdline_args()
is added too as paired function to free the result.

One change of this function is that, when the valid args in input
exceed the limit of MAX_ARGS, it fails now, instead of return with
MAX_ARGS of parsed args in old code. This should not impact much
since it is rare that user input many args in monitor's "help" and
auto complete scenario.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 66855495fbcca9411a21e6eba6a3a0385007c96d
      
https://github.com/qemu/qemu/commit/66855495fbcca9411a21e6eba6a3a0385007c96d
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: support sub command in help

The old code in help_cmd() uses global 'info_cmds' and treats it as a
special case. Actually 'info_cmds' is a sub command group of 'mon_cmds',
in order to avoid direct use of it, help_cmd() needs to change its work
mechanism to support sub command and not treat it as a special case
any more.

To support sub command, help_cmd() will first parse the input and then call
help_cmd_dump(), which works as a reentrant function. When it meets a sub
command, it simply enters the function again. Since help dumping needs to
know whole input to printf full help message include prefix, for example,
"help info block" need to printf prefix "info", so help_cmd_dump() takes all
args from input and extra parameter arg_index to identify the progress.
Another function help_cmd_dump_one() is introduced to printf the prefix
and command's help message.

Now help supports sub command, so later if another sub command group is
added in any depth, help will automatically work for it. Still "help info
block" will show error since command parser reject additional parameter,
which can be improved later. "log" is still treated as a special case.

Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: c35b6400338897847bbab1b0f65d89552636579a
      
https://github.com/qemu/qemu/commit/c35b6400338897847bbab1b0f65d89552636579a
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: refine monitor_find_completion()

In order to support sub command in auto completion, a reentrant function
is needed, so monitor_find_completion() is split into two parts. The
first part does parsing of user input which need to be done only once,
the second part does the auto completion job according to the parsing
result, which contains the necessary code to support sub command and
works as the reentrant function. The global "info_cmds" is still used
in second part, which will be replaced by sub command code later.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: d903a779cf2f1fa5cd12076411a00b835f1b7b26
      
https://github.com/qemu/qemu/commit/d903a779cf2f1fa5cd12076411a00b835f1b7b26
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: support sub command in auto completion

This patch allows auto completion work normal for sub command case,
"info block [DEVICE]" can auto complete now, by re-enter the completion
function. In original code "info" is treated as a special case, now it
is treated as a sub command group, global variable info_cmds is not used
any more.

"help" command is still treated as a special case, since it is not a sub
command group but want to auto complete command in root command table.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 129be006d63ba90b788de6b1610892e02ef5eaba
      
https://github.com/qemu/qemu/commit/129be006d63ba90b788de6b1610892e02ef5eaba
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M hmp-commands.hx
    M monitor.c

  Log Message:
  -----------
  monitor: allow "help" show message for single command in sub group

A new parameter type 'S' is introduced to allow user input any string.
"help info block" works normal now.

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 7ca0e061044615e39eab2b22b8fc2791a4d77c34
      
https://github.com/qemu/qemu/commit/7ca0e061044615e39eab2b22b8fc2791a4d77c34
  Author: Wenchao Xia <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: improve auto complete of "help" for single command in sub group

Now special case "help *" in auto completion can work with sub commands,
such as "help info u*".

Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: f5ae2a4fd8d573cfebaf24220e2920bb5074d9a6
      
https://github.com/qemu/qemu/commit/f5ae2a4fd8d573cfebaf24220e2920bb5074d9a6
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M target-s390x/cpu-qom.h
    M target-s390x/cpu.c

  Log Message:
  -----------
  s390/cpu: split CPU reset into architectured functions

s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
  not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
  timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty

wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.

Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: f077847572708bbb3dd22bbc91ac6a277046e827
      
https://github.com/qemu/qemu/commit/f077847572708bbb3dd22bbc91ac6a277046e827
  Author: Christian Borntraeger <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  s390: Implement load normal reset

kdump on s390 uses a load normal reset to bring the system in a defined
state by doing a subsystem reset. The issuing CPUs will have an initial
CPU reset, all other CPUs will have a CPU reset as defined in POP (no
register content will change).

Implement this as architectured.

Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 7f7f975295bc19829b3bd26cadc7f1c9eadb7c6b
      
https://github.com/qemu/qemu/commit/7f7f975295bc19829b3bd26cadc7f1c9eadb7c6b
  Author: Eugene (jno) Dvurechenski <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M cpus.c
    M hmp-commands.hx
    M qmp-commands.hx
    M target-s390x/cpu.h
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390: wire up nmi command to raise a RESTART interrupt on S390

There is the 'nmi' command that is used to trigger a guest dump via kdump 
feature on x86.
s390 uses RESTART interrupt to trigger kdump.
So, this patch provides a mean to use 'nmi' command on s390 to raise RESTART 
interrupt.

The CPU to receive the RESTART interrupt is the "default" one.

There is an infrastructure to select the "default" CPU using 'cpu' command.
The 'info cpus' command can be used to see which one is the "default".

In order to wire up the RESTART to 'nmi' command we had to:
1. implement the kvm_s390_cpu_restart function by exporting the existing code
2. implement s390_cpu_restart function as kvm-aware wrapper
3. modify the qmp_inject_nmi function to enable (for s390) the scan for
   "default" CPU and call s390_cpu_restart for it;
3. fix some messages.

Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: Alexander Graf <address@hidden>


  Commit: b95fdc0e99e9b5c98bb8e2aee9eaffe160f1031b
      
https://github.com/qemu/qemu/commit/b95fdc0e99e9b5c98bb8e2aee9eaffe160f1031b
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M cpus.c
    M hmp-commands.hx
    M hw/s390x/s390-virtio-ccw.c
    M qmp-commands.hx
    M target-s390x/cpu-qom.h
    M target-s390x/cpu.c
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'borntraeger/tags/kdump' into staging

This is a set of patches dealing with kdump support for s390x/kvm.
kdump on s390x uses subcode 1 of diagnose 0x308 to put the hardware
in a defined state. This is different from a full reset, since it
does not touch all CPU registers.
These patches define the cpu resets, the subsystem reset a load
function and also wires up the "nmi" command to issue a RESTART
interrupt as defined in the z/Architecture principles of operation.

This allows recent guest kernels with properly setup userspace
to trigger kdump:
- via guest crash
- via nmi from the host

# gpg: Signature made Fri 30 Aug 2013 07:19:18 AM CDT using RSA key ID B5A61C7C
# gpg: Can't check signature: public key not found

# By Christian Borntraeger (5) and Eugene (jno) Dvurechenski (2)
# Via Christian Borntraeger
* borntraeger/tags/kdump:
  s390: wire up nmi command to raise a RESTART interrupt on S390
  s390: Implement load normal reset
  s390/cpu: split CPU reset into architectured functions
  s390: provide a cpu load normal function
  s390: provide I/O subsystem reset
  s390/kvm: basic implementation of diagnose 308 subcode 6
  s390x/kvm: Fix switch/case indentation for handle_diag

Message-id: address@hidden


  Commit: 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07
      
https://github.com/qemu/qemu/commit/4ff78e0dbcd5c795962567fdc1b31e9e03c55b07
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M hmp-commands.hx
    M include/monitor/readline.h
    M monitor.c
    M readline.c

  Log Message:
  -----------
  Merge remote-tracking branch 'luiz/queue/qmp' into staging

# By Wenchao Xia (15) and Stefan Weil (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
  monitor: improve auto complete of "help" for single command in sub group
  monitor: allow "help" show message for single command in sub group
  monitor: support sub command in auto completion
  monitor: refine monitor_find_completion()
  monitor: support sub command in help
  monitor: refine parse_cmdline()
  monitor: code move for parse_cmdline()
  monitor: avoid direct use of global variable *mon_cmds
  monitor: split off monitor_data_init()
  monitor: call sortcmdlist() only one time
  monitor: avoid use of global *cur_mon in readline_completion()
  monitor: avoid use of global *cur_mon in monitor_find_completion()
  monitor: avoid use of global *cur_mon in block_completion_it()
  monitor: avoid use of global *cur_mon in file_completion()
  monitor: avoid use of global *cur_mon in cmd_completion()
  monitor: Add missing attributes to local function

Message-id: address@hidden


Compare: https://github.com/qemu/qemu/compare/b5d54bd42158...4ff78e0dbcd5

reply via email to

[Prev in Thread] Current Thread [Next in Thread]