Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 872d4fe

Browse files
teawaterteawater
authored
Merge pull request #737 from teawater/gdb
add GDBTCPPort
2 parents 4999903 + d5c1fe1 commit 872d4fe

File tree

7 files changed

+78
-57
lines changed

7 files changed

+78
-57
lines changed

‎daemon/daemon.go

+1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ func (daemon *Daemon) initRunV(c *apitypes.HyperConfig) error {
227227
Kernel: c.Kernel,
228228
Initrd: c.Initrd,
229229
EnableVsock: c.EnableVsock,
230+
GDBTCPPort: c.GDBTCPPort,
230231
}
231232
daemon.Factory = factory.NewFromPolicy(bootConfig, c.VmFactoryPolicy)
232233

‎types/config.go

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package types
33
import (
44
"fmt"
55
"os"
6+
"strconv"
67
"strings"
78

89
"github.com/Unknwon/goconfig"
@@ -28,6 +29,7 @@ type HyperConfig struct {
2829
EnableVsock bool
2930
DefaultLog string
3031
DefaultLogOpt map[string]string
32+
GDBTCPPort int
3133

3234
logPrefix string
3335
}
@@ -70,6 +72,14 @@ func NewHyperConfig(config string) *HyperConfig {
7072
c.DefaultLogOpt, _ = cfg.GetSection("Log")
7173
c.VmFactoryPolicy, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "VmFactoryPolicy")
7274
c.GRPCHost, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "gRPCHost")
75+
port, _ := cfg.GetValue(goconfig.DEFAULT_SECTION, "GDBTCPPort")
76+
if port != "" {
77+
c.GDBTCPPort, err = strconv.Atoi(port)
78+
if err != nil {
79+
c.Log(hlog.ERROR, "read config file GDBTCPPort %s failed: %v", port, err)
80+
return nil
81+
}
82+
}
7383

7484
c.Log(hlog.INFO, "config items: %#v", c)
7585
return c

‎vendor/github.com/hyperhq/runv/hypervisor/context.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hyperhq/runv/hypervisor/driver.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hyperhq/runv/hypervisor/hypervisor.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hyperhq/runv/hypervisor/qemu/qemu_process.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/vendor.json

+56-56
Original file line numberDiff line numberDiff line change
@@ -1568,186 +1568,186 @@
15681568
"checksumSHA1": "2rOMU1jsBgWtKRLFh+tEYa0vaL8=",
15691569
"comment": "v0.8.0-21-g2ff5bd5",
15701570
"path": "github.com/hyperhq/runv/api",
1571-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1572-
"revisionTime": "2018-05-18T01:42:47Z"
1571+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1572+
"revisionTime": "2018-07-17T02:39:01Z"
15731573
},
15741574
{
15751575
"checksumSHA1": "wFyDRfp6kJA2BShtXVWPeGyj+Ps=",
15761576
"comment": "v0.8.0-21-g2ff5bd5",
15771577
"path": "github.com/hyperhq/runv/driverloader",
1578-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1579-
"revisionTime": "2018-05-18T01:42:47Z"
1578+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1579+
"revisionTime": "2018-07-17T02:39:01Z"
15801580
},
15811581
{
15821582
"checksumSHA1": "aHQAAMaJml761CWlShRPE0Mwml0=",
15831583
"comment": "v0.8.0-21-g2ff5bd5",
15841584
"path": "github.com/hyperhq/runv/factory",
1585-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1586-
"revisionTime": "2018-05-18T01:42:47Z"
1585+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1586+
"revisionTime": "2018-07-17T02:39:01Z"
15871587
},
15881588
{
15891589
"checksumSHA1": "3fMRgjly6yNBVu+dK3+VAkA2Ijg=",
15901590
"comment": "v0.8.0-21-g2ff5bd5",
15911591
"path": "github.com/hyperhq/runv/factory/base",
1592-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1593-
"revisionTime": "2018-05-18T01:42:47Z"
1592+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1593+
"revisionTime": "2018-07-17T02:39:01Z"
15941594
},
15951595
{
15961596
"checksumSHA1": "J0IhP6X/2ANAFulzfrZS3iPvlHE=",
15971597
"comment": "v0.8.0-21-g2ff5bd5",
15981598
"path": "github.com/hyperhq/runv/factory/cache",
1599-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1600-
"revisionTime": "2018-05-18T01:42:47Z"
1599+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1600+
"revisionTime": "2018-07-17T02:39:01Z"
16011601
},
16021602
{
16031603
"checksumSHA1": "UHG4MbKQ0dmsey/0GCGJ1mKZXGs=",
16041604
"comment": "v0.8.0-21-g2ff5bd5",
16051605
"path": "github.com/hyperhq/runv/factory/direct",
1606-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1607-
"revisionTime": "2018-05-18T01:42:47Z"
1606+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1607+
"revisionTime": "2018-07-17T02:39:01Z"
16081608
},
16091609
{
16101610
"checksumSHA1": "bGB2GrgGdR8tyqF7GM8t48txGrc=",
16111611
"comment": "v0.8.0-21-g2ff5bd5",
16121612
"path": "github.com/hyperhq/runv/factory/multi",
1613-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1614-
"revisionTime": "2018-05-18T01:42:47Z"
1613+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1614+
"revisionTime": "2018-07-17T02:39:01Z"
16151615
},
16161616
{
16171617
"checksumSHA1": "tQL9d/4/I4PHu4b21GXY2I45R3c=",
16181618
"comment": "v0.8.0-21-g2ff5bd5",
16191619
"path": "github.com/hyperhq/runv/factory/single",
1620-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1621-
"revisionTime": "2018-05-18T01:42:47Z"
1620+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1621+
"revisionTime": "2018-07-17T02:39:01Z"
16221622
},
16231623
{
16241624
"checksumSHA1": "QZkg1cUoP5dQS+rUuxdK5i/ODpc=",
16251625
"comment": "v0.8.0-21-g2ff5bd5",
16261626
"path": "github.com/hyperhq/runv/factory/template",
1627-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1628-
"revisionTime": "2018-05-18T01:42:47Z"
1627+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1628+
"revisionTime": "2018-07-17T02:39:01Z"
16291629
},
16301630
{
16311631
"checksumSHA1": "8rV+9nt3qhy4XEpGjbRmEtr2la0=",
16321632
"path": "github.com/hyperhq/runv/hyperstart/api/grpc",
1633-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1634-
"revisionTime": "2018-05-18T01:42:47Z"
1633+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1634+
"revisionTime": "2018-07-17T02:39:01Z"
16351635
},
16361636
{
16371637
"checksumSHA1": "sJ5xs77rBgllVL/MD/bvI+b7/h4=",
16381638
"comment": "v0.8.0-21-g2ff5bd5",
16391639
"path": "github.com/hyperhq/runv/hyperstart/api/json",
1640-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1641-
"revisionTime": "2018-05-18T01:42:47Z"
1640+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1641+
"revisionTime": "2018-07-17T02:39:01Z"
16421642
},
16431643
{
16441644
"checksumSHA1": "JsbbJ+k0/ea1iGwAen6FTk/X+K4=",
16451645
"comment": "v0.8.0-21-g2ff5bd5",
16461646
"path": "github.com/hyperhq/runv/hyperstart/libhyperstart",
1647-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1648-
"revisionTime": "2018-05-18T01:42:47Z"
1647+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1648+
"revisionTime": "2018-07-17T02:39:01Z"
16491649
},
16501650
{
1651-
"checksumSHA1": "FsCja0aSlQukY4rxi1nveJvg3bE=",
1651+
"checksumSHA1": "p3VMYXMVXl1sLG2yWhB3RZiGqBg=",
16521652
"comment": "v0.8.0-21-g2ff5bd5",
16531653
"path": "github.com/hyperhq/runv/hypervisor",
1654-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1655-
"revisionTime": "2018-05-18T01:42:47Z"
1654+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1655+
"revisionTime": "2018-07-17T02:39:01Z"
16561656
},
16571657
{
16581658
"checksumSHA1": "DaLJKlWX3iOBTKB3MkUkjpAukjQ=",
16591659
"path": "github.com/hyperhq/runv/hypervisor/kvmtool",
1660-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1661-
"revisionTime": "2018-05-18T01:42:47Z"
1660+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1661+
"revisionTime": "2018-07-17T02:39:01Z"
16621662
},
16631663
{
16641664
"checksumSHA1": "t1GudFJeXivPei0cjgDPx6lCx5E=",
16651665
"comment": "v0.8.0-21-g2ff5bd5",
16661666
"path": "github.com/hyperhq/runv/hypervisor/libvirt",
1667-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1668-
"revisionTime": "2018-05-18T01:42:47Z"
1667+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1668+
"revisionTime": "2018-07-17T02:39:01Z"
16691669
},
16701670
{
16711671
"checksumSHA1": "0F/kCIv6AEoMgspdc8M2HQ/E9kI=",
16721672
"comment": "v0.8.0-21-g2ff5bd5",
16731673
"path": "github.com/hyperhq/runv/hypervisor/network",
1674-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1675-
"revisionTime": "2018-05-18T01:42:47Z"
1674+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1675+
"revisionTime": "2018-07-17T02:39:01Z"
16761676
},
16771677
{
16781678
"checksumSHA1": "YAUAfc2PYReSINQp6X3xClJJpgs=",
16791679
"comment": "v0.8.0-21-g2ff5bd5",
16801680
"path": "github.com/hyperhq/runv/hypervisor/network/ipallocator",
1681-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1682-
"revisionTime": "2018-05-18T01:42:47Z"
1681+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1682+
"revisionTime": "2018-07-17T02:39:01Z"
16831683
},
16841684
{
1685-
"checksumSHA1": "rhF6fxOuvjs4fvmSI/h0UUDHuNA=",
1685+
"checksumSHA1": "eyuWYlEOdU3u4ws799Sm1yGhZII=",
16861686
"comment": "v0.8.0-21-g2ff5bd5",
16871687
"path": "github.com/hyperhq/runv/hypervisor/qemu",
1688-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1689-
"revisionTime": "2018-05-18T01:42:47Z"
1688+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1689+
"revisionTime": "2018-07-17T02:39:01Z"
16901690
},
16911691
{
16921692
"checksumSHA1": "VmDDbCJSPMIWY5lXZpnvhDg37ZU=",
16931693
"comment": "v0.8.0-21-g2ff5bd5",
16941694
"path": "github.com/hyperhq/runv/hypervisor/types",
1695-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1696-
"revisionTime": "2018-05-18T01:42:47Z"
1695+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1696+
"revisionTime": "2018-07-17T02:39:01Z"
16971697
},
16981698
{
16991699
"checksumSHA1": "XRLDHlpB5V/bio+COzUlE5koWOc=",
17001700
"comment": "v0.8.0-21-g2ff5bd5",
17011701
"path": "github.com/hyperhq/runv/hypervisor/xen",
1702-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1703-
"revisionTime": "2018-05-18T01:42:47Z"
1702+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1703+
"revisionTime": "2018-07-17T02:39:01Z"
17041704
},
17051705
{
17061706
"checksumSHA1": "lNqKiyZqBLPCiMEn0YPqenJNxmE=",
17071707
"path": "github.com/hyperhq/runv/hypervisor/xenpv",
1708-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1709-
"revisionTime": "2018-05-18T01:42:47Z"
1708+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1709+
"revisionTime": "2018-07-17T02:39:01Z"
17101710
},
17111711
{
17121712
"checksumSHA1": "MCx6951ORoC7keC+BCd0lKz043o=",
17131713
"path": "github.com/hyperhq/runv/lib/runvxenlight",
1714-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1715-
"revisionTime": "2018-05-18T01:42:47Z"
1714+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1715+
"revisionTime": "2018-07-17T02:39:01Z"
17161716
},
17171717
{
17181718
"checksumSHA1": "d0GuiUdHWWWsd8l8cfzAntU8AYw=",
17191719
"comment": "v0.8.0-21-g2ff5bd5",
17201720
"path": "github.com/hyperhq/runv/lib/telnet",
1721-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1722-
"revisionTime": "2018-05-18T01:42:47Z"
1721+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1722+
"revisionTime": "2018-07-17T02:39:01Z"
17231723
},
17241724
{
17251725
"checksumSHA1": "EG1PoTyBE8u4bZvfCt7wKvqc6bU=",
17261726
"comment": "v0.8.0-21-g2ff5bd5",
17271727
"path": "github.com/hyperhq/runv/lib/term",
1728-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1729-
"revisionTime": "2018-05-18T01:42:47Z"
1728+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1729+
"revisionTime": "2018-07-17T02:39:01Z"
17301730
},
17311731
{
17321732
"checksumSHA1": "mH0iqGEPUDRfFqRvSwtB4/gmPek=",
17331733
"comment": "v0.8.0-21-g2ff5bd5",
17341734
"path": "github.com/hyperhq/runv/lib/utils",
1735-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1736-
"revisionTime": "2018-05-18T01:42:47Z"
1735+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1736+
"revisionTime": "2018-07-17T02:39:01Z"
17371737
},
17381738
{
17391739
"checksumSHA1": "qVEK/HSC/OfWvcecGBs5N7BPlvg=",
17401740
"comment": "v0.8.0-21-g2ff5bd5",
17411741
"path": "github.com/hyperhq/runv/lib/vsock",
1742-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1743-
"revisionTime": "2018-05-18T01:42:47Z"
1742+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1743+
"revisionTime": "2018-07-17T02:39:01Z"
17441744
},
17451745
{
17461746
"checksumSHA1": "QM2n1Mp0ZueSkAuMQvOF2kih9L8=",
17471747
"comment": "v0.8.0-21-g2ff5bd5",
17481748
"path": "github.com/hyperhq/runv/template",
1749-
"revision": "af3acb501962ead78f71265dad02cc95ad156371",
1750-
"revisionTime": "2018-05-18T01:42:47Z"
1749+
"revision": "664bbb1f37c7908c470eea46b633e27f4e58f094",
1750+
"revisionTime": "2018-07-17T02:39:01Z"
17511751
},
17521752
{
17531753
"comment": "0.2.2-6-g50d4dbd",

0 commit comments

Comments
 (0)