From: Stefan Weil <sw@weilnetz.de>
To: Anthony Liguori <aliguori@amazon.com>
Cc: Stefan Weil <sw@weilnetz.de>, qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH for 1.7 1/3] nsis: Improved support for parallel installation of 32 and 64 bit code
Date: Thu, 7 Nov 2013 07:15:07 +0100 [thread overview]
Message-ID: <1383804909-376-2-git-send-email-sw@weilnetz.de> (raw)
In-Reply-To: <1383804909-376-1-git-send-email-sw@weilnetz.de>
32 and 64 bit variants of QEMU already had different default installation
directories, but used a common registry key for saving the choosen
directory. This is confusing for users who want to install both variants,
so fix it by using different registry keys.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
qemu.nsi | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/qemu.nsi b/qemu.nsi
index 0dc1f52..cc5fafd 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -60,7 +60,11 @@ InstallDir $PROGRAMFILES\qemu
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\qemu" "Install_Dir"
+!ifdef W64
+InstallDirRegKey HKLM "Software\qemu64" "Install_Dir"
+!else
+InstallDirRegKey HKLM "Software\qemu32" "Install_Dir"
+!endif
; Request administrator privileges for Windows Vista.
RequestExecutionLevel admin
--
1.7.10.4
next prev parent reply other threads:[~2013-11-07 6:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 6:15 [Qemu-devel] [PULL for 1.7] Three unsorted patches Stefan Weil
2013-11-07 6:15 ` Stefan Weil [this message]
2013-11-07 6:15 ` [Qemu-devel] [PATCH for 1.7 2/3] configure: Add config.status to recreate the current configuration Stefan Weil
2013-11-07 6:15 ` [Qemu-devel] [PATCH for 1.7 3/3] linux-user: Fix stat64 syscall for SPARC64 Stefan Weil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383804909-376-2-git-send-email-sw@weilnetz.de \
--to=sw@weilnetz.de \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).