diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:07 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:07 -0600 |
| commit | fb43a4807ec06307048018d93a7f9e0828308bb5 (patch) | |
| tree | fdf550b9185381b356d6e502c53ffc743b96f6c0 /ui/spice-core.c | |
| parent | 0a87470116a169f0c764894e46014a77f5d32a9e (diff) | |
| parent | 21a50d0b1a0745e485eff3e5aa393cdc4a1980b6 (diff) | |
| download | qemu-fb43a4807ec06307048018d93a7f9e0828308bb5.tar.gz | |
Merge remote-tracking branch 'spice/spice.v64' into staging
* spice/spice.v64:
spice: add new spice-server callbacks to ui/spice-display.c
Fix the inconsistency in x509-dh-key-file parameter
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 51473650c0..261c6f2c11 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -610,7 +610,7 @@ void qemu_spice_init(void) } x509_key_password = qemu_opt_get(opts, "x509-key-password"); - x509_dh_file = qemu_opt_get(opts, "x509-dh-file"); + x509_dh_file = qemu_opt_get(opts, "x509-dh-key-file"); tls_ciphers = qemu_opt_get(opts, "tls-ciphers"); } |