xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: ian.jackson@eu.citrix.com, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH OSSTEST v2 1/2] TestSupport: rename guest_editconfig_nocd to _midinstall
Date: Wed, 6 Apr 2016 17:20:19 +0100	[thread overview]
Message-ID: <1459959620-12564-2-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1459959620-12564-1-git-send-email-wei.liu2@citrix.com>

It does more than just replacing the disc in cdrom. It also modifies
guest reboot action.

No functional change.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm | 4 ++--
 ts-debian-hvm-install  | 2 +-
 ts-redhat-install      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 9e6479a..4eb50fa 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -119,7 +119,7 @@ BEGIN {
                       iso_create_empty
                       iso_gen_flags_basic
                       iso_copy_content_from_image
-                      guest_editconfig_nocd
+                      guest_editconfig_midinstall
                       host_install_postboot_complete
                       target_core_dump_setup
                       );
@@ -2509,7 +2509,7 @@ sub iso_copy_content_from_image($$) {
 END
 }
 
-sub guest_editconfig_nocd ($$) {
+sub guest_editconfig_midinstall ($$) {
     my ($gho,$emptyiso) = @_;
     guest_editconfig($gho->{Host}, $gho, sub {
         if (m/^\s*disk\s*\=/ .. /\]/) {
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 7521d57..f43ea3e 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -283,7 +283,7 @@ if ($stage<2) {
     guest_destroy($gho);
 }
 
-guest_editconfig_nocd($gho,$emptyiso);
+guest_editconfig_midinstall($gho,$emptyiso);
 guest_create($gho);
 guest_await_dhcp_tcp($gho,300);
 guest_check_up($gho);
diff --git a/ts-redhat-install b/ts-redhat-install
index 10da559..64012db 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -158,7 +158,7 @@ if ($stage<2) {
     guest_destroy($gho);
 }
 
-guest_editconfig_nocd($gho,$emptyiso);
+guest_editconfig_midinstall($gho,$emptyiso);
 guest_create($gho);
 guest_await_dhcp_tcp($gho,300);
 guest_check_up($gho);
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  reply	other threads:[~2016-04-06 16:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06 16:20 [PATCH OSSTEST v2 0/2] Test booting hvm guest with empty cdrom drive Wei Liu
2016-04-06 16:20 ` Wei Liu [this message]
2016-04-06 16:20 ` [PATCH OSSTEST v2 2/2] Make guest cdrom empty after installation completes Wei Liu
2016-06-07 13:58 ` [PATCH OSSTEST v2 0/2] Test booting hvm guest with empty cdrom drive Ian Jackson
2016-06-07 16:29   ` Wei Liu
2016-06-08 18:01     ` Wei Liu

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=1459959620-12564-2-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.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).